chore(cli): bump jest、postcss、webpacl-merge

This commit is contained in:
chenjiahan 2020-10-07 08:07:33 +08:00
parent dd8f37b19c
commit 90f2b098ec
6 changed files with 851 additions and 669 deletions

View File

@ -36,8 +36,7 @@
"devDependencies": { "devDependencies": {
"@types/fs-extra": "^9.0.1", "@types/fs-extra": "^9.0.1",
"@types/lodash": "^4.14.153", "@types/lodash": "^4.14.153",
"@types/postcss-load-config": "^2.0.1", "@types/postcss-load-config": "^2.0.1"
"@types/webpack-merge": "^4.1.5"
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.10.1", "@babel/core": "^7.10.1",
@ -47,7 +46,7 @@
"@babel/preset-env": "^7.10.1", "@babel/preset-env": "^7.10.1",
"@babel/preset-typescript": "^7.10.1", "@babel/preset-typescript": "^7.10.1",
"@nuxt/friendly-errors-webpack-plugin": "^2.5.0", "@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
"@types/jest": "^25.2.3", "@types/jest": "^26.0.0",
"@types/webpack": "^4.41.13", "@types/webpack": "^4.41.13",
"@types/webpack-dev-server": "^3.11.0", "@types/webpack-dev-server": "^3.11.0",
"@vant/eslint-config": "^3.0.0-alpha.2", "@vant/eslint-config": "^3.0.0-alpha.2",
@ -57,9 +56,9 @@
"@vant/touch-emulator": "^1.2.0", "@vant/touch-emulator": "^1.2.0",
"@vue/babel-plugin-jsx": "^1.0.0-rc.3", "@vue/babel-plugin-jsx": "^1.0.0-rc.3",
"@vue/component-compiler-utils": "^3.1.2", "@vue/component-compiler-utils": "^3.1.2",
"@vue/test-utils": "2.0.0-beta.5", "@vue/test-utils": "2.0.0-beta.6",
"address": "^1.1.2", "address": "^1.1.2",
"autoprefixer": "^9.8.0", "autoprefixer": "^10.0.0",
"babel-jest": "^26.0.1", "babel-jest": "^26.0.1",
"babel-loader": "^8.1.0", "babel-loader": "^8.1.0",
"babel-plugin-import": "^1.13.0", "babel-plugin-import": "^1.13.0",
@ -79,7 +78,7 @@
"hash-sum": "^2.0.0", "hash-sum": "^2.0.0",
"html-webpack-plugin": "4.3.0", "html-webpack-plugin": "4.3.0",
"husky": "^4.2.5", "husky": "^4.2.5",
"jest": "^25.5.4", "jest": "^26.0.0",
"jest-canvas-mock": "^2.2.0", "jest-canvas-mock": "^2.2.0",
"jest-serializer-vue": "^2.0.2", "jest-serializer-vue": "^2.0.2",
"less": "^3.11.1", "less": "^3.11.1",
@ -88,7 +87,7 @@
"lodash": "^4.17.15", "lodash": "^4.17.15",
"ora": "^4.0.4", "ora": "^4.0.4",
"portfinder": "^1.0.26", "portfinder": "^1.0.26",
"postcss": "^7.0.31", "postcss": "^8.0.0",
"postcss-loader": "^3.0.0", "postcss-loader": "^3.0.0",
"prettier": "^2.0.5", "prettier": "^2.0.5",
"release-it": "^13.6.1", "release-it": "^13.6.1",
@ -102,7 +101,7 @@
"vue-router": "^4.0.0-beta.10", "vue-router": "^4.0.0-beta.10",
"webpack": "^4.43.0", "webpack": "^4.43.0",
"webpack-dev-server": "3.11.0", "webpack-dev-server": "3.11.0",
"webpack-merge": "^4.2.2", "webpack-merge": "^5.0.0",
"webpackbar": "^4.0.0" "webpackbar": "^4.0.0"
}, },
"release-it": { "release-it": {

View File

@ -6,7 +6,7 @@ import {
readFileSync, readFileSync,
outputFileSync, outputFileSync,
} from 'fs-extra'; } from 'fs-extra';
import merge from 'webpack-merge'; import { merge } from 'webpack-merge';
import { import {
SRC_DIR, SRC_DIR,
getVantConfig, getVantConfig,

View File

@ -1,4 +1,4 @@
import merge from 'webpack-merge'; import { merge } from 'webpack-merge';
import { join } from 'path'; import { join } from 'path';
import { baseConfig } from './webpack.base'; import { baseConfig } from './webpack.base';
import { WebpackConfig } from '../common/types'; import { WebpackConfig } from '../common/types';

View File

@ -1,8 +1,8 @@
import merge from 'webpack-merge';
import WebpackBar from 'webpackbar'; import WebpackBar from 'webpackbar';
import HtmlWebpackPlugin from 'html-webpack-plugin'; import HtmlWebpackPlugin from 'html-webpack-plugin';
import { get } from 'lodash'; import { get } from 'lodash';
import { join } from 'path'; import { join } from 'path';
import { merge } from 'webpack-merge';
import { baseConfig } from './webpack.base'; import { baseConfig } from './webpack.base';
import { WebpackConfig } from '../common/types'; import { WebpackConfig } from '../common/types';
import { getVantConfig, getWebpackConfig } from '../common'; import { getVantConfig, getWebpackConfig } from '../common';

View File

@ -1,4 +1,4 @@
import merge from 'webpack-merge'; import { merge } from 'webpack-merge';
import { get } from 'lodash'; import { get } from 'lodash';
import { WebpackConfig } from '../common/types'; import { WebpackConfig } from '../common/types';
import { getVantConfig, getWebpackConfig } from '../common'; import { getVantConfig, getWebpackConfig } from '../common';

File diff suppressed because it is too large Load Diff