chore: polish @umijs/deps usage, less deps (umijs#6170)

* chore: polish @umijs/deps usage, less deps * fix: testcase
crecreek · Feb 24, 2021 · 6cd86cd · 6cd86cd
1 parent d5110ab
commit 6cd86cd
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 20 deletions.
diff --git a/packages/bundler-webpack/package.json b/packages/bundler-webpack/package.json
@@ -45,8 +45,7 @@
     "postcss-preset-env": "6.7.0",
     "postcss-safe-parser": "4.0.2",
     "terser": "5.6.0",
-    "webpack-chain": "6.5.1",
-    "webpack-sources": "^1.4.3"
+    "webpack-chain": "6.5.1"
   },
   "bin": {
     "bundler-webpack": "bin/bundler-webpack.js"

diff --git a/packages/bundler-webpack/src/webpack/plugins/terser-webpack-plugin/src/index.js b/packages/bundler-webpack/src/webpack/plugins/terser-webpack-plugin/src/index.js
@@ -21,7 +21,7 @@ import { minify as minifyFn } from './minify';
 // webpack 5 exposes the sources property to ensure the right version of webpack-sources is used
 const { SourceMapSource, RawSource, ConcatSource } =
   // eslint-disable-next-line global-require
-  webpack.sources || require('webpack-sources');
+  webpack.sources || require('@umijs/deps/compiled/webpack-sources');
 
 class TerserPlugin {
   constructor(options = {}) {

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -24,7 +24,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@types/node": "14.0.23",
     "@umijs/deps": "0.2.21",
     "@umijs/utils": "3.4.0-beta.2"
   }

diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts
@@ -9,7 +9,6 @@ import {
   Service,
 } from '@umijs/core';
 import { Stream } from 'stream';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import { Server, IServerOpts } from '@umijs/server';
 import { Generator } from '@umijs/utils';
 import { IOpts as IBabelPresetUmiOpts } from '@umijs/babel-preset-umi';
@@ -283,7 +282,7 @@ export interface BaseIConfig extends IConfigCore {
   alias?: {
     [key: string]: string;
   };
-  analyze?: BundleAnalyzerPlugin.Options;
+  analyze?: object;
   autoprefixer?: object;
   base?: string;
   chainWebpack?: {

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -25,7 +25,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@types/webpack-bundle-analyzer": "3.8.0",
     "@umijs/babel-preset-umi": "3.4.0-beta.2",
     "@umijs/core": "3.4.0-beta.2",
     "@umijs/deps": "0.2.21",

diff --git a/yarn.lock b/yarn.lock
@@ -13857,11 +13857,6 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
 source-map-resolve@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
@@ -15347,14 +15342,6 @@ [email protected]:
     deepmerge "^1.5.2"
     javascript-stringify "^2.0.1"
 
-webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"