From 8df4e1ee6e614b90b84a17e55811dff382f1ea05 Mon Sep 17 00:00:00 2001 From: daboe01 Date: Wed, 23 Mar 2022 19:30:29 +0100 Subject: [PATCH] fixed: aristo3 jakefile --- AppKit/Themes/Aristo3/Jakefile | 43 +++++++++++---- package-lock.json | 96 +++++++++++++++++++++------------- 2 files changed, 93 insertions(+), 46 deletions(-) diff --git a/AppKit/Themes/Aristo3/Jakefile b/AppKit/Themes/Aristo3/Jakefile index cf466f0b7..786d84cf0 100644 --- a/AppKit/Themes/Aristo3/Jakefile +++ b/AppKit/Themes/Aristo3/Jakefile @@ -1,16 +1,39 @@ - require("../../../common.jake"); -var blend = require("cappuccino/jake").blend; +const path = require("path"); -blend ("Aristo3.blend", function(aristo3Task) -{ - aristo3Task.setBuildIntermediatesPath(FILE.join($BUILD_DIR, "Aristo3.build", $CONFIGURATION)) - aristo3Task.setBuildPath(FILE.join($BUILD_DIR, $CONFIGURATION)); +var callback; - aristo3Task.setThemeDescriptors(new FileList("ThemeDescriptors.j")); - aristo3Task.setIdentifier("com.280n.blend.Aristo3"); - aristo3Task.setResources(new FileList("Resources/*")); +function callbackFunction(blendtask) { + callback(blendtask); +} + +require("../../../CommonJS/lib/cappuccino/jake.js").initilize(callbackFunction); + +$BUILD_CJS_BLENDTASK = path.join($BUILD_CJS_CAPPUCCINO, "lib", "cappuccino", "jake", "blendtask.j"); + +var promise = new Promise((resolve, reject) => { + callback = function(BLEND_TASK) { + exports.BlendTask = BLEND_TASK.BlendTask; + exports.blend = BLEND_TASK.blend; + defineBlendTask().then(() => { + resolve(); + delete exports.jakePromise; + }); + } }); -task ("build", ["Aristo3.blend"]); +async function defineBlendTask() { + await exports.blend ("Aristo3.blend", function(aristoTask) + { + aristoTask.setBuildIntermediatesPath(path.join($BUILD_DIR, "Aristo3.build", $CONFIGURATION)) + aristoTask.setBuildPath(path.join($BUILD_DIR, $CONFIGURATION)); + + aristoTask.setThemeDescriptors(new FileList("ThemeDescriptors.j")); + aristoTask.setIdentifier("com.280n.blend.Aristo3"); + aristoTask.setResources(new FileList("Resources/*")); + }); + task ("build", ["Aristo3.blend"]); +} + +exports.jakePromise = promise; diff --git a/package-lock.json b/package-lock.json index 76db4912b..9d7ac4966 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,9 +62,9 @@ } }, "node_modules/@objj/runtime": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/@objj/runtime/-/runtime-1.1.14.tgz", - "integrity": "sha512-lJy+6ZfV8BLAAwNVffaOzhfBI4FnUmws5BcKHYbsQjQnpp7D7/rrihRUoYY+o8ZtkiK2H1gGcXsqA0J518XWIw==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/@objj/runtime/-/runtime-1.1.16.tgz", + "integrity": "sha512-1gmHmpvvO/QpiDKIvd7oa4TOaWFH8CS9QVKBeUb/A8ww8bc7zmKtrijBE4i8KAMGRFEtToEHX2sDLHQGyACBqw==", "dependencies": { "@objj/utils": ">=1.0.23", "@xmldom/xmldom": ">=0.7.5", @@ -85,13 +85,24 @@ "integrity": "sha512-KzthoKXSs3LcWDWfl27p/rOCoejcxyy/4DgbacjcxiowJJXa+QMmIsjZ/fcg9lcn13jL0gB4c1x1kGPfrrsZPw==" }, "node_modules/@xmldom/xmldom": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz", - "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.1.tgz", + "integrity": "sha512-4wOae+5N2RZ+CZXd9ZKwkaDi55IxrSTOjHpxTvQQ4fomtOJmqVxbmICA9jE1jvnqNhpfgz8cnfFagG86wV/xLQ==", "engines": { "node": ">=10.0.0" } }, + "node_modules/acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/amdefine": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", @@ -153,9 +164,9 @@ } }, "node_modules/source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -170,10 +181,11 @@ } }, "node_modules/terser": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", - "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz", + "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==", "dependencies": { + "acorn": "^8.5.0", "commander": "^2.20.0", "source-map": "~0.7.2", "source-map-support": "~0.5.20" @@ -227,9 +239,9 @@ "integrity": "sha512-T87JtTVJnXcxWdVHchJwrHuQPZLp0mh4MXCOpoMGffKSU2jbL7l+uxK6KPWRMW/ajjQL/aE5dJKguJohmmYtRg==" }, "@objj/runtime": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/@objj/runtime/-/runtime-1.1.14.tgz", - "integrity": "sha512-lJy+6ZfV8BLAAwNVffaOzhfBI4FnUmws5BcKHYbsQjQnpp7D7/rrihRUoYY+o8ZtkiK2H1gGcXsqA0J518XWIw==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/@objj/runtime/-/runtime-1.1.16.tgz", + "integrity": "sha512-1gmHmpvvO/QpiDKIvd7oa4TOaWFH8CS9QVKBeUb/A8ww8bc7zmKtrijBE4i8KAMGRFEtToEHX2sDLHQGyACBqw==", "requires": { "@objj/utils": ">=1.0.23", "@xmldom/xmldom": ">=0.7.5", @@ -244,9 +256,14 @@ "integrity": "sha512-KzthoKXSs3LcWDWfl27p/rOCoejcxyy/4DgbacjcxiowJJXa+QMmIsjZ/fcg9lcn13jL0gB4c1x1kGPfrrsZPw==" }, "@xmldom/xmldom": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz", - "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.1.tgz", + "integrity": "sha512-4wOae+5N2RZ+CZXd9ZKwkaDi55IxrSTOjHpxTvQQ4fomtOJmqVxbmICA9jE1jvnqNhpfgz8cnfFagG86wV/xLQ==" + }, + "acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==" }, "amdefine": { "version": "1.0.1", @@ -291,9 +308,9 @@ } }, "source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -307,10 +324,11 @@ } }, "terser": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", - "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz", + "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==", "requires": { + "acorn": "^8.5.0", "commander": "^2.20.0", "source-map": "~0.7.2", "source-map-support": "~0.5.20" @@ -344,9 +362,9 @@ "integrity": "sha512-T87JtTVJnXcxWdVHchJwrHuQPZLp0mh4MXCOpoMGffKSU2jbL7l+uxK6KPWRMW/ajjQL/aE5dJKguJohmmYtRg==" }, "@objj/runtime": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/@objj/runtime/-/runtime-1.1.14.tgz", - "integrity": "sha512-lJy+6ZfV8BLAAwNVffaOzhfBI4FnUmws5BcKHYbsQjQnpp7D7/rrihRUoYY+o8ZtkiK2H1gGcXsqA0J518XWIw==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/@objj/runtime/-/runtime-1.1.16.tgz", + "integrity": "sha512-1gmHmpvvO/QpiDKIvd7oa4TOaWFH8CS9QVKBeUb/A8ww8bc7zmKtrijBE4i8KAMGRFEtToEHX2sDLHQGyACBqw==", "requires": { "@objj/utils": ">=1.0.23", "@xmldom/xmldom": ">=0.7.5", @@ -361,9 +379,14 @@ "integrity": "sha512-KzthoKXSs3LcWDWfl27p/rOCoejcxyy/4DgbacjcxiowJJXa+QMmIsjZ/fcg9lcn13jL0gB4c1x1kGPfrrsZPw==" }, "@xmldom/xmldom": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz", - "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.1.tgz", + "integrity": "sha512-4wOae+5N2RZ+CZXd9ZKwkaDi55IxrSTOjHpxTvQQ4fomtOJmqVxbmICA9jE1jvnqNhpfgz8cnfFagG86wV/xLQ==" + }, + "acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==" }, "amdefine": { "version": "1.0.1", @@ -408,9 +431,9 @@ } }, "source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -424,10 +447,11 @@ } }, "terser": { - "version": "5.9.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz", - "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz", + "integrity": "sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==", "requires": { + "acorn": "^8.5.0", "commander": "^2.20.0", "source-map": "~0.7.2", "source-map-support": "~0.5.20"