From 6c1040780211333cf38fd04892642ebfa201666a Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Sat, 7 Jan 2023 12:41:33 +0100 Subject: [PATCH] removing `bower`: migrate `bootstrap` Signed-off-by: Pamplemousse --- bower.json | 1 - customize.dist/template.js | 2 +- package-lock.json | 47 ++++++++++++++++++++++++++++++ package.json | 1 + scripts/copy-components.js | 1 + www/admin/inner.js | 2 +- www/calendar/inner.js | 2 +- www/common/onlyoffice/inner.js | 2 +- www/common/sframe-app-framework.js | 2 +- www/contacts/inner.js | 2 +- www/convert/inner.js | 2 +- www/debug/inner.js | 2 +- www/drive/inner.js | 2 +- www/file/inner.js | 2 +- www/notifications/inner.js | 2 +- www/pad/inner.js | 2 +- www/poll/inner.js | 2 +- www/profile/inner.js | 2 +- www/secureiframe/inner.js | 2 +- www/settings/inner.js | 2 +- www/slide/inner.js | 2 +- www/support/inner.js | 2 +- www/teams/inner.js | 2 +- www/todo/inner.js | 2 +- www/worker/inner.js | 2 +- 25 files changed, 70 insertions(+), 22 deletions(-) diff --git a/bower.json b/bower.json index 24014c34f..8da4fedfe 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,6 @@ "tests" ], "dependencies": { - "bootstrap": "^v4.0.0", "diff-dom": "2.1.1", "nthen": "0.1.7", "open-sans-fontface": "^1.4.2", diff --git a/customize.dist/template.js b/customize.dist/template.js index 32f8452ee..cb6adf667 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -42,7 +42,7 @@ $(function () { }).nThen(function () { require([ 'less!/customize/src/less2/pages/page-' + pageName + '.less', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/customize/fonts/cptools/style.css' ], function () { var $main = $(infoPage()); diff --git a/package-lock.json b/package-lock.json index eeb4c369d..a1ae43977 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ }, "devDependencies": { "alertify.js": "1.0.11", + "bootstrap": "^4.0.0", "chainpad": "^5.2.0", "chainpad-listmap": "github:xwiki-labs/chainpad-listmap#^1.0.0", "chainpad-netflux": "^1.0.0", @@ -768,6 +769,26 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/bootstrap": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", + "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "peerDependencies": { + "jquery": "1.9.1 - 3", + "popper.js": "^1.16.1" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -3462,6 +3483,18 @@ "node": ">=4" } }, + "node_modules/popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", + "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", + "dev": true, + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/posix-character-classes": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", @@ -5668,6 +5701,13 @@ } } }, + "bootstrap": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz", + "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==", + "dev": true, + "requires": {} + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -7842,6 +7882,13 @@ "resolved": "https://registry.npmjs.org/pointer-symbol/-/pointer-symbol-1.0.0.tgz", "integrity": "sha512-pozTTFO3kG9HQWXCSTJkCgq4fBF8lUQf+5bLddTEW6v4zdjQhcBVfLmKzABEMJMA7s8jhzi0sgANIwdrf4kq+A==" }, + "popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", + "dev": true, + "peer": true + }, "posix-character-classes": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", diff --git a/package.json b/package.json index 6dddf16c4..970f237c4 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ }, "devDependencies": { "alertify.js": "1.0.11", + "bootstrap": "^4.0.0", "chainpad": "^5.2.0", "chainpad-listmap": "github:xwiki-labs/chainpad-listmap#^1.0.0", "chainpad-netflux": "^1.0.0", diff --git a/scripts/copy-components.js b/scripts/copy-components.js index 504a45dc7..dd9456554 100644 --- a/scripts/copy-components.js +++ b/scripts/copy-components.js @@ -25,6 +25,7 @@ Fse.mkdirpSync(componentsPath); "alertify.js", "scrypt-async", "require-css", + "bootstrap", ].forEach(l => { const source = Path.join("node_modules", l); const destination = Path.join(componentsPath, l); diff --git a/www/admin/inner.js b/www/admin/inner.js index ff9cdfdb9..6bf0093d7 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -20,7 +20,7 @@ define([ '/components/tweetnacl/nacl-fast.min.js', 'css!/lib/datepicker/flatpickr.min.css', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/admin/app-admin.less', ], function ( diff --git a/www/calendar/inner.js b/www/calendar/inner.js index e0081791c..ea301c0ea 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -28,7 +28,7 @@ define([ '/components/file-saver/FileSaver.min.js', 'css!/lib/calendar/tui-calendar.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'less!/calendar/app-calendar.less', ], function ( $, diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 78f24ed76..2079c5da4 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -24,7 +24,7 @@ define([ '/components/file-saver/FileSaver.min.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'less!/components/components-font-awesome/css/font-awesome.min.css', 'less!/common/onlyoffice/app-oo.less', ], function ( diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js index 0526cbff9..095c870ed 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -19,7 +19,7 @@ define([ '/common/test.js', '/components/file-saver/FileSaver.min.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ( $, diff --git a/www/contacts/inner.js b/www/contacts/inner.js index cb85bc8bb..eb0fe5be2 100644 --- a/www/contacts/inner.js +++ b/www/contacts/inner.js @@ -9,7 +9,7 @@ define([ '/customize/messages.js', '/common/common-interface.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/contacts/app-contacts.less', ], function ( diff --git a/www/convert/inner.js b/www/convert/inner.js index 011e3dcef..c17ec575e 100644 --- a/www/convert/inner.js +++ b/www/convert/inner.js @@ -12,7 +12,7 @@ define([ '/common/outer/worker-channel.js', '/common/outer/x2t.js', '/components/file-saver/FileSaver.min.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/convert/app-convert.less', ], function ( diff --git a/www/debug/inner.js b/www/debug/inner.js index a33d4571c..77b357fc9 100644 --- a/www/debug/inner.js +++ b/www/debug/inner.js @@ -16,7 +16,7 @@ define([ '/customize/application_config.js', '/debug/chainpad.dist.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/debug/app-debug.less', ], function ( diff --git a/www/drive/inner.js b/www/drive/inner.js index f0474f1b2..8b3db6b82 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -13,7 +13,7 @@ define([ '/customize/application_config.js', '/customize/messages.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/drive/app-drive.less', ], function ( diff --git a/www/file/inner.js b/www/file/inner.js index d120e9c25..cc2398089 100644 --- a/www/file/inner.js +++ b/www/file/inner.js @@ -11,7 +11,7 @@ define([ '/components/file-saver/FileSaver.min.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/file/app-file.less', diff --git a/www/notifications/inner.js b/www/notifications/inner.js index 020f48f87..8ab54c961 100644 --- a/www/notifications/inner.js +++ b/www/notifications/inner.js @@ -10,7 +10,7 @@ define([ '/common/common-interface.js', '/common/notifications.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/notifications/app-notifications.less', ], function ( diff --git a/www/pad/inner.js b/www/pad/inner.js index 8db04c797..0b3161edd 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -49,7 +49,7 @@ define([ '/components/file-saver/FileSaver.min.js', 'css!/customize/src/print.css', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/pad/app-pad.less' ], function( diff --git a/www/poll/inner.js b/www/poll/inner.js index d694a955c..bb5efb11a 100644 --- a/www/poll/inner.js +++ b/www/poll/inner.js @@ -27,7 +27,7 @@ define([ '/components/file-saver/FileSaver.min.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/poll/app-poll.less', ], function ( diff --git a/www/profile/inner.js b/www/profile/inner.js index c0502bd1f..573370097 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -24,7 +24,7 @@ define([ 'css!/components/codemirror/lib/codemirror.css', 'css!/components/codemirror/addon/dialog/dialog.css', 'css!/components/codemirror/addon/fold/foldgutter.css', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/profile/app-profile.less', ], function ( diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js index 5856e6906..1ceb5eaa1 100644 --- a/www/secureiframe/inner.js +++ b/www/secureiframe/inner.js @@ -11,7 +11,7 @@ define([ 'json.sortify', '/customize/messages.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/secureiframe/app-secure.less', ], function ( diff --git a/www/settings/inner.js b/www/settings/inner.js index 00f505f46..9c9f9f43c 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -18,7 +18,7 @@ define([ '/common/jscolor.js', '/components/file-saver/FileSaver.min.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/settings/app-settings.less', ], function( diff --git a/www/slide/inner.js b/www/slide/inner.js index ecf8d5283..8768fd082 100644 --- a/www/slide/inner.js +++ b/www/slide/inner.js @@ -13,7 +13,7 @@ define([ '/customize/messages.js', 'cm/lib/codemirror', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'css!/customize/src/print-landscape.css', 'less!/slide/app-slide.less', diff --git a/www/support/inner.js b/www/support/inner.js index d590db7c1..909619a09 100644 --- a/www/support/inner.js +++ b/www/support/inner.js @@ -14,7 +14,7 @@ define([ '/customize/application_config.js', '/customize/pages.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/support/app-support.less', ], function ( diff --git a/www/teams/inner.js b/www/teams/inner.js index ccd48dbd2..6cf6092db 100644 --- a/www/teams/inner.js +++ b/www/teams/inner.js @@ -22,7 +22,7 @@ define([ '/customize/messages.js', '/components/file-saver/FileSaver.min.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/teams/app-team.less', ], function ( diff --git a/www/todo/inner.js b/www/todo/inner.js index 1fb400078..b4d5c2692 100644 --- a/www/todo/inner.js +++ b/www/todo/inner.js @@ -11,7 +11,7 @@ define([ '/customize/messages.js', '/bower_components/sortablejs/Sortable.min.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/todo/app-todo.less', ], function ( diff --git a/www/worker/inner.js b/www/worker/inner.js index 44367f904..f7401e7e0 100644 --- a/www/worker/inner.js +++ b/www/worker/inner.js @@ -7,7 +7,7 @@ define([ '/common/common-interface.js', '/customize/messages.js', - 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', + 'css!/components/bootstrap/dist/css/bootstrap.min.css', 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/worker/app-worker.less', ], function (