From 0cf1e9bff4542fdb1cecfc7ebbe40032d113d25f Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Mon, 8 Apr 2024 14:32:20 +0300 Subject: [PATCH] [deploy] remove bootstrap from build --- apps/documenteditor/forms/app.js | 9 +------- apps/documenteditor/forms/app_dev.js | 9 +------- apps/documenteditor/main/app.js | 11 +++------- apps/documenteditor/main/app_dev.js | 6 ++--- apps/pdfeditor/main/app.js | 6 ++--- apps/pdfeditor/main/app_dev.js | 6 ++--- apps/presentationeditor/main/app.js | 11 +++------- apps/spreadsheeteditor/main/app.js | 11 +++------- .../mobile/src/controller/Main.jsx | 1 - build/common.json | 22 ------------------- build/documenteditor.json | 6 ----- build/presentationeditor.json | 6 ----- build/spreadsheeteditor.json | 6 ----- 13 files changed, 17 insertions(+), 93 deletions(-) diff --git a/apps/documenteditor/forms/app.js b/apps/documenteditor/forms/app.js index e488f7b438..02e5ce0929 100644 --- a/apps/documenteditor/forms/app.js +++ b/apps/documenteditor/forms/app.js @@ -40,7 +40,6 @@ require.config({ jquery : '../vendor/jquery/jquery', underscore : '../vendor/underscore/underscore', backbone : '../vendor/backbone/backbone', - bootstrap : '../vendor/bootstrap/dist/js/bootstrap', text : '../vendor/requirejs-text/text', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', @@ -71,11 +70,6 @@ require.config({ ], exports: 'Backbone' }, - bootstrap: { - deps: [ - 'jquery' - ] - }, perfectscrollbar: { deps: [ 'jmousewheel' @@ -117,14 +111,13 @@ require.config({ require([ 'backbone', - 'bootstrap', 'core', 'sdk', 'api', 'analytics', 'gateway', 'locale' -], function (Backbone, Bootstrap, Core) { +], function (Backbone, Core) { if (Backbone.History && Backbone.History.started) return; Backbone.history.start(); diff --git a/apps/documenteditor/forms/app_dev.js b/apps/documenteditor/forms/app_dev.js index 51e60b322b..ce69d293d7 100644 --- a/apps/documenteditor/forms/app_dev.js +++ b/apps/documenteditor/forms/app_dev.js @@ -40,7 +40,6 @@ require.config({ jquery : '../vendor/jquery/jquery', underscore : '../vendor/underscore/underscore', backbone : '../vendor/backbone/backbone', - bootstrap : '../vendor/bootstrap/dist/js/bootstrap', text : '../vendor/requirejs-text/text', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', @@ -69,11 +68,6 @@ require.config({ ], exports: 'Backbone' }, - bootstrap: { - deps: [ - 'jquery' - ] - }, perfectscrollbar: { deps: [ 'jmousewheel' @@ -106,7 +100,6 @@ require.config({ require([ 'backbone', - 'bootstrap', 'core', 'api', 'analytics', @@ -114,7 +107,7 @@ require([ 'locale', 'socketio', 'underscore' -], function (Backbone, Bootstrap, Core) { +], function (Backbone, Core) { if (Backbone.History && Backbone.History.started) return; Backbone.history.start(); diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index d0d9920fd2..ff7a8dd51b 100644 --- a/apps/documenteditor/main/app.js +++ b/apps/documenteditor/main/app.js @@ -47,7 +47,6 @@ require.config({ jquery : '../vendor/jquery/jquery', underscore : '../vendor/underscore/underscore', backbone : '../vendor/backbone/backbone', - bootstrap : '../vendor/bootstrap/dist/js/bootstrap', text : '../vendor/requirejs-text/text', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', @@ -78,11 +77,6 @@ require.config({ ], exports: 'Backbone' }, - bootstrap: { - deps: [ - 'jquery' - ] - }, perfectscrollbar: { deps: [ 'jmousewheel' @@ -124,12 +118,11 @@ require.config({ require([ 'sdk', 'backbone', - 'bootstrap', 'core', 'analytics', 'gateway', 'locale' -], function (Sdk, Backbone, Bootstrap, Core) { +], function (Sdk, Backbone, Core) { if (Backbone.History && Backbone.History.started) return; Backbone.history.start(); @@ -175,6 +168,8 @@ require([ Common.Locale.apply( function() { require([ + 'common/main/lib/mods/dropdown', + 'common/main/lib/mods/tooltip', 'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Scaling', 'common/main/lib/controller/Themes', diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index eace028bd3..ff16aeac1a 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/apps/documenteditor/main/app_dev.js @@ -53,8 +53,6 @@ require.config({ xregexp : '../vendor/xregexp/xregexp-all-min', socketio : '../vendor/socketio/socket.io.min', api : 'api/documents/api', - dropdown : 'common/main/lib/mods/dropdown', - tooltip : 'common/main/lib/mods/tooltip', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', keymaster : 'common/main/lib/core/keymaster', @@ -161,8 +159,8 @@ require([ Common.Locale.apply( function() { require([ - 'tooltip', - 'dropdown', + 'common/main/lib/mods/dropdown', + 'common/main/lib/mods/tooltip', 'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Scaling', 'common/main/lib/controller/Themes', diff --git a/apps/pdfeditor/main/app.js b/apps/pdfeditor/main/app.js index 372d1fc89f..c453048f6a 100644 --- a/apps/pdfeditor/main/app.js +++ b/apps/pdfeditor/main/app.js @@ -55,8 +55,6 @@ require.config({ allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/word/sdk-all-min', api : 'api/documents/api', - dropdown : 'common/main/lib/mods/dropdown', - tooltip : 'common/main/lib/mods/tooltip', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', keymaster : 'common/main/lib/core/keymaster', @@ -159,8 +157,8 @@ require([ Common.Locale.apply( function() { require([ - 'tooltip', - 'dropdown', + 'common/main/lib/mods/dropdown', + 'common/main/lib/mods/tooltip', 'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Scaling', 'common/main/lib/controller/Themes', diff --git a/apps/pdfeditor/main/app_dev.js b/apps/pdfeditor/main/app_dev.js index 739988c47c..ec1dc27a3e 100644 --- a/apps/pdfeditor/main/app_dev.js +++ b/apps/pdfeditor/main/app_dev.js @@ -53,8 +53,6 @@ require.config({ xregexp : '../vendor/xregexp/xregexp-all-min', socketio : '../vendor/socketio/socket.io.min', api : 'api/documents/api', - dropdown : 'common/main/lib/mods/dropdown', - tooltip : 'common/main/lib/mods/tooltip', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', keymaster : 'common/main/lib/core/keymaster', @@ -150,8 +148,8 @@ require([ Common.Locale.apply( function() { require([ - 'tooltip', - 'dropdown', + 'common/main/lib/mods/dropdown', + 'common/main/lib/mods/tooltip', 'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Scaling', 'common/main/lib/controller/Themes', diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js index 075d2f7b99..050ac15957 100644 --- a/apps/presentationeditor/main/app.js +++ b/apps/presentationeditor/main/app.js @@ -47,7 +47,6 @@ require.config({ jquery : '../vendor/jquery/jquery', underscore : '../vendor/underscore/underscore', backbone : '../vendor/backbone/backbone', - bootstrap : '../vendor/bootstrap/dist/js/bootstrap', text : '../vendor/requirejs-text/text', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', @@ -77,11 +76,6 @@ require.config({ ], exports: 'Backbone' }, - bootstrap: { - deps: [ - 'jquery' - ] - }, perfectscrollbar: { deps: [ 'jmousewheel' @@ -123,12 +117,11 @@ require.config({ require([ 'sdk', 'backbone', - 'bootstrap', 'core', 'analytics', 'gateway', 'locale' -], function (Sdk, Backbone, Bootstrap, Core) { +], function (Sdk, Backbone, Core) { if (Backbone.History && Backbone.History.started) return; Backbone.history.start(); @@ -169,6 +162,8 @@ require([ Common.Locale.apply(function(){ require([ + 'common/main/lib/mods/dropdown', + 'common/main/lib/mods/tooltip', 'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Scaling', 'common/main/lib/controller/Themes', diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index 20b62c8e20..b9b316be8c 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/apps/spreadsheeteditor/main/app.js @@ -47,7 +47,6 @@ require.config({ jquery : '../vendor/jquery/jquery', underscore : '../vendor/underscore/underscore', backbone : '../vendor/backbone/backbone', - bootstrap : '../vendor/bootstrap/dist/js/bootstrap', text : '../vendor/requirejs-text/text', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', @@ -77,11 +76,6 @@ require.config({ ], exports: 'Backbone' }, - bootstrap: { - deps: [ - 'jquery' - ] - }, perfectscrollbar: { deps: [ 'jmousewheel' @@ -123,12 +117,11 @@ require.config({ require([ 'sdk', 'backbone', - 'bootstrap', 'core', 'analytics', 'gateway', 'locale' -], function (Sdk, Backbone, Bootstrap, Core) { +], function (Sdk, Backbone, Core) { if (Backbone.History && Backbone.History.started) return; Backbone.history.start(); @@ -170,6 +163,8 @@ require([ Common.Locale.apply(function(){ require([ + 'common/main/lib/mods/dropdown', + 'common/main/lib/mods/tooltip', 'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Scaling', 'common/main/lib/controller/Themes', diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 2844029e93..22fa75303e 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -69,7 +69,6 @@ class MainController extends Component { '../../../../sdkjs/cell/sdk-all-min.js']); let dep_scripts = [ '../../../vendor/jquery/jquery.min.js', - '../../../vendor/bootstrap/dist/js/bootstrap.min.js', '../../../vendor/underscore/underscore-min.js', '../../../vendor/xregexp/xregexp-all-min.js', '../../../vendor/socketio/socket.io.min.js']; diff --git a/build/common.json b/build/common.json index 238c9e3f92..496a5f9fde 100644 --- a/build/common.json +++ b/build/common.json @@ -129,27 +129,6 @@ ] } }, - "bootstrap": { - "clean": [ - "../deploy/web-apps/vendor/bootstrap" - ], - "copy": { - "script": { - "src": "../vendor/bootstrap/dist/js/bootstrap.min.js", - "dest": "../deploy/web-apps/vendor/bootstrap/dist/js/bootstrap.min.js" - }, - "font": { - "expand": true, - "cwd": "../vendor/bootstrap/dist/fonts/", - "src": "*", - "dest": "../deploy/web-apps/vendor/bootstrap/dist/fonts/" - }, - "css": { - "src": "../vendor/bootstrap/dist/css/bootstrap.min.css", - "dest": "../deploy/web-apps/vendor/bootstrap/dist/css/bootstrap.min.css" - } - } - }, "jquery": { "clean": [ "../deploy/web-apps/vendor/jquery" @@ -278,7 +257,6 @@ "deploy-megapixel", "deploy-jquery", "deploy-underscore", - "deploy-bootstrap", "deploy-iscroll", "deploy-fetch", "deploy-es6-promise", diff --git a/build/documenteditor.json b/build/documenteditor.json index a739234129..14b16b4523 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -26,7 +26,6 @@ "underscore": "../vendor/underscore/underscore", "backbone": "../vendor/backbone/backbone", "text": "../vendor/requirejs-text/text", - "bootstrap": "../vendor/bootstrap/dist/js/bootstrap", "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar", "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "xregexp": "empty:", @@ -55,11 +54,6 @@ ], "exports": "Backbone" }, - "bootstrap": { - "deps": [ - "jquery" - ] - }, "perfectscrollbar": { "deps": [ "jmousewheel" diff --git a/build/presentationeditor.json b/build/presentationeditor.json index a93244d89a..92f9e32c74 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -26,7 +26,6 @@ "underscore": "../vendor/underscore/underscore", "backbone": "../vendor/backbone/backbone", "text": "../vendor/requirejs-text/text", - "bootstrap": "../vendor/bootstrap/dist/js/bootstrap", "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar", "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "xregexp": "empty:", @@ -55,11 +54,6 @@ ], "exports": "Backbone" }, - "bootstrap": { - "deps": [ - "jquery" - ] - }, "perfectscrollbar": { "deps": [ "jmousewheel" diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 33a2726366..606b689f2b 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -26,7 +26,6 @@ "underscore": "../vendor/underscore/underscore", "backbone": "../vendor/backbone/backbone", "text": "../vendor/requirejs-text/text", - "bootstrap": "../vendor/bootstrap/dist/js/bootstrap", "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar", "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "xregexp": "empty:", @@ -55,11 +54,6 @@ ], "exports": "Backbone" }, - "bootstrap": { - "deps": [ - "jquery" - ] - }, "perfectscrollbar": { "deps": [ "jmousewheel"