@shuvi/toolpack 1.0.55 → 1.0.56

package/lib/babel/plugins/auto-css-modules.d.ts

@@ -3,5 +3,5 @@ export interface IOpts {
     flag?: string;
 }
 export default function (): {
-    visitor: Visitor<{}>;
+    visitor: Visitor;
 };

package/lib/babel/plugins/auto-css-modules.js

@@ -2,6 +2,7 @@
 // Based on https://github.com/umijs/umi/blob/83301f25a420daff69ca51a179134c6b1612f5b6/packages/babel-plugin-auto-css-modules/src/index.ts
 // License: https://github.com/umijs/umi/blob/83301f25a420daff69ca51a179134c6b1612f5b6/LICENSE
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 const path_1 = require("path");
 const CSS_EXTNAMES = ['.css', '.less', '.sass', '.scss'];
 function default_1() {
@@ -21,4 +22,3 @@ function default_1() {
         },
     };
 }
-exports.default = default_1;

package/lib/babel/plugins/dynamic-plugin.js

@@ -23,6 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
 // This file is https://github.com/jamiebuilds/react-loadable/blob/master/src/babel.js
 // Modified to also look for `shuvi/dynamic`
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 function default_1({ types: t }) {
     return {
         visitor: {
@@ -102,4 +103,3 @@ function default_1({ types: t }) {
         }
     };
 }
-exports.default = default_1;

package/lib/babel/plugins/jsx-pragma.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 function default_1({ types: t, }) {
     return {
         inherits: require('babel-plugin-syntax-jsx'),
@@ -74,4 +75,3 @@ function default_1({ types: t, }) {
         },
     };
 }
-exports.default = default_1;

package/lib/babel/plugins/optimize-hook-destructuring.js

@@ -2,6 +2,7 @@
 // Based on https://github.com/zeit/next.js
 // License: https://github.com/zeit/next.js/blob/977bf8d9ebd2845241b8689317f36e4e487f39d0/license.md
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
 // matches any hook-like (the default)
 const isHook = /^use[A-Z]/;
 // matches only built-in hooks provided by React et al
@@ -56,4 +57,3 @@ function default_1({ types: t }) {
         }
     };
 }
-exports.default = default_1;

package/lib/babel/preset.d.ts

@@ -1,10 +1,10 @@
 import { PluginItem } from '@babel/core';
-export declare type PresetOptions = {
+export type PresetOptions = {
     'preset-env'?: any;
     'preset-react'?: any;
     'transform-runtime'?: any;
 };
-declare type BabelPreset = {
+type BabelPreset = {
     presets?: PluginItem[] | null;
     plugins?: PluginItem[] | null;
     sourceType?: 'script' | 'module' | 'unambiguous';

package/lib/utils/bundleRequire.d.ts

@@ -1,7 +1,7 @@
 import { BuildOptions, Plugin as EsbuildPlugin } from 'esbuild';
 export declare const PATH_SEG_RE: RegExp;
 export declare const JS_EXT_RE: RegExp;
-export declare type GetOutputFile = (filepath: string) => string;
+export type GetOutputFile = (filepath: string) => string;
 export interface Options {
     cwd?: string;
     /**
@@ -26,8 +26,8 @@ export declare const match: (id: string, patterns?: (string | RegExp)[]) => bool
  * An esbuild plugin to mark node_modules as external
  */
 export declare const externalPlugin: ({ external, notExternal }?: {
-    external?: (string | RegExp)[] | undefined;
-    notExternal?: (string | RegExp)[] | undefined;
+    external?: (string | RegExp)[];
+    notExternal?: (string | RegExp)[];
 }) => EsbuildPlugin;
 export declare const replaceDirnamePlugin: () => EsbuildPlugin;
 export declare function bundleRequire(filepath: string, options?: Options): Promise<any>;

package/lib/utils/bundleRequire.js

@@ -33,7 +33,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bundleRequire = exports.replaceDirnamePlugin = exports.externalPlugin = exports.match = exports.JS_EXT_RE = exports.PATH_SEG_RE = void 0;
+exports.replaceDirnamePlugin = exports.externalPlugin = exports.match = exports.JS_EXT_RE = exports.PATH_SEG_RE = void 0;
+exports.bundleRequire = bundleRequire;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const esbuild_1 = require("esbuild");
@@ -107,9 +108,9 @@ const replaceDirnamePlugin = () => {
     };
 };
 exports.replaceDirnamePlugin = replaceDirnamePlugin;
-function bundleRequire(filepath, options = {}) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
+function bundleRequire(filepath_1) {
+    return __awaiter(this, arguments, void 0, function* (filepath, options = {}) {
+        var _a, _b;
         if (!exports.JS_EXT_RE.test(filepath)) {
             throw new Error(`${filepath} is not a valid JS file`);
         }
@@ -140,4 +141,3 @@ function bundleRequire(filepath, options = {}) {
         return extractResult(result);
     });
 }
-exports.bundleRequire = bundleRequire;

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

@@ -1,6 +1,6 @@
 import WebpackChain from 'webpack-chain';
 import { CompilerOptions } from '../loaders/shuvi-swc-loader';
-declare type TsCompilerOptions = import('typescript').CompilerOptions;
+type TsCompilerOptions = import('typescript').CompilerOptions;
 export interface BaseOptions {
     dev: boolean;
     name: string;

package/lib/webpack/config/base.js

@@ -26,7 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseWebpackChain = exports.getDefineEnv = exports.WebpackChain = void 0;
+exports.WebpackChain = void 0;
+exports.getDefineEnv = getDefineEnv;
+exports.baseWebpackChain = baseWebpackChain;
 const webpack_chain_1 = __importDefault(require("webpack-chain"));
 exports.WebpackChain = webpack_chain_1.default;
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
@@ -71,7 +73,6 @@ function getDefineEnv(env) {
         return Object.assign(Object.assign({}, acc), { [`process.env.${key}`]: JSON.stringify(env[key]) });
     }, {}));
 }
-exports.getDefineEnv = getDefineEnv;
 /** remove 'shuvi/' of the target name */
 const getSimplifiedTargetName = (targetName) => targetName.replace(/^shuvi\//, '');
 function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, jsConfig, name, publicPath = '/', env = {}, cacheDir, analyze }) {
@@ -268,7 +269,6 @@ function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot,
     }
     return config;
 }
