From 05b09fdc7a76cc7ff8519e1bbd4368d939e59fc3 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Sat, 7 Jan 2023 12:39:19 +0100 Subject: [PATCH] removing `bower`: migrate `require-css` Signed-off-by: Pamplemousse --- bower.json | 1 - package-lock.json | 13 +++++++++++++ package.json | 1 + scripts/copy-components.js | 1 + www/common/requireconfig.js | 2 +- www/worker/worker.js | 2 +- 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index c2b3a7cf2..24014c34f 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,6 @@ "tests" ], "dependencies": { - "require-css": "0.1.10", "bootstrap": "^v4.0.0", "diff-dom": "2.1.1", "nthen": "0.1.7", diff --git a/package-lock.json b/package-lock.json index 252c6ed28..eeb4c369d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "lesshint": "6.3.7", "marked": "^1.1.0", "rangy": "~1.3.0", + "require-css": "0.1.10", "requirejs": "2.3.5", "requirejs-plugins": "^1.0.2", "scrypt-async": "1.2.0", @@ -3945,6 +3946,12 @@ "node": ">= 6" } }, + "node_modules/require-css": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/require-css/-/require-css-0.1.10.tgz", + "integrity": "sha512-v9XczgOfDKMkHdndAwuEDEasYNJPbL3aVDTM9tbRoAefjLm3kUZdt/Fg6Xi+0HJzliL21gGPWTXDV87XuOwCIQ==", + "dev": true + }, "node_modules/requirejs": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz", @@ -8229,6 +8236,12 @@ "uuid": "^3.3.2" } }, + "require-css": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/require-css/-/require-css-0.1.10.tgz", + "integrity": "sha512-v9XczgOfDKMkHdndAwuEDEasYNJPbL3aVDTM9tbRoAefjLm3kUZdt/Fg6Xi+0HJzliL21gGPWTXDV87XuOwCIQ==", + "dev": true + }, "requirejs": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz", diff --git a/package.json b/package.json index c0576f63c..6dddf16c4 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "lesshint": "6.3.7", "marked": "^1.1.0", "rangy": "~1.3.0", + "require-css": "0.1.10", "requirejs": "2.3.5", "requirejs-plugins": "^1.0.2", "scrypt-async": "1.2.0", diff --git a/scripts/copy-components.js b/scripts/copy-components.js index 5bc92183d..504a45dc7 100644 --- a/scripts/copy-components.js +++ b/scripts/copy-components.js @@ -24,6 +24,7 @@ Fse.mkdirpSync(componentsPath); "file-saver", "alertify.js", "scrypt-async", + "require-css", ].forEach(l => { const source = Path.join("node_modules", l); const destination = Path.join(componentsPath, l); diff --git a/www/common/requireconfig.js b/www/common/requireconfig.js index f3429cee5..eb0f9b454 100644 --- a/www/common/requireconfig.js +++ b/www/common/requireconfig.js @@ -26,7 +26,7 @@ define([ }, map: { '*': { - 'css': '/bower_components/require-css/css.js', + 'css': '/components/require-css/css.js', 'less': '/common/RequireLess.js', } } diff --git a/www/worker/worker.js b/www/worker/worker.js index 74e8e4197..cee294772 100644 --- a/www/worker/worker.js +++ b/www/worker/worker.js @@ -20,7 +20,7 @@ require.config({ }, map: { '*': { - 'css': '/bower_components/require-css/css.js', + 'css': '/components/require-css/css.js', 'less': '/common/RequireLess.js', } }