removing `bower`: migrate `components-font-awesome`

Signed-off-by: Pamplemousse <git@xaviermaso.com>
This commit is contained in:
Pamplemousse 2023-01-07 08:27:22 +01:00
parent c8933f08d2
commit c8859524ee
32 changed files with 44 additions and 30 deletions

View File

@ -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",

View File

@ -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.

13
package-lock.json generated
View File

@ -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",

View File

@ -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",

View File

@ -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);

View File

@ -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 (
$,

View File

@ -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 (

View File

@ -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,

View File

@ -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) {

View File

@ -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 (
$,

View File

@ -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,

View File

@ -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 (
$,

View File

@ -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 (
$,

View File

@ -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 (
$,

View File

@ -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 (
$,

View File

@ -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 (

View File

@ -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 (
$,

View File

@ -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;

View File

@ -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 () {

View File

@ -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 (
$,

View File

@ -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());
}

View File

@ -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 (
$,

View File

@ -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 (
$,

View File

@ -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;

View File

@ -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,

View File

@ -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 (
$,

View File

@ -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(
$,

View File

@ -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',

View File

@ -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 (
$,

View File

@ -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 (
$,

View File

@ -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 (
$,

View File

@ -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 (
$,