-exports.baseWebpackChain = baseWebpackChain;
 function isValidBase64DataURL(input) {
     // Check if input starts with the data URI scheme
     if (!input.startsWith('data:')) {

package/lib/webpack/config/browser.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBrowserWebpackChain = void 0;
+exports.createBrowserWebpackChain = createBrowserWebpackChain;
 const crypto = __importStar(require("crypto"));
 const webpack_1 = __importDefault(require("webpack"));
 const path = __importStar(require("path"));
@@ -212,4 +212,3 @@ function createBrowserWebpackChain(options) {
         chunkFilename: 'static/css/[contenthash:8].chunk.css'
     });
 }
-exports.createBrowserWebpackChain = createBrowserWebpackChain;

package/lib/webpack/config/node.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodeWebpackChain = void 0;
+exports.createNodeWebpackChain = createNodeWebpackChain;
 const base_1 = require("./base");
 const external_1 = require("./parts/external");
 const style_1 = require("./parts/style");
@@ -45,4 +45,3 @@ function createNodeWebpackChain(options) {
         chunkFilename: 'static/css/[contenthash:8].chunk.css'
     });
 }
-exports.createNodeWebpackChain = createNodeWebpackChain;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nodeExternals = void 0;
+exports.nodeExternals = nodeExternals;
 function match(value, tests) {
     let matched = false;
     for (let index = 0; index < tests.length; index++) {
@@ -85,4 +85,3 @@ function nodeExternals({ projectRoot, include }) {
     };
     return nodeExternal;
 }
-exports.nodeExternals = nodeExternals;

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

@@ -2,7 +2,7 @@ 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 shouldUseRelativeAssetPaths(publicPath: string): publicPath is "./";
 export declare function splitChunksFilter(chunk: any): boolean;
 export declare const commonChunkFilename: ({ dev }: {
     dev: boolean;

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

@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultSplitChunksConfig = exports.defaultCacheGroups = exports.NODE_MODULES_REGEXP = exports.commonChunkFilename = exports.splitChunksFilter = exports.shouldUseRelativeAssetPaths = exports.addExternals = exports.checkWebpackExternals = void 0;
+exports.getDefaultSplitChunksConfig = exports.defaultCacheGroups = exports.NODE_MODULES_REGEXP = exports.commonChunkFilename = exports.addExternals = exports.checkWebpackExternals = void 0;
+exports.shouldUseRelativeAssetPaths = shouldUseRelativeAssetPaths;
+exports.splitChunksFilter = splitChunksFilter;
 const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const externalsFunctionMap = new WeakMap();
 const checkWebpackExternals = (webpackChain) => {
@@ -62,14 +64,12 @@ exports.addExternals = addExternals;
 function shouldUseRelativeAssetPaths(publicPath) {
     return publicPath === './';
 }
-exports.shouldUseRelativeAssetPaths = shouldUseRelativeAssetPaths;
 function splitChunksFilter(chunk) {
     const excludes = {
     // 'static/polyfill': true
     };
     return excludes[chunk.name] !== true;
 }
-exports.splitChunksFilter = splitChunksFilter;
 const commonChunkFilename = ({ dev }) => {
     return `static/common/${dev ? '[name]' : '[name].[contenthash:8]'}.js`;
 };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvePreferTarget = void 0;
+exports.resolvePreferTarget = resolvePreferTarget;
 function resolvePreferTarget(target, extensions) {
     return extensions.reduce((res, ext) => {
         res.push(`.${target}${ext}`);
@@ -8,4 +8,3 @@ function resolvePreferTarget(target, extensions) {
         return res;
     }, []);
 }
-exports.resolvePreferTarget = resolvePreferTarget;

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

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withStyle = void 0;
+exports.withStyle = withStyle;
 const constants_1 = require("@shuvi/shared/constants");
 const Rule_1 = __importDefault(require("webpack-chain/src/Rule"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
@@ -288,4 +288,3 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, lightningCss
     }).after('scss-module'));
     return chain;
 }
-exports.withStyle = withStyle;

package/lib/webpack/dynamic-dll/bundler/index.d.ts

@@ -9,8 +9,8 @@ export interface BuildOptions {
     esmFullSpecific?: Boolean;
     force?: boolean;
 }
-export declare type ShareConfig = Record<string, any>;
-declare type OnBuildComplete = (error?: null | Error) => void;
+export type ShareConfig = Record<string, any>;
+type OnBuildComplete = (error?: null | Error) => void;
 export declare class Bundler {
     private _nextBuild;
     private _completeFns;

package/lib/webpack/dynamic-dll/bundler/index.js

@@ -55,8 +55,8 @@ function getWebpackConfig({ deps, entry, outputDir, shared, externals, esmFullSp
     });
     return chain.toConfig();
 }
-function buildDeps({ deps, dir }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function buildDeps(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ deps, dir }) {
         (0, fs_extra_1.mkdirpSync)(dir);
         // expose files
         yield Promise.all(deps.map((dep) => __awaiter(this, void 0, void 0, function* () {

package/lib/webpack/dynamic-dll/bundler/webpack-config.d.ts

@@ -1,6 +1,6 @@
 import WebpackChain from 'webpack-chain';
 import type { Configuration } from 'webpack';
-declare type ShareConfig = Record<string, any>;
+type ShareConfig = Record<string, any>;
 export interface ConfigOptions {
     name: string;
     entry: string;

package/lib/webpack/dynamic-dll/bundler/webpack-config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfig = void 0;
+exports.getConfig = getConfig;
 const path_1 = __importDefault(require("path"));
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_chain_1 = __importDefault(require("webpack-chain"));
@@ -71,7 +71,7 @@ function getConfig({ name, entry, filename, outputDir, publicPath, shared, exter
         .use('esbuild-loader')
         .loader(require.resolve('esbuild-loader'))
         .options({
-        loader: 'jsx',
+        loader: 'jsx', // Remove this if you're not using JSX
         target: 'es2015' // Syntax to compile to (see options below for possible values)
     });
     const DLL_VERSION = require('../../../../package.json').version;
@@ -113,4 +113,3 @@ function getConfig({ name, entry, filename, outputDir, publicPath, shared, exter
     config.externals(externals);
     return config;
 }
-exports.getConfig = getConfig;

package/lib/webpack/dynamic-dll/constants.d.ts

@@ -1,6 +1,6 @@
 export declare const NAME = "dll";
 export declare const MF_VA_PREFIX = "vf_";
-export declare const DEFAULT_PUBLIC_PATH: string;
+export declare const DEFAULT_PUBLIC_PATH = "/__dll/";
 export declare const DLL_FILENAME = "dll.js";
 export declare const METADATA_FILENAME = "_metadata.json";
 export declare const UPDATE_FILENAME = "_update.json";

package/lib/webpack/dynamic-dll/dep/getCJSExports.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCJSExports = void 0;
+exports.getCJSExports = getCJSExports;
 function getCJSExports({ content }) {
     return matchAll(/Object\.defineProperty\(\s*exports\s*\,\s*[\"|\'](\w+)[\"|\']/g, content)
         .concat(
@@ -47,7 +47,6 @@ function getCJSExports({ content }) {
     }))
         .map(result => result[1]);
 }
-exports.getCJSExports = getCJSExports;
 function matchAll(regexp, str) {
     const result = [];
     let match;

package/lib/webpack/dynamic-dll/dep/getExposeFromContent.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExposeFromContent = void 0;
+exports.getExposeFromContent = getExposeFromContent;
 const assert_1 = __importDefault(require("assert"));
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -73,7 +73,6 @@ export default _;`.trim();
         }
     });
 }
-exports.getExposeFromContent = getExposeFromContent;
 function hasNonDefaultExports(exports) {
     return (exports.filter((exp) => !['__esModule', 'default'].includes(exp))
         .length > 0);

package/lib/webpack/dynamic-dll/dep/getModuleExports.js

@@ -9,14 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getModuleExports = void 0;
+exports.getModuleExports = getModuleExports;
 // @ts-ignore: es-module-lexer misconfigure its package.exports
 const es_module_lexer_1 = require("es-module-lexer");
 const esbuild_1 = require("esbuild");
 const path_1 = require("path");
 const getCJSExports_1 = require("./getCJSExports");
-function getModuleExports({ content, libraryPath }) {
-    return __awaiter(this, void 0, void 0, function* () {
+function getModuleExports(_a) {
+    return __awaiter(this, arguments, void 0, function* ({ content, libraryPath }) {
         // Support tsx and jsx
         if (/\.(tsx|jsx)$/.test(libraryPath)) {
             content = (yield (0, esbuild_1.transform)(content, {
@@ -43,4 +43,3 @@ function getModuleExports({ content, libraryPath }) {
         };
     });
 }
-exports.getModuleExports = getModuleExports;

package/lib/webpack/dynamic-dll/index.d.ts

@@ -3,7 +3,7 @@ import type * as webpackType from 'webpack';
 import type { Configuration } from 'webpack';
 import type WebpackChain from 'webpack-chain';
 import { ShareConfig } from './bundler';
-declare type IResolveWebpackModule = <T extends string>(path: T) => T extends `webpack` ? typeof webpackType : T extends `webpack/${infer R}` ? any : never;
+type IResolveWebpackModule = <T extends string>(path: T) => T extends `webpack` ? typeof webpackType : T extends `webpack/${infer R}` ? any : never;
 interface IOpts {
     cwd?: string;
     rootDir: string;

package/lib/webpack/dynamic-dll/metadata.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeUpdate = exports.getUpdate = exports.writeMetadata = exports.getMetadata = void 0;
+exports.getMetadata = getMetadata;
+exports.writeMetadata = writeMetadata;
+exports.getUpdate = getUpdate;
+exports.writeUpdate = writeUpdate;
 const path_1 = require("path");
 const fs_extra_1 = require("fs-extra");
 const constants_1 = require("./constants");
@@ -31,14 +34,12 @@ function getMetadata(root) {
     }
     return (0, fs_extra_1.readJSONSync)(file);
 }
-exports.getMetadata = getMetadata;
 function writeMetadata(root, content) {
     (0, fs_extra_1.writeJSONSync)((0, path_1.join)(root, constants_1.METADATA_FILENAME), content, {
         spaces: 2
     });
     lastMetadata = content;
 }
-exports.writeMetadata = writeMetadata;
 function getUpdate(root) {
     const file = (0, path_1.join)((0, utils_1.getDllDir)(root), constants_1.UPDATE_FILENAME);
     if (!(0, fs_extra_1.existsSync)(file)) {
@@ -48,7 +49,6 @@ function getUpdate(root) {
     }
     return (0, fs_extra_1.readJSONSync)(file);
 }
-exports.getUpdate = getUpdate;
 function writeUpdate(root, updateModules) {
     if (!lastMetadata) {
         return;
@@ -59,4 +59,3 @@ function writeUpdate(root, updateModules) {
         spaces: 2
     });
 }
-exports.writeUpdate = writeUpdate;

package/lib/webpack/dynamic-dll/moduleCollector.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getModuleCollector = void 0;
+exports.getModuleCollector = getModuleCollector;
 const NODE_MODULES = /node_modules/;
 class ModuleCollector {
     constructor(options) {
@@ -61,4 +61,3 @@ function getModuleCollector(options) {
         exclude: options.exclude
     });
 }
-exports.getModuleCollector = getModuleCollector;

package/lib/webpack/dynamic-dll/plugin/dynamic-dll-plugin.d.ts

@@ -1,8 +1,6 @@
-/// <reference types="node" />
-/// <reference types="webpack-env" />
 import type { Compiler } from 'webpack';
 import { ModuleCollectorOptions, ModuleSnapshot } from '../moduleCollector';
-export declare type SnapshotListener = (snapshot: ModuleSnapshot) => void;
+export type SnapshotListener = (snapshot: ModuleSnapshot) => void;
 export interface DynamicDLLPluginOptions {
     resolveWebpackModule: (s: string) => ReturnType<typeof require>;
     dllName: string;

package/lib/webpack/dynamic-dll/utils.js

@@ -3,27 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDllPendingDir = exports.getDllDir = exports.getDepsDir = exports.isArray = exports.isString = exports.version = void 0;
+exports.version = void 0;
+exports.isString = isString;
+exports.isArray = isArray;
+exports.getDepsDir = getDepsDir;
+exports.getDllDir = getDllDir;
+exports.getDllPendingDir = getDllPendingDir;
 const path_1 = __importDefault(require("path"));
 const pkg = require(path_1.default.resolve(__dirname, '../../..', 'package.json'));
 exports.version = pkg.version;
 function isString(val) {
     return typeof val === 'string';
 }
-exports.isString = isString;
 function isArray(val) {
     return Array.isArray(val);
 }
-exports.isArray = isArray;
 function getDepsDir(dir) {
     return path_1.default.join(dir, 'deps');
 }
-exports.getDepsDir = getDepsDir;
 function getDllDir(dir) {
     return path_1.default.join(dir, 'current');
 }
-exports.getDllDir = getDllDir;
 function getDllPendingDir(dir) {
     return path_1.default.join(dir, 'pending');
 }
-exports.getDllPendingDir = getDllPendingDir;

package/lib/webpack/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveWebpackModule = void 0;
+exports.resolveWebpackModule = resolveWebpackModule;
 const path_1 = require("path");
 const webpackResolveContext = (0, path_1.join)((0, path_1.dirname)(require.resolve('webpack/package.json')), '../');
 __exportStar(require("./webpack"), exports);
@@ -27,4 +27,3 @@ function resolveWebpackModule(path) {
     }
     return require(`${webpackResolveContext}/${path}`);
 }
-exports.resolveWebpackModule = resolveWebpackModule;

package/lib/webpack/loaders/async-import-loader.d.ts

@@ -1,5 +1,5 @@
 import { PitchLoaderDefinitionFunction } from 'webpack';
-export declare type RouteComponentLoaderOptions = {
+export type RouteComponentLoaderOptions = {
     componentAbsolutePath: string;
     active: boolean;
 };

package/lib/webpack/loaders/lightningcss-loader/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { LoaderContext } from 'webpack';
 export default function loader(this: LoaderContext<any>, content: string | Buffer, map?: string): Promise<void>;
 export declare const raw = true;

package/lib/webpack/loaders/lightningcss-loader/index.js

@@ -36,6 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.raw = void 0;
+exports.default = loader;
 const path = __importStar(require("path"));
 const browserslist_1 = __importDefault(require("browserslist"));
 const lightningcss_1 = require("lightningcss");
@@ -176,7 +177,7 @@ function loader(content, map) {
                 }
                 lightningApis.push({
                     importName,
-                    layer: undefined,
+                    layer: undefined, // not support
                     supports,
                     media,
                     index
@@ -366,6 +367,5 @@ function loader(content, map) {
         }
     });
 }
-exports.default = loader;
 // accept Buffers instead of strings
 exports.raw = true;

package/lib/webpack/loaders/lightningcss-loader/utils.js

@@ -12,7 +12,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDataUrl = exports.stringifyRequest = exports.combineRequests = exports.isURLRequestable = exports.resolveRequests = exports.getExportCode = exports.getLightningCssModuleCode = exports.getImportCode = exports.getPreRequester = exports.normalizeSourceMap = exports.requestify = exports.normalizeUrl = exports.getCssModuleOptions = exports.normalizeOptions = void 0;
+exports.normalizeOptions = normalizeOptions;
+exports.getCssModuleOptions = getCssModuleOptions;
+exports.normalizeUrl = normalizeUrl;
+exports.requestify = requestify;
+exports.normalizeSourceMap = normalizeSourceMap;
+exports.getPreRequester = getPreRequester;
+exports.getImportCode = getImportCode;
+exports.getLightningCssModuleCode = getLightningCssModuleCode;
+exports.getExportCode = getExportCode;
+exports.resolveRequests = resolveRequests;
+exports.isURLRequestable = isURLRequestable;
+exports.combineRequests = combineRequests;
+exports.stringifyRequest = stringifyRequest;
+exports.isDataUrl = isDataUrl;
 /*
   MIT License http://www.opensource.org/licenses/mit-license.php
   Author Tobias Koppers @sokra
@@ -57,7 +70,6 @@ function stringifyRequest(loaderContext, request) {
     })
         .join('!'));
 }
-exports.stringifyRequest = stringifyRequest;
 // We can't use path.win32.isAbsolute because it also matches paths starting with a forward slash
 const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
 const IS_MODULE_REQUEST = /^[^?]*~/;
@@ -352,7 +364,6 @@ function isDataUrl(url) {
     }
     return false;
 }
-exports.isDataUrl = isDataUrl;
 const NATIVE_WIN32_PATH = /^[A-Z]:[/\\]|^\\\\/i;
 function normalizeUrl(url, isStringValue) {
     let normalizedUrl = url
@@ -383,7 +394,6 @@ function normalizeUrl(url, isStringValue) {
     }
     return normalizedUrl;
 }
-exports.normalizeUrl = normalizeUrl;
 function requestify(url, rootContext, needToResolveURL = true) {
     if (needToResolveURL) {
         if (/^file:/i.test(url)) {
@@ -402,7 +412,6 @@ function requestify(url, rootContext, needToResolveURL = true) {
     }
     return url;
 }
-exports.requestify = requestify;
 function getValidLocalName(localName, exportLocalsConvention) {
     const result = exportLocalsConvention(localName);
     return Array.isArray(result) ? result[0] : result;
@@ -534,7 +543,6 @@ function normalizeOptions(rawOptions, loaderContext) {
         exportType
     };
 }
-exports.normalizeOptions = normalizeOptions;
 function getCssModuleOptions(options) {
     if (typeof options.modules === 'object') {
         const modules = options.modules;
@@ -547,7 +555,6 @@ function getCssModuleOptions(options) {
     }
     return Boolean(options.modules);
 }
-exports.getCssModuleOptions = getCssModuleOptions;
 const ABSOLUTE_SCHEME = /^[a-z0-9+\-.]+:/i;
 function getURLType(source) {
     if (source[0] === '/') {
@@ -592,7 +599,6 @@ function normalizeSourceMap(map, resourcePath) {
     }
     return newMap;
 }
-exports.normalizeSourceMap = normalizeSourceMap;
 function getPreRequester({ loaders, loaderIndex }) {
     const cache = Object.create(null);
     return number => {
@@ -612,7 +618,6 @@ function getPreRequester({ loaders, loaderIndex }) {
         return cache[number];
     };
 }
-exports.getPreRequester = getPreRequester;
 function getImportCode(imports, options) {
     let code = '';
     for (const item of imports) {
@@ -634,7 +639,6 @@ function getImportCode(imports, options) {
     }
     return code ? `// Imports\n${code}` : '';
 }
-exports.getImportCode = getImportCode;
 function normalizeLightningCssSourceMapForRuntime(map, loaderContext) {
     let resultMap = null;
     if (map instanceof Buffer) {
@@ -741,7 +745,6 @@ function getLightningCssModuleCode(result, api, replacements, options, loaderCon
     // 5 - layer
     return `${beforeCode}// Module\n___CSS_LOADER_EXPORT___.push([module.id, ${code}, ""${sourceMapValue}]);\n`;
 }
-exports.getLightningCssModuleCode = getLightningCssModuleCode;
 function dashesCamelCase(str) {
     return str.replace(/-+(\w)/g, (match, firstLetter) => firstLetter.toUpperCase());
 }
@@ -821,7 +824,6 @@ function getExportCode(exports, replacements, icssPluginUsed, options) {
     code += `${options.esModule ? 'export default' : 'module.exports ='} ${finalExport};\n`;
     return code;
 }
-exports.getExportCode = getExportCode;
 function resolveRequests(resolve, context, possibleRequests) {
     return __awaiter(this, void 0, void 0, function* () {
         return resolve(context, possibleRequests[0])
@@ -835,7 +837,6 @@ function resolveRequests(resolve, context, possibleRequests) {
         });
     });
 }
-exports.resolveRequests = resolveRequests;
 function isURLRequestable(url, options = {}) {
     // Protocol-relative URLs
     if (/^\/\//.test(url)) {
@@ -868,11 +869,9 @@ function isURLRequestable(url, options = {}) {
     }
     return { requestable: true, needResolve: true };
 }
-exports.isURLRequestable = isURLRequestable;
 function combineRequests(preRequest, url) {
     const idx = url.indexOf('!=!');
     return idx !== -1
         ? url.slice(0, idx + 3) + preRequest + url.slice(idx + 3)
         : preRequest + url;
 }
-exports.combineRequests = combineRequests;

package/lib/webpack/loaders/route-component-loader.d.ts

@@ -1,5 +1,5 @@
 import { LoaderDefinition } from 'webpack';
-export declare type RouteComponentLoaderOptions = {
+export type RouteComponentLoaderOptions = {
     componentAbsolutePath: string;
     active: boolean;
 };

package/lib/webpack/loaders/shuvi-swc-loader/getLoaderSWCOptions.d.ts

@@ -1,4 +1,4 @@
-declare type Obj = Record<string, any>;
+type Obj = Record<string, any>;
 export interface CompilerOptions {
     removeConsole?: boolean;
     useDefineForClassFields?: boolean;
@@ -34,7 +34,7 @@ export interface CompilerOptions {
     }>;
     swcPlugins?: [name: string, option: any][];
 }
-export declare type SWCLoaderOptions = {
+export type SWCLoaderOptions = {
     filename: string;
     isServer: boolean;
     isPageFile: boolean;
@@ -110,20 +110,20 @@ export default function getLoaderSWCOptions({ filename, development, isServer, m
     reactRemoveProperties: boolean | undefined;
     modularizeImports: Record<string, {
         transform: string;
-        preventFullImport?: boolean | undefined;
-        skipDefaultConversion?: boolean | undefined;
+        preventFullImport?: boolean;
+        skipDefaultConversion?: boolean;
     }> | undefined;
     styledComponents: {
         displayName: boolean;
-        topLevelImportPaths?: string[] | undefined;
-        ssr?: boolean | undefined;
-        fileName?: boolean | undefined;
-        meaninglessFileNames?: string[] | undefined;
-        minify?: boolean | undefined;
-        transpileTemplateLiterals?: boolean | undefined;
-        namespace?: string | undefined;
-        pure?: boolean | undefined;
-        cssProp?: boolean | undefined;
+        topLevelImportPaths?: string[];
+        ssr?: boolean;
+        fileName?: boolean;
+        meaninglessFileNames?: string[];
+        minify?: boolean;
+        transpileTemplateLiterals?: boolean;
+        namespace?: string;
+        pure?: boolean;
+        cssProp?: boolean;
     } | null;
     emotion: {
         enabled: boolean;

package/lib/webpack/loaders/shuvi-swc-loader/getLoaderSWCOptions.js

@@ -11,7 +11,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParserOptions = void 0;
+exports.getParserOptions = getParserOptions;
+exports.default = getLoaderSWCOptions;
 function getParserOptions(_a) {
     var { filename, compiler } = _a, rest = __rest(_a, ["filename", "compiler"]);
     const isTSFile = filename.endsWith('.ts');
@@ -21,7 +22,6 @@ function getParserOptions(_a) {
         // Exclude regular TypeScript files from React transformation to prevent e.g. generic parameters and angle-bracket type assertion from being interpreted as JSX tags.
         [isTypeScript ? 'tsx' : 'jsx']: !isTSFile, importAssertions: true });
 }
-exports.getParserOptions = getParserOptions;
 function getBaseSWCOptions({ filename, isPageFile, pagePickLoader, minify, development, hasReactRefresh, isServer, compiler, swcCacheDir }) {
     var _a, _b;
     const parserConfig = getParserOptions({ filename, compiler });
@@ -162,4 +162,3 @@ function getLoaderSWCOptions({ filename, development, isServer, minify, isPageFi
     }
     return baseOptions;
 }
-exports.default = getLoaderSWCOptions;

package/lib/webpack/loaders/shuvi-swc-loader/index.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.raw = void 0;
+exports.default = swcLoader;
 const querystring_1 = __importDefault(require("querystring"));
 const constants_1 = require("@shuvi/shared/constants");
 const compiler_1 = require("@shuvi/compiler");
@@ -79,6 +80,5 @@ function swcLoader(inputSource, inputSourceMap) {
         callback && callback(err);
     });
 }
-exports.default = swcLoader;
 // accept Buffers instead of strings
 exports.raw = true;

package/lib/webpack/plugins/jsconfig-paths-plugin.d.ts

@@ -27,7 +27,7 @@ export declare function isString(text: unknown): text is string;
  */
 export declare function matchedText(pattern: Pattern, candidate: string): string;
 export declare function patternText({ prefix, suffix }: Pattern): string;
-declare type Paths = {
+type Paths = {
     [match: string]: string[];
 };
 /**

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

@@ -23,7 +23,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.patternText = exports.matchedText = exports.isString = exports.matchPatternOrExact = exports.findBestPatternMatch = exports.tryParsePattern = exports.pathIsRelative = exports.hasZeroOrOneAsteriskCharacter = void 0;
+exports.hasZeroOrOneAsteriskCharacter = hasZeroOrOneAsteriskCharacter;
+exports.pathIsRelative = pathIsRelative;
+exports.tryParsePattern = tryParsePattern;
+exports.findBestPatternMatch = findBestPatternMatch;
+exports.matchPatternOrExact = matchPatternOrExact;
+exports.isString = isString;
+exports.matchedText = matchedText;
+exports.patternText = patternText;
 /**
  * This webpack resolver is largely based on TypeScript's "paths" handling
  * The TypeScript license can be found here:
@@ -46,14 +53,12 @@ function hasZeroOrOneAsteriskCharacter(str) {
     }
     return true;
 }
-exports.hasZeroOrOneAsteriskCharacter = hasZeroOrOneAsteriskCharacter;
 /**
  * Determines whether a path starts with a relative path component (i.e. `.` or `..`).
  */
 function pathIsRelative(testPath) {
     return /^\.\.?($|[\\/])/.test(testPath);
 }
-exports.pathIsRelative = pathIsRelative;
 function tryParsePattern(pattern) {
     // This should be verified outside of here and a proper error thrown.
     const indexOfStar = pattern.indexOf('*');
@@ -64,7 +69,6 @@ function tryParsePattern(pattern) {
             suffix: pattern.slice(indexOfStar + 1)
         };
 }
-exports.tryParsePattern = tryParsePattern;
 function isPatternMatch({ prefix, suffix }, candidate) {
     return (candidate.length >= prefix.length + suffix.length &&
         candidate.startsWith(prefix) &&
@@ -85,7 +89,6 @@ function findBestPatternMatch(values, getPattern, candidate) {
     }
     return matchedValue;
 }
-exports.findBestPatternMatch = findBestPatternMatch;
 /**
  * patternStrings contains both pattern strings (containing "*") and regular strings.
  * Return an exact match if possible, or a pattern match, or undefined.
@@ -107,14 +110,12 @@ function matchPatternOrExact(patternStrings, candidate) {
     }
     return findBestPatternMatch(patterns, _ => _, candidate);
 }
-exports.matchPatternOrExact = matchPatternOrExact;
 /**
  * Tests whether a value is string
  */
 function isString(text) {
     return typeof text === 'string';
 }
-exports.isString = isString;
 /**
  * Given that candidate matches pattern, returns the text matching the '*'.
  * E.g.: matchedText(tryParsePattern("foo*baz"), "foobarbaz") === "bar"
@@ -122,11 +123,9 @@ exports.isString = isString;
 function matchedText(pattern, candidate) {
     return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
 }
-exports.matchedText = matchedText;
 function patternText({ prefix, suffix }) {
     return `${prefix}*${suffix}`;
 }
-exports.patternText = patternText;
 /**
  * Calls the iterator function for each entry of the array
  * until the first result or error is reached

package/lib/webpack/plugins/module-replace-plugin/plugin.d.ts

@@ -1,5 +1,5 @@
 import { Compiler, Plugin } from 'webpack';
-export declare type ConfigItem = {
+export type ConfigItem = {
     resourceQuery: Function | RegExp;
     module: string;
 };

package/lib/webpack/plugins/module-replace-plugin/plugin.js

@@ -59,9 +59,6 @@ function getKnownModules(id) {
 //   }
 // }
 class ModuleReplacePlugin {
-    constructor(options) {
-        this._options = Object.assign({ modules: [] }, options);
-    }
     static restoreModule(id) {
         const moduleInfos = getKnownModules(id).filter(m => m.action === ModuleAction.REPLACE);
         if (moduleInfos.length < 1) {
@@ -89,6 +86,9 @@ class ModuleReplacePlugin {
             moduleInfo.action = ModuleAction.REPLACE;
         });
     }
+    constructor(options) {
+        this._options = Object.assign({ modules: [] }, options);
+    }
     apply(compiler) {
         var _a;
         const { modules } = this._options;

package/lib/webpack/types.d.ts

@@ -7,7 +7,7 @@ export interface IModule {
     files: string[];
     children: IModuleItem[];
 }
-export declare type IAssetMap = {
+export type IAssetMap = {
     js: string[];
     css?: string[];
 } & {
@@ -32,7 +32,7 @@ export interface IManifest {
         [s: string]: IModule;
     };
 }
-export declare type ExternalsFunction = (data: {
+export type ExternalsFunction = (data: {
     context: string;
     request: string;
 }, callback: (err: Error | null, result: string | undefined) => void) => void;

package/lib/webpack/webpack.d.ts

@@ -1,7 +1,7 @@
 import webpack, { Compilation } from 'webpack';
 export { WebpackChain } from './config';
 export { DynamicDll } from './dynamic-dll';
-declare type ChunkGroup = Compilation['chunkGroups'][0];
+type ChunkGroup = Compilation['chunkGroups'][0];
 export { webpack, ChunkGroup };
 /**
  * re-export for shuvi plugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -20,7 +20,7 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/compiler": "1.0.55",
+    "@shuvi/compiler": "1.0.56",
     "@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.19.0",
-    "@shuvi/shared": "1.0.55",
-    "@shuvi/utils": "1.0.55",
+    "@shuvi/shared": "1.0.56",
+    "@shuvi/utils": "1.0.56",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",
@@ -68,7 +68,7 @@
     "stream-browserify": "3.0.0",
     "style-loader": "2.0.0",
     "terser-webpack-plugin": "5.2.5",
-    "typescript": "4.8.4",
+    "typescript": "5.5.2",
     "vm-browserify": "1.1.2",
     "webpack": "5.73.0",
     "webpack-bundle-analyzer": "4.3.0",