@shuvi/toolpack 1.0.1 → 1.0.3

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

@@ -8,12 +8,11 @@ export interface BaseOptions {
     outputDir: string;
     cacheDir: string;
     include: (string | RegExp)[];
-    typescript?: {
+    jsConfig?: {
         useTypeScript: boolean;
         typeScriptPath?: string;
-        tsConfigPath?: string;
-        tsCompilerOptions?: TsCompilerOptions;
-        resolvedBaseUrl?: string;
+        compilerOptions: TsCompilerOptions;
+        resolvedBaseUrl: string;
     };
     target?: string;
     publicPath?: string;
@@ -29,4 +28,4 @@ export declare function getDefineEnv(env: {
 }): {
     [x: string]: string;
 };
-export declare function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, typescript, name, publicPath, env, cacheDir }: BaseOptions): WebpackChain;
+export declare function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, jsConfig, name, publicPath, env, cacheDir }: BaseOptions): WebpackChain;

package/lib/webpack/config/base.js

@@ -37,7 +37,6 @@ const constants_1 = require("@shuvi/shared/lib/constants");
 const fix_watching_plugin_1 = __importDefault(require("../plugins/fix-watching-plugin"));
 const crypto = __importStar(require("crypto"));
 const jsconfig_paths_plugin_1 = __importDefault(require("../plugins/jsconfig-paths-plugin"));
-const support_ts_extension_resolver_plugin_1 = __importDefault(require("../plugins/support-ts-extension-resolver-plugin"));
 const helpers_1 = require("./parts/helpers");
 const resolveLocalLoader = (name) => path.join(__dirname, `../loaders/${name}`);
 const terserOptions = {
@@ -73,8 +72,7 @@ function getDefineEnv(env) {
     }, {}));
 }
 exports.getDefineEnv = getDefineEnv;
-function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, typescript, name, publicPath = '/', env = {}, cacheDir }) {
-    var _a;
+function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, jsConfig, name, publicPath = '/', env = {}, cacheDir }) {
     const config = new webpack_chain_1.default();
     config.mode(dev ? 'development' : 'production');
     config.bail(!dev);
@@ -225,19 +223,12 @@ function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot,
     config.cache(typeof process.env.SHUVI_DEV_DISABLE_CACHE !== 'undefined'
         ? false
         : getCacheConfig());
-    if (((_a = typescript === null || typescript === void 0 ? void 0 : typescript.tsCompilerOptions) === null || _a === void 0 ? void 0 : _a.paths) && (typescript === null || typescript === void 0 ? void 0 : typescript.resolvedBaseUrl)) {
-        config.resolve
-            .plugin('jsconfig-paths-plugin')
-            .use(jsconfig_paths_plugin_1.default, [
-            typescript.tsCompilerOptions.paths,
-            typescript.resolvedBaseUrl
-        ]);
-    }
-    if (!(typescript === null || typescript === void 0 ? void 0 : typescript.useTypeScript)) {
-        config.resolve
-            .plugin('support-ts-extension-resolver-plugin')
-            .use(support_ts_extension_resolver_plugin_1.default);
-    }
+    config.resolve
+        .plugin('jsconfig-paths-plugin')
+        .use(jsconfig_paths_plugin_1.default, [
+        (jsConfig === null || jsConfig === void 0 ? void 0 : jsConfig.compilerOptions.paths) || {},
+        (jsConfig === null || jsConfig === void 0 ? void 0 : jsConfig.resolvedBaseUrl) || projectRoot
+    ]);
     if (dev) {
         // For webpack-dev-middleware usage
         config.watchOptions({

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/browser.js

@@ -50,13 +50,14 @@ const FRAMEWORK_REACT_MODULES = [
     }
 ];
 function createBrowserWebpackChain(options) {
-    const { cacheDir, typescript, dev, publicPath, analyze } = options;
+    const { projectRoot, cacheDir, jsConfig, dev, publicPath, analyze } = options;
     const chain = (0, base_1.baseWebpackChain)(options);
-    const useTypeScript = !!(typescript === null || typescript === void 0 ? void 0 : typescript.useTypeScript);
+    const useTypeScript = !!(jsConfig === null || jsConfig === void 0 ? void 0 : jsConfig.useTypeScript);
     chain.target('web');
     chain.devtool(dev ? 'cheap-module-source-map' : false);
     chain.resolve.extensions.merge([
-        ...(useTypeScript ? ['.ts', '.tsx'] : []),
+        '.ts',
+        '.tsx',
         '.mjs',
         '.js',
         '.jsx',
@@ -69,9 +70,9 @@ function createBrowserWebpackChain(options) {
             .use(require.resolve('fork-ts-checker-webpack-plugin'), [
             {
                 typescript: {
-                    configFile: typescript.tsConfigPath,
+                    configFile: path.join(projectRoot, 'tsconfig.json'),
                     mode: 'write-references',
-                    typeScriptPath: typescript.typeScriptPath,
+                    typeScriptPath: jsConfig.typeScriptPath,
                     diagnosticOptions: {
                         syntactic: true
                     },

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,14 +4,15 @@ 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, typescript, dev } = options;
+    const { dev } = options;
     const chain = (0, base_1.baseWebpackChain)(options);
-    const useTypeScript = !!(typescript === null || typescript === void 0 ? void 0 : typescript.useTypeScript);
     chain.target('node');
     chain.devtool(dev ? 'cheap-module-source-map' : false);
     chain.resolve.extensions.merge([
-        ...(useTypeScript ? ['.ts', '.tsx'] : []),
+        '.ts',
+        '.tsx',
         '.js',
         '.mjs',
         '.jsx',
@@ -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/lib/webpack/plugins/jsconfig-paths-plugin.d.ts

@@ -38,6 +38,7 @@ declare type Paths = {
 export default class JsConfigPathsPlugin implements ResolvePluginInstance {
     paths: Paths;
     resolvedBaseUrl: string;
+    jsConfigPlugin: boolean;
     constructor(paths: Paths, resolvedBaseUrl: string);
     apply(resolver: Resolver): void;
 }

package/lib/webpack/plugins/jsconfig-paths-plugin.js

@@ -163,19 +163,19 @@ class JsConfigPathsPlugin {
     constructor(paths, resolvedBaseUrl) {
         this.paths = paths;
         this.resolvedBaseUrl = resolvedBaseUrl;
+        this.jsConfigPlugin = true;
     }
     apply(resolver) {
-        const paths = this.paths;
-        const pathsKeys = Object.keys(paths);
-        // If no aliases are added bail out
-        if (pathsKeys.length === 0) {
-            return;
-        }
-        const baseDirectory = this.resolvedBaseUrl;
         const target = resolver.ensureHook('resolve');
         resolver
             .getHook('described-resolve')
             .tapAsync('JsConfigPathsPlugin', (request, resolveContext, callback) => {
+            const paths = this.paths;
+            const pathsKeys = Object.keys(paths);
+            // If no aliases are added bail out
+            if (pathsKeys.length === 0) {
+                return callback();
+            }
             const moduleName = request.request;
             // Exclude node_modules from paths support (speeds up resolving)
             if (request.path.match(NODE_MODULES_REGEX)) {
@@ -209,7 +209,7 @@ class JsConfigPathsPlugin {
                     // try next path candidate
                     return pathCallback();
                 }
-                const candidate = path.join(baseDirectory, curPath);
+                const candidate = path.join(this.resolvedBaseUrl, curPath);
                 const obj = Object.assign({}, request, {
                     request: candidate
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.1",
+  "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.1",
+    "@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.1",
-    "@shuvi/utils": "1.0.1",
+    "@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",