Danny Coates 6 лет назад
Родитель
Сommit
35a6c7324d
3 измененных файлов с 2376 добавлено и 385 удалено
  1. 2355 372
      package-lock.json
  2. 6 7
      package.json
  3. 15 6
      webpack.config.js

Разница между файлами не показана из-за своего большого размера
+ 2355 - 372
package-lock.json


+ 6 - 7
package.json

@@ -53,17 +53,16 @@
     "node": ">=10.0.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/polyfill": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
     "@dannycoates/webpack-dev-server": "^3.1.4",
-    "@mattiasbuelens/web-streams-polyfill": "0.1.0-alpha.5",
+    "@mattiasbuelens/web-streams-polyfill": "0.1.0",
     "asmcrypto.js": "^2.3.2",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.5",
+    "babel-loader": "^8.0.2",
     "babel-plugin-istanbul": "^4.1.6",
     "babel-plugin-yo-yoify": "^2.0.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "babel-preset-stage-3": "^6.24.1",
     "base64-js": "^1.3.0",
     "content-disposition": "^0.5.2",
     "copy-webpack-plugin": "^4.5.2",

+ 15 - 6
webpack.config.js

@@ -7,9 +7,20 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 const webJsOptions = {
   babelrc: false,
-  presets: [['env', { modules: false }], 'stage-2'],
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        modules: false,
+        useBuiltIns: 'entry'
+      }
+    ]
+  ],
   // yo-yoify converts html template strings to direct dom api calls
-  plugins: ['yo-yoify']
+  plugins: [
+    'yo-yoify',
+    ['@babel/plugin-proposal-class-properties', { loose: false }]
+  ]
 };
 
 const serviceWorker = {
@@ -30,7 +41,7 @@ const web = {
   entry: {
     // babel-polyfill and fluent are directly included in vendor
     // because they are not explicitly referenced by app
-    vendor: ['babel-polyfill', 'fluent'],
+    vendor: ['@babel/polyfill', 'fluent'], //TODO: remove @babel/polyfill
     app: ['./app/main.js'],
     android: ['./android/android.js'],
     ios: ['./ios/ios.js']
@@ -67,9 +78,7 @@ const web = {
               },
               {
                 loader: 'babel-loader',
-                options: {
-                  presets: [['env', { modules: false }], 'stage-3']
-                }
+                options: webJsOptions
               }
             ]
           },

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