From c8859524eeb468ba7e1d56af95460cd48726c64e Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Sat, 7 Jan 2023 08:27:22 +0100 Subject: [PATCH] removing `bower`: migrate `components-font-awesome` Signed-off-by: Pamplemousse --- bower.json | 1 - customize.dist/template.js | 2 +- package-lock.json | 13 +++++++++++++ package.json | 1 + scripts/copy-components.js | 1 + www/admin/inner.js | 2 +- www/calendar/inner.js | 2 +- www/checkup/main.js | 2 +- www/checkup/sandbox/main.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/form/inner.js | 2 +- www/install/main.js | 2 +- www/login/main.js | 2 +- www/notifications/inner.js | 2 +- www/pad/inner.js | 4 ++-- www/poll/inner.js | 2 +- www/profile/inner.js | 2 +- www/register/main.js | 2 +- www/report/main.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 +- 32 files changed, 44 insertions(+), 30 deletions(-) diff --git a/bower.json b/bower.json index 73b75eda7..dce73b59b 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,6 @@ "tests" ], "dependencies": { - "components-font-awesome": "^4.6.3", "requirejs": "2.3.5", "json.sortify": "~2.1.0", "hyperjson": "~1.4.0", diff --git a/customize.dist/template.js b/customize.dist/template.js index 332471630..32f8452ee 100644 --- a/customize.dist/template.js +++ b/customize.dist/template.js @@ -4,7 +4,7 @@ define([ '/customize/pages.js', '/bower_components/nthen/index.js', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ($, h, Pages, nThen) { // we consider that there is no valid reason to load any of the info pages // in an iframe. abort everything if you detect that you are embedded. diff --git a/package-lock.json b/package-lock.json index c67bcb0c4..949b23704 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,6 +29,7 @@ "devDependencies": { "ckeditor": "^4.12.1", "codemirror": "^5.19.0", + "components-font-awesome": "^4.6.3", "jquery": "3.6.0", "jshint": "^2.13.4", "less": "3.7.1", @@ -1059,6 +1060,12 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, + "node_modules/components-font-awesome": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/components-font-awesome/-/components-font-awesome-4.7.0.tgz", + "integrity": "sha512-kwptdKxXBD4mMxQK5mv+5qzw0hIoxC6z30+obfZKJ4mEcaQRqXm7/S0Y87ENixy0GI77GyONPcEXvmVk2AulmA==", + "dev": true + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -5561,6 +5568,12 @@ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" }, + "components-font-awesome": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/components-font-awesome/-/components-font-awesome-4.7.0.tgz", + "integrity": "sha512-kwptdKxXBD4mMxQK5mv+5qzw0hIoxC6z30+obfZKJ4mEcaQRqXm7/S0Y87ENixy0GI77GyONPcEXvmVk2AulmA==", + "dev": true + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", diff --git a/package.json b/package.json index e1209704c..cbe3dfcbd 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "devDependencies": { "ckeditor": "^4.12.1", "codemirror": "^5.19.0", + "components-font-awesome": "^4.6.3", "jquery": "3.6.0", "jshint": "^2.13.4", "less": "3.7.1", diff --git a/scripts/copy-components.js b/scripts/copy-components.js index 92560cc7b..c567216f5 100644 --- a/scripts/copy-components.js +++ b/scripts/copy-components.js @@ -12,6 +12,7 @@ Fse.mkdirpSync(componentsPath); "codemirror", "marked", "rangy", + "components-font-awesome", ].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 6df27ab23..5c9ca3513 100644 --- a/www/admin/inner.js +++ b/www/admin/inner.js @@ -21,7 +21,7 @@ define([ 'css!/lib/datepicker/flatpickr.min.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 14a6c2333..ba66b122e 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -27,7 +27,7 @@ define([ '/common/jscolor.js', '/bower_components/file-saver/FileSaver.min.js', 'css!/lib/calendar/tui-calendar.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', 'less!/calendar/app-calendar.less', ], function ( diff --git a/www/checkup/main.js b/www/checkup/main.js index f4f3adfdd..0ad45813d 100644 --- a/www/checkup/main.js +++ b/www/checkup/main.js @@ -17,7 +17,7 @@ define([ '/customize/application_config.js', '/components/tweetnacl/nacl-fast.min.js', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/checkup/app-checkup.less', ], function ($, ApiConfig, Assertions, h, Messages, DomReady, nThen, SFCommonO, Login, Hash, Util, Pinpad, diff --git a/www/checkup/sandbox/main.js b/www/checkup/sandbox/main.js index 397d139e9..8bf27c688 100644 --- a/www/checkup/sandbox/main.js +++ b/www/checkup/sandbox/main.js @@ -4,7 +4,7 @@ define([ '/checkup/checkup-tools.js', '/components/tweetnacl/nacl-fast.min.js', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/checkup/app-checkup.less', ], function ($, Util, Tools) { var postMessage = function (content) { diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 66e26f60a..c77423319 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -25,7 +25,7 @@ define([ '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'less!/bower_components/components-font-awesome/css/font-awesome.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 04821ce15..e0564cf15 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -20,7 +20,7 @@ define([ '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ( $, Hyperjson, diff --git a/www/contacts/inner.js b/www/contacts/inner.js index 2fc704a22..255b24057 100644 --- a/www/contacts/inner.js +++ b/www/contacts/inner.js @@ -10,7 +10,7 @@ define([ '/common/common-interface.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 4db50209c..5b6364223 100644 --- a/www/convert/inner.js +++ b/www/convert/inner.js @@ -13,7 +13,7 @@ define([ '/common/outer/x2t.js', '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 8c608d6ad..f1faa0ecf 100644 --- a/www/debug/inner.js +++ b/www/debug/inner.js @@ -17,7 +17,7 @@ define([ '/debug/chainpad.dist.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 79c9974a4..f0474f1b2 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -14,7 +14,7 @@ define([ '/customize/messages.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 e3ed25fca..b24e6a07a 100644 --- a/www/file/inner.js +++ b/www/file/inner.js @@ -12,7 +12,7 @@ define([ '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/file/app-file.less', ], function ( diff --git a/www/form/inner.js b/www/form/inner.js index a4261754a..4744a032b 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -42,7 +42,7 @@ define([ 'css!/components/codemirror/addon/dialog/dialog.css', 'css!/components/codemirror/addon/fold/foldgutter.css', 'css!/lib/datepicker/flatpickr.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/form/app-form.less', ], function ( $, diff --git a/www/install/main.js b/www/install/main.js index e7c03e3cd..88635588a 100644 --- a/www/install/main.js +++ b/www/install/main.js @@ -13,7 +13,7 @@ define([ '/customize/pages.js', '/common/rpc.js', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ($, Login, Cryptpad, /*Test,*/ Cred, UI, Util, Realtime, Constants, Feedback, LocalStore, h, Pages, Rpc) { if (window.top !== window) { return; } var Messages = Cryptpad.Messages; diff --git a/www/login/main.js b/www/login/main.js index 1a27343fc..f514030ae 100644 --- a/www/login/main.js +++ b/www/login/main.js @@ -8,7 +8,7 @@ define([ '/common/outer/local-store.js', //'/common/test.js', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ($, Cryptpad, Login, UI, Realtime, Feedback, LocalStore /*, Test */) { if (window.top !== window) { return; } $(function () { diff --git a/www/notifications/inner.js b/www/notifications/inner.js index 8594d6bff..c250a3d37 100644 --- a/www/notifications/inner.js +++ b/www/notifications/inner.js @@ -11,7 +11,7 @@ define([ '/common/notifications.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 bb14569a8..21795a4d6 100644 --- a/www/pad/inner.js +++ b/www/pad/inner.js @@ -50,7 +50,7 @@ define([ 'css!/customize/src/print.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/pad/app-pad.less' ], function( $, @@ -631,7 +631,7 @@ define([ var mediaTagMap = {}; var $contentContainer = $('#cke_1_contents'); var $html = $('html'); - var $faLink = $html.find('head link[href*="/bower_components/components-font-awesome/css/font-awesome.min.css"]'); + var $faLink = $html.find('head link[href*="/components/components-font-awesome/css/font-awesome.min.css"]'); if ($faLink.length) { $html.find('iframe').contents().find('head').append($faLink.clone()); } diff --git a/www/poll/inner.js b/www/poll/inner.js index dd01b0789..0da67b9d8 100644 --- a/www/poll/inner.js +++ b/www/poll/inner.js @@ -28,7 +28,7 @@ define([ '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 84b5fa619..c22d3557e 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -25,7 +25,7 @@ define([ 'css!/components/codemirror/addon/dialog/dialog.css', 'css!/components/codemirror/addon/fold/foldgutter.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/profile/app-profile.less', ], function ( $, diff --git a/www/register/main.js b/www/register/main.js index fa26f38b4..e52d84658 100644 --- a/www/register/main.js +++ b/www/register/main.js @@ -13,7 +13,7 @@ define([ '/common/hyperscript.js', '/customize/pages.js', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', ], function ($, Login, Cryptpad, /*Test,*/ Cred, UI, Util, Realtime, Constants, Feedback, LocalStore, h, Pages) { if (window.top !== window) { return; } var Messages = Cryptpad.Messages; diff --git a/www/report/main.js b/www/report/main.js index 35dca5ff9..479faead4 100644 --- a/www/report/main.js +++ b/www/report/main.js @@ -17,7 +17,7 @@ define([ '/components/tweetnacl/nacl-fast.min.js', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less2/pages/page-report.less', ], function ($, ApiConfig, h, Messages, nThen, Hash, Util, Crypt, Cryptpad, Cache, UI, CPNetflux, diff --git a/www/secureiframe/inner.js b/www/secureiframe/inner.js index 0ae5d6ae8..9bf2fc72b 100644 --- a/www/secureiframe/inner.js +++ b/www/secureiframe/inner.js @@ -12,7 +12,7 @@ define([ '/customize/messages.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 459257c93..3d7135766 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -19,7 +19,7 @@ define([ '/common/jscolor.js', '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 02c9c2642..ecf8d5283 100644 --- a/www/slide/inner.js +++ b/www/slide/inner.js @@ -14,7 +14,7 @@ define([ 'cm/lib/codemirror', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 1cffef37e..d590db7c1 100644 --- a/www/support/inner.js +++ b/www/support/inner.js @@ -15,7 +15,7 @@ define([ '/customize/pages.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 c23d3d68a..10df7d6c6 100644 --- a/www/teams/inner.js +++ b/www/teams/inner.js @@ -23,7 +23,7 @@ define([ '/bower_components/file-saver/FileSaver.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 39cbbf588..297723539 100644 --- a/www/todo/inner.js +++ b/www/todo/inner.js @@ -12,7 +12,7 @@ define([ '/bower_components/sortablejs/Sortable.min.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.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 5a6c39da8..44367f904 100644 --- a/www/worker/inner.js +++ b/www/worker/inner.js @@ -8,7 +8,7 @@ define([ '/customize/messages.js', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', - 'css!/bower_components/components-font-awesome/css/font-awesome.min.css', + 'css!/components/components-font-awesome/css/font-awesome.min.css', 'less!/worker/app-worker.less', ], function ( $,