From 32b7ea07adf64155abf43bd3ea9e5487b78b09cf Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Sat, 7 Jan 2023 13:22:36 +0100 Subject: [PATCH] removing `bower`: migrate `saferphore` Signed-off-by: Pamplemousse --- bower.json | 2 -- package-lock.json | 22 +++++++++++++++++++--- package.json | 4 +++- scripts/copy-components.js | 2 ++ www/common/make-backup.js | 2 +- www/common/outer/async-store.js | 2 +- www/common/outer/team.js | 2 +- www/form/inner.js | 2 +- www/todo/inner.js | 2 +- 9 files changed, 29 insertions(+), 11 deletions(-) diff --git a/bower.json b/bower.json index da9000fae..c7078f3bd 100644 --- a/bower.json +++ b/bower.json @@ -18,8 +18,6 @@ "tests" ], "dependencies": { - "sortablejs": "^1.6.0", - "saferphore": "^0.0.1", "jszip": "3.7.1", "dragula.js": "3.7.2", "MathJax": "3.0.5" diff --git a/package-lock.json b/package-lock.json index c44b8a0c8..655172ffa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,8 +52,10 @@ "require-css": "0.1.10", "requirejs": "2.3.5", "requirejs-plugins": "^1.0.2", + "saferphore": "^0.0.1", "scrypt-async": "1.2.0", - "selenium-webdriver": "^3.6.0" + "selenium-webdriver": "^3.6.0", + "sortablejs": "^1.6.0" }, "funding": { "type": "opencollective", @@ -4150,7 +4152,8 @@ "node_modules/saferphore": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/saferphore/-/saferphore-0.0.1.tgz", - "integrity": "sha1-zJYu2k4rJFLmQ3/TLc+29p7y6mM=" + "integrity": "sha1-zJYu2k4rJFLmQ3/TLc+29p7y6mM=", + "dev": true }, "node_modules/sax": { "version": "1.2.4", @@ -4521,6 +4524,12 @@ "node": ">=0.10.0" } }, + "node_modules/sortablejs": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", + "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==", + "dev": true + }, "node_modules/sortify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/sortify/-/sortify-1.0.4.tgz", @@ -8529,7 +8538,8 @@ "saferphore": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/saferphore/-/saferphore-0.0.1.tgz", - "integrity": "sha1-zJYu2k4rJFLmQ3/TLc+29p7y6mM=" + "integrity": "sha1-zJYu2k4rJFLmQ3/TLc+29p7y6mM=", + "dev": true }, "sax": { "version": "1.2.4", @@ -8832,6 +8842,12 @@ } } }, + "sortablejs": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", + "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==", + "dev": true + }, "sortify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/sortify/-/sortify-1.0.4.tgz", diff --git a/package.json b/package.json index 0fcd33a10..aa7fb5684 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,9 @@ "requirejs": "2.3.5", "requirejs-plugins": "^1.0.2", "scrypt-async": "1.2.0", - "selenium-webdriver": "^3.6.0" + "saferphore": "^0.0.1", + "selenium-webdriver": "^3.6.0", + "sortablejs": "^1.6.0" }, "scripts": { "install:components": "node scripts/copy-components.js", diff --git a/scripts/copy-components.js b/scripts/copy-components.js index 4e2474615..879049380 100644 --- a/scripts/copy-components.js +++ b/scripts/copy-components.js @@ -32,6 +32,8 @@ Fse.mkdirpSync(componentsPath); "localforage", "html2canvas", "croppie", + "sortablejs", + "saferphore", ].forEach(l => { const source = Path.join("node_modules", l); const destination = Path.join(componentsPath, l); diff --git a/www/common/make-backup.js b/www/common/make-backup.js index 8ad90ed2c..50c2d86ac 100644 --- a/www/common/make-backup.js +++ b/www/common/make-backup.js @@ -9,7 +9,7 @@ define([ '/common/inner/cache.js', '/customize/messages.js', '/components/nthen/index.js', - '/bower_components/saferphore/index.js', + '/components/saferphore/index.js', '/bower_components/jszip/dist/jszip.min.js', ], function ($, FileCrypto, Hash, Util, UI, h, Feedback, Cache, Messages, nThen, Saferphore, JsZip) { diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js index 78cef01f8..59e77eac4 100644 --- a/www/common/outer/async-store.js +++ b/www/common/outer/async-store.js @@ -30,7 +30,7 @@ define([ 'chainpad-listmap', 'netflux-client', '/components/nthen/index.js', - '/bower_components/saferphore/index.js', + '/components/saferphore/index.js', ], function (ApiConfig, Sortify, UserObject, ProxyManager, Migrate, Hash, Util, Constants, Feedback, Realtime, Messaging, Pinpad, Cache, SF, Cursor, OnlyOffice, Mailbox, Profile, Team, Messenger, History, diff --git a/www/common/outer/team.js b/www/common/outer/team.js index 5d15aae12..f07be289b 100644 --- a/www/common/outer/team.js +++ b/www/common/outer/team.js @@ -19,7 +19,7 @@ define([ 'chainpad-netflux', '/components/chainpad/chainpad.dist.js', '/components/nthen/index.js', - '/bower_components/saferphore/index.js', + '/components/saferphore/index.js', '/components/tweetnacl/nacl-fast.min.js', ], function (Util, Hash, Constants, Realtime, ProxyManager, UserObject, SF, Roster, Messaging, Feedback, Invite, Crypt, Cache, diff --git a/www/form/inner.js b/www/form/inner.js index 8c5261138..51528d605 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -28,7 +28,7 @@ define([ '/common/inner/properties.js', '/lib/datepicker/flatpickr.js', - '/bower_components/sortablejs/Sortable.min.js', + '/components/sortablejs/Sortable.min.js', 'cm/addon/edit/closebrackets', 'cm/addon/edit/matchbrackets', diff --git a/www/todo/inner.js b/www/todo/inner.js index 3ed628632..40e0c4f40 100644 --- a/www/todo/inner.js +++ b/www/todo/inner.js @@ -9,7 +9,7 @@ define([ '/common/common-hash.js', '/todo/todo.js', '/customize/messages.js', - '/bower_components/sortablejs/Sortable.min.js', + '/components/sortablejs/Sortable.min.js', 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css',