Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

security update packages #2554

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .babelrc

This file was deleted.

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 17 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -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)/]
}
}
}
2 changes: 1 addition & 1 deletion core/build/webpack.base.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion core/build/webpack.prod.sw.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
},
Expand Down
2 changes: 1 addition & 1 deletion core/build/webpack.server.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand All @@ -10,6 +12,6 @@ describe('CartSummary', () => {
mixins: [CartSummary]
});

expect(wrapper.exists()).toBe(true);
expect(wrapper.isVueInstance()).toBe(true);
})
});
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
22 changes: 12 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
Loading