Merge branch 'debowerify' of https://github.com/Pamplemousse/cryptpad …

…into debower
cryptpad · Feb 1, 2023 · 6e3c407 · 6e3c407
2 parents 508a072 + 5729a38
commit 6e3c407
Show file tree

Hide file tree

Showing 199 changed files with 3,212 additions and 571 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 datastore
 tasks
-www/bower_components/*
+www/components/*
 www/accounts
 node_modules
 /config.js

diff --git a/bower.json b/bower.json
diff --git a/customize.dist/404.html b/customize.dist/404.html
@@ -6,7 +6,7 @@
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/favicon/main-favicon.png" id="favicon"/>
-    <script async data-bootload="/customize/four-oh-four.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/customize/four-oh-four.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
 </head>
 <body class="html">
 <noscript>

diff --git a/customize.dist/500.html b/customize.dist/500.html
@@ -6,7 +6,7 @@
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" type="image/png" href="/customize/favicon/main-favicon.png" id="favicon"/>
-    <script async data-bootload="/customize/four-oh-four.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/customize/four-oh-four.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
 </head>
 <body class="html">
 <noscript>

diff --git a/customize.dist/ckeditor-config.js b/customize.dist/ckeditor-config.js
@@ -62,7 +62,7 @@ CKEDITOR.editorConfig = function( config ) {
     // every part of ckeditor will get in the browser cache.
     var fix = function (x) {
         if (x.map) { return x.map(fix); }
-        return (/\/bower_components\/.*\.css$/.test(x)) ? (x + '?ver=' + CKEDITOR.timestamp) : x;
+        return (/\/components\/.*\.css$/.test(x)) ? (x + '?ver=' + CKEDITOR.timestamp) : x;
     };
     CKEDITOR.tools._buildStyleHtml = CKEDITOR.tools.buildStyleHtml;
     CKEDITOR.document._appendStyleSheet = CKEDITOR.document.appendStyleSheet;

diff --git a/customize.dist/contact.html b/customize.dist/contact.html
@@ -8,7 +8,7 @@
     <link rel="icon" type="image/png" href="/customize/favicon/main-favicon.png" id="favicon"/>
     <script src="/customize/pre-loading.js?ver=1.1"></script>
     <link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
-    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
 </head>
 <body class="html">
 <noscript></noscript>

diff --git a/customize.dist/delta-words.js b/customize.dist/delta-words.js
@@ -1,5 +1,5 @@
 define([
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
 ], function (ChainPad) {
     var Diff = ChainPad.Diff;
 

diff --git a/customize.dist/features.html b/customize.dist/features.html
@@ -8,7 +8,7 @@
     <link rel="icon" type="image/png" href="/customize/favicon/main-favicon.png" id="favicon"/>
     <script src="/customize/pre-loading.js?ver=1.1"></script>
     <link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
-    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
 </head>
 <body class="html">
 <noscript></noscript>
diff --git a/customize.dist/fonts/open-sans.less b/customize.dist/fonts/open-sans.less
@@ -1,6 +1,6 @@
 /* Open Sans @font-face kit */
 
-@OpenSansPath: "/bower_components/open-sans-fontface/fonts";
+@OpenSansPath: "/components/open-sans-fontface/fonts";
 
 /* BEGIN Light */
 @font-face {

diff --git a/customize.dist/index.html b/customize.dist/index.html
@@ -8,7 +8,7 @@
     <link rel="icon" type="image/png" href="/customize/favicon/main-favicon.png" id="favicon"/>
     <script src="/customize/pre-loading.js?ver=1.1"></script>
     <link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
-    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
 </head>
 <body class="html">
 <noscript></noscript>
diff --git a/customize.dist/login.js b/customize.dist/login.js
@@ -1,23 +1,23 @@
 define([
     'jquery',
     'chainpad-listmap',
-    '/bower_components/chainpad-crypto/crypto.js',
+    '/components/chainpad-crypto/crypto.js',
     '/common/common-util.js',
     '/common/outer/network-config.js',
     '/common/common-credential.js',
-    '/bower_components/chainpad/chainpad.dist.js',
+    '/components/chainpad/chainpad.dist.js',
     '/common/common-realtime.js',
     '/common/common-constants.js',
     '/common/common-interface.js',
     '/common/common-feedback.js',
     '/common/outer/local-store.js',
     '/customize/messages.js',
-    '/bower_components/nthen/index.js',
+    '/components/nthen/index.js',
     '/common/outer/login-block.js',
     '/common/common-hash.js',
 
-    '/bower_components/tweetnacl/nacl-fast.min.js',
-    '/bower_components/scrypt-async/scrypt-async.min.js', // better load speed
+    '/components/tweetnacl/nacl-fast.min.js',
+    '/components/scrypt-async/scrypt-async.min.js', // better load speed
 ], function ($, Listmap, Crypto, Util, NetConfig, Cred, ChainPad, Realtime, Constants, UI,
             Feedback, LocalStore, Messages, nThen, Block, Hash) {
     var Exports = {

diff --git a/customize.dist/src/less2/include/loading.less b/customize.dist/src/less2/include/loading.less
@@ -6,11 +6,11 @@
 #cp-loading {
     @font-face {
       font-family: 'Open Sans';
-      src: url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot');
-      src: url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
-           url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.woff') format('woff'),
-           url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.ttf') format('truetype'),
-           url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg');
+      src: url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot');
+      src: url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),
+           url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.woff') format('woff'),
+           url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.ttf') format('truetype'),
+           url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg');
       font-weight: normal;
       font-style: normal;
     }

diff --git a/customize.dist/src/template.html b/customize.dist/src/template.html
@@ -8,7 +8,7 @@
     <link rel="icon" type="image/png" href="/customize/favicon/main-favicon.png" id="favicon"/>
     <script src="/customize/pre-loading.js?ver=1.1"></script>
     <link href="/customize/src/pre-loading.css?ver=1.0" rel="stylesheet" type="text/css">
-    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/components/requirejs/require.js?ver=2.3.5"></script>
 </head>
 <body class="html">
 <noscript></noscript>
diff --git a/customize.dist/template.js b/customize.dist/template.js
@@ -2,9 +2,9 @@ define([
     'jquery',
     '/common/hyperscript.js',
     '/customize/pages.js',
-    '/bower_components/nthen/index.js',
+    '/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.
@@ -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());