Merge pull request #2554 from patzick/feature/security-dependency-fix

security update packages

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The `core/helpers` parsing URL methods exchanged to `query-string` package - @pkarw (#2446)
 - Unit tests in Karma are now removed in favor of jest - @lukeromanowicz (#2305)
 - Material Icons are loaded asynchronously - @JKrupinski, @filrak (#2060)
+- Update to babel 7 - @lukeromanowicz (#2554)
 
 ## [1.8.3] - 2019.03.03
 

babel.config.js

@@ -0,0 +1,17 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        'modules': false
+      }
+    ]
+  ],
+  plugins: ['@babel/plugin-syntax-dynamic-import'],
+  env: {
+    test: {
+      plugins: ['transform-es2015-modules-commonjs'],
+      ignore: [/node_modules\/(?!lodash-es|@vue\/test-utils)/]
+    }
+  }
+}

core/build/webpack.base.config.ts

@@ -85,7 +85,7 @@ export default {
   ],
   devtool: 'source-map',
   entry: {
-    app: ['babel-polyfill', './core/client-entry.ts']
+    app: ['@babel/polyfill', './core/client-entry.ts']
   },
   output: {
     path: path.resolve(__dirname, '../../dist'),

core/build/webpack.prod.sw.config.ts

@@ -6,7 +6,7 @@ import SWPrecachePlugin from 'sw-precache-webpack-plugin';
 module.exports = merge(base, {
   mode: 'production',
   target: 'web',
-  entry: ['babel-polyfill', './core/service-worker/index.js'],
+  entry: ['@babel/polyfill', './core/service-worker/index.js'],
   output: {
     filename: 'core-service-worker.js'
   },

core/build/webpack.server.config.ts

@@ -19,7 +19,7 @@ if (config.server.useOutputCache) {
 export default merge(base, {
   mode: 'development',
   target: 'node',
-  entry: ['babel-polyfill', './core/server-entry.ts'],
+  entry: ['@babel/polyfill', './core/server-entry.ts'],
   output: {
     filename: 'server-bundle.js',
     libraryTarget: 'commonjs2'

core/modules/checkout/test/unit/components/CartSummary.spec.ts

@@ -2,6 +2,8 @@ import {shallowMount} from '@vue/test-utils'
 
 import { CartSummary } from '../../../components/CartSummary'
 
+jest.mock('@vue-storefront/core/compatibility/components/blocks/Microcart/Microcart');
+
 describe('CartSummary', () => {
 
   it('can be initialized', () => {
@@ -10,6 +12,6 @@ describe('CartSummary', () => {
       mixins: [CartSummary]
     });
 
-    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.isVueInstance()).toBe(true);
   })
 });

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       VS_ENV: dev
     network_mode: host
     volumes:
-      - '.babelrc:/var/www/.babelrc'
+      - './babel.config.js:/var/www/babel.config.js'
       - './config:/var/www/config'
       - './core:/var/www/core'
       - './ecosystem.json:/var/www/ecosystem.json'

package.json

@@ -84,17 +84,19 @@
     "vuex-router-sync": "^5.0.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.3.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/polyfill": "^7.2.5",
+    "@babel/preset-env": "^7.3.4",
     "@types/jest": "^23.3.13",
     "@types/node": "^10.12.18",
-    "@vue/test-utils": "^1.0.0-beta.19",
+    "@vue/test-utils": "^1.0.0-beta.29",
     "app-root-path": "^2.0.1",
     "autoprefixer": "^8.6.2",
-    "babel-core": "^6.26.0",
-    "babel-eslint": "^8.2.6",
-    "babel-loader": "^7.1.3",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.6.x",
-    "babel-preset-stage-2": "^6.13.0",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-eslint": "^9.0.0",
+    "babel-jest": "^24.1.0",
+    "babel-loader": "^8.0.5",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
     "command-exists": "^1.2.2",
     "commander": "^2.18.0",
@@ -119,10 +121,10 @@
     "html-webpack-plugin": "^3.2.0",
     "inquirer": "^3.3.0",
     "is-windows": "^1.0.1",
-    "jest": "^23.6.0",
+    "jest": "^24.1.0",
     "jest-serializer-vue": "^2.0.2",
     "jsonfile": "^4.0.0",
-    "lerna": "^2.9.0",
+    "lerna": "^3.13.1",
     "mkdirp": "^0.5.1",
     "node-sass": "^4.9.3",
     "phantomjs-prebuilt": "^2.1.10",
@@ -133,7 +135,7 @@
     "sass-loader": "^7.1.0",
     "shelljs": "^0.8.1",
     "sw-precache-webpack-plugin": "^0.11.5",
-    "ts-jest": "^23.10.5",
+    "ts-jest": "^24.0.0",
     "ts-loader": "^5.3.0",
     "typescript": "^3.1.6",
     "url-loader": "^1.1.2",