@shuvi/toolpack 1.0.2 → 1.0.3

package/lib/webpack/config/browser.d.ts

@@ -1,7 +1,5 @@
-import { IWebpackHelpers } from '../types';
 import { WebpackChain, BaseOptions } from './base';
 export interface BrowserOptions extends BaseOptions {
-    webpackHelpers: IWebpackHelpers;
     analyze?: boolean;
 }
 export declare function createBrowserWebpackChain(options: BrowserOptions): WebpackChain;

package/lib/webpack/config/node.d.ts

@@ -1,6 +1,2 @@
 import { WebpackChain, BaseOptions } from './base';
-import { IWebpackHelpers } from '../types';
-export interface NodeOptions extends BaseOptions {
-    webpackHelpers: IWebpackHelpers;
-}
-export declare function createNodeWebpackChain(options: NodeOptions): WebpackChain;
+export declare function createNodeWebpackChain(options: BaseOptions): WebpackChain;

package/lib/webpack/config/node.js

@@ -4,8 +4,9 @@ exports.createNodeWebpackChain = void 0;
 const base_1 = require("./base");
 const external_1 = require("./parts/external");
 const style_1 = require("./parts/style");
+const helpers_1 = require("./parts/helpers");
 function createNodeWebpackChain(options) {
-    const { webpackHelpers, dev } = options;
+    const { dev } = options;
     const chain = (0, base_1.baseWebpackChain)(options);
     chain.target('node');
     chain.devtool(dev ? 'cheap-module-source-map' : false);
@@ -23,7 +24,7 @@ function createNodeWebpackChain(options) {
     chain.resolve.mainFields.clear().add('main').add('module');
     chain.output.libraryTarget('commonjs2');
     chain.optimization.minimize(false);
-    webpackHelpers.addExternals(chain, (0, external_1.nodeExternals)({
+    (0, helpers_1.addExternals)(chain, (0, external_1.nodeExternals)({
         projectRoot: options.projectRoot,
         include: options.include
     }));

package/lib/webpack/config/parts/helpers.d.ts

@@ -1,5 +1,7 @@
-import { IWebpackHelpers } from '../../types';
-export declare const webpackHelpers: () => IWebpackHelpers;
+import { WebpackChain } from '../base';
+import { ExternalsFunction } from '../../types';
+export declare const checkWebpackExternals: (webpackChain: WebpackChain) => void;
+export declare const addExternals: (webpackChain: WebpackChain, externalFn: ExternalsFunction) => void;
 export declare function shouldUseRelativeAssetPaths(publicPath: string): boolean;
 export declare function splitChunksFilter(chunk: any): boolean;
 export declare const commonChunkFilename: ({ dev }: {

package/lib/webpack/config/parts/helpers.js

@@ -1,7 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commonChunkFilename = exports.splitChunksFilter = exports.shouldUseRelativeAssetPaths = exports.webpackHelpers = void 0;
-const webpackHelpers = () => {
+exports.commonChunkFilename = exports.splitChunksFilter = exports.shouldUseRelativeAssetPaths = exports.addExternals = exports.checkWebpackExternals = void 0;
+const invariant_1 = __importDefault(require("@shuvi/utils/lib/invariant"));
+const externalsFunctionMap = new WeakMap();
+const checkWebpackExternals = (webpackChain) => {
+    let externals = webpackChain.get('externals');
+    (0, invariant_1.default)(!externals ||
+        (typeof externals === 'function' &&
+            externals.name === 'defaultExternalsFn'), `Externals was modified directly, addExternals will have no effect.`);
+};
+exports.checkWebpackExternals = checkWebpackExternals;
+const initExternalsHelpers = (webpackChain) => {
     const externalFns = [];
     const defaultExternalsFn = ({ context, request }, callback) => {
         let callbackCalled = false;
@@ -27,23 +39,26 @@ const webpackHelpers = () => {
             callback(null, undefined);
         }
     };
-    return {
-        addExternals: (webpackChain, externalFn) => {
-            let externals = webpackChain.get('externals');
-            if (!externals) {
-                externals = defaultExternalsFn;
-                webpackChain.externals(externals);
-            }
-            if (typeof externals === 'function' &&
-                externals.name === 'defaultExternalsFn') {
-                externalFns.push(externalFn);
-                return;
-            }
-            throw new Error('Externals was modified directly, addExternals will have no effect.');
-        }
-    };
+    let externals = webpackChain.get('externals');
+    (0, invariant_1.default)(!externals, `webpackChain externals has been set, initWebpackHelpers can't work as expected.`);
+    if (!externals) {
+        externals = defaultExternalsFn;
+        webpackChain.externals(externals);
+        externalsFunctionMap.set(webpackChain, externalFns);
+    }
+};
+const addExternals = (webpackChain, externalFn) => {
+    let externals = webpackChain.get('externals');
+    if (!externals) {
+        initExternalsHelpers(webpackChain);
+    }
+    else {
+        (0, exports.checkWebpackExternals)(webpackChain);
+    }
+    const externalFns = externalsFunctionMap.get(webpackChain);
+    externalFns.push(externalFn);
 };
-exports.webpackHelpers = webpackHelpers;
+exports.addExternals = addExternals;
 function shouldUseRelativeAssetPaths(publicPath) {
     return publicPath === './';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -20,7 +20,7 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/compiler": "1.0.2",
+    "@shuvi/compiler": "1.0.3",
     "@babel/core": "7.12.10",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
@@ -35,8 +35,8 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/runtime": "7.12.5",
     "lightningcss": "1.15.0",
-    "@shuvi/shared": "1.0.2",
-    "@shuvi/utils": "1.0.2",
+    "@shuvi/shared": "1.0.3",
+    "@shuvi/utils": "1.0.3",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",