Просмотр исходного кода

Merge pull request #2491 from overleaf/as-unvendor-moment

Unvendor moment from the frontend

GitOrigin-RevId: 19ffc42a2d3e6eecfbec42575a0472f992c8abda
Jessica Lawshe 6 лет назад
Родитель
Сommit
f2943054fb

+ 0 - 1
services/web/app/src/infrastructure/PackageVersions.js

@@ -6,7 +6,6 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const version = {
-  moment: '2.9.0',
   ace: '1.4.5', // Upgrade instructions: https://github.com/overleaf/write_latex/wiki/Upgrading-Ace
   fineuploader: '5.15.4',
   algolia: '2.5.2'

+ 1 - 1
services/web/frontend/js/filters/formatDate.js

@@ -10,7 +10,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 define(['base', 'moment'], function(App, moment) {
-  moment.locale('en', {
+  moment.updateLocale('en', {
     calendar: {
       lastDay: '[Yesterday]',
       sameDay: '[Today]',

+ 1 - 1
services/web/frontend/js/ide/binary-files/controllers/BinaryFileController.js

@@ -1,4 +1,4 @@
-define(['base', 'moment'], (App, moment) =>
+define(['base'], App =>
   App.controller('BinaryFileController', function(
     $scope,
     $rootScope,

Разница между файлами не показана из-за своего большого размера
+ 0 - 5
services/web/frontend/js/vendor/libs/moment-2.9.0.js


+ 6 - 10
services/web/webpack.config.js

@@ -195,13 +195,8 @@ module.exports = {
     alias: {
       // Aliases for AMD modules
 
-      // Vendored dependencies in public/src/vendor/libs (e.g. angular)
+      // Shortcut to vendored dependencies in frontend/js/vendor/libs
       libs: path.join(__dirname, 'frontend/js/vendor/libs'),
-      // Use vendored moment (with correct version)
-      moment: path.join(
-        __dirname,
-        `frontend/js/vendor/libs/${PackageVersions.lib('moment')}`
-      ),
       // Enables ace/ace shortcut
       ace: path.join(
         __dirname,
@@ -249,10 +244,11 @@ module.exports = {
       writeToFileEmit: true
     }),
 
-    // Silence warning when loading moment from vendored dependencies as it
-    // attempts to load locales.js file which does not exist (but this is fine
-    // as we don't want to load the large amount of locale data from moment)
-    new webpack.IgnorePlugin(/^\.\/locale$/, /frontend\/js\/vendor\/libs/),
+    // Prevent moment from loading (very large) locale files that aren't used
+    new webpack.IgnorePlugin({
+      resourceRegExp: /^\.\/locale$/,
+      contextRegExp: /moment$/
+    }),
 
     new CopyPlugin([
       {

Некоторые файлы не были показаны из-за большого количества измененных файлов