@shuvi/service 1.0.2 → 1.0.3

package/lib/bundler/bundler.js

@@ -338,13 +338,11 @@ class WebpackBundler {
         }));
     }
     _initDefaultBuildTarget() {
-        const defaultWebpackHelpers = (0, config_1.webpackHelpers)();
         const defaultChain = (0, config_2.createWebpackConfig)(this._cliContext, {
             name: constants_1.BUNDLER_TARGET_CLIENT,
             node: false,
             entry: {},
-            outputDir: constants_2.CLIENT_OUTPUT_DIR,
-            webpackHelpers: defaultWebpackHelpers
+            outputDir: constants_2.CLIENT_OUTPUT_DIR
         });
         return [
             {
@@ -357,7 +355,6 @@ class WebpackBundler {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const targets = [];
-            const defaultWebpackHelpers = (0, config_1.webpackHelpers)();
             // get base config
             const buildTargets = this._initDefaultBuildTarget();
             const extraTargets = (yield this._cliContext.pluginRunner.addExtraTarget({
@@ -366,6 +363,7 @@ class WebpackBundler {
                 webpack: webpack_1.webpack
             })).filter(Boolean);
             buildTargets.push(...extraTargets);
+            const defaultWebpackHelpers = { addExternals: config_1.addExternals };
             for (const buildTarget of buildTargets) {
                 let { chain, name } = buildTarget;
                 // modify config by api hooks
@@ -378,6 +376,7 @@ class WebpackBundler {
                         return (0, webpack_1.resolveWebpackModule)(path);
                     }
                 });
+                (0, config_1.checkWebpackExternals)(chain);
                 if (hasEntry(chain)) {
                     const chainConfig = chain.toConfig();
                     logger_1.default.debug(`${name} Config`);

package/lib/bundler/config.d.ts

@@ -1,6 +1,5 @@
 import { WebpackChain } from '@shuvi/toolpack/lib/webpack/config';
 import { IPluginContext } from '../core';
-import { IWebpackHelpers } from '@shuvi/toolpack/lib/webpack/types';
 export interface IWebpackEntry {
     [x: string]: string | string[];
 }
@@ -10,6 +9,5 @@ export interface IWebpackConfigOptions {
     entry: IWebpackEntry;
     include?: string[];
     outputDir?: string;
-    webpackHelpers: IWebpackHelpers;
 }
-export declare function createWebpackConfig({ mode, assetPublicPath, paths, config }: IPluginContext, { webpackHelpers, ...opts }: IWebpackConfigOptions): WebpackChain;
+export declare function createWebpackConfig({ mode, assetPublicPath, paths, config }: IPluginContext, { ...opts }: IWebpackConfigOptions): WebpackChain;

package/lib/bundler/config.js

@@ -16,7 +16,7 @@ const config_1 = require("@shuvi/toolpack/lib/webpack/config");
 const typescript_1 = require("./typescript");
 const AppSourceRegexp = /([/\\]shuvi-app[/\\])|([/\\]\.shuvi[/\\])/;
 function createWebpackConfig({ mode, assetPublicPath, paths, config }, _a) {
-    var { webpackHelpers } = _a, opts = __rest(_a, ["webpackHelpers"]);
+    var opts = __rest(_a, []);
     const dev = mode === 'development';
     let chain;
     const name = opts.name;
@@ -49,8 +49,7 @@ function createWebpackConfig({ mode, assetPublicPath, paths, config }, _a) {
             compiler,
             jsConfig,
             include,
-            env,
-            webpackHelpers
+            env
         });
     }
     else {
@@ -66,7 +65,6 @@ function createWebpackConfig({ mode, assetPublicPath, paths, config }, _a) {
             jsConfig,
             include,
             env,
-            webpackHelpers,
             analyze: config.analyze
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/service",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -29,13 +29,13 @@
     "@babel/generator": "7.14.5",
     "@babel/parser": "7.14.7",
     "@babel/traverse": "7.14.7",
-    "@shuvi/hook": "1.0.2",
-    "@shuvi/router": "1.0.2",
-    "@shuvi/runtime": "1.0.2",
-    "@shuvi/shared": "1.0.2",
-    "@shuvi/toolpack": "1.0.2",
-    "@shuvi/utils": "1.0.2",
-    "@shuvi/error-overlay": "1.0.2",
+    "@shuvi/hook": "1.0.3",
+    "@shuvi/router": "1.0.3",
+    "@shuvi/runtime": "1.0.3",
+    "@shuvi/shared": "1.0.3",
+    "@shuvi/toolpack": "1.0.3",
+    "@shuvi/utils": "1.0.3",
+    "@shuvi/error-overlay": "1.0.3",
     "commander": "5.1.0",
     "comment-json": "4.2.2",
     "cross-spawn": "7.0.3",