@codelet/cli-service 0.0.16 → 0.0.18

package/dist/config.d.ts

@@ -6,6 +6,8 @@ export interface Config {
     source?: string[];
     /** 不参与打包、运行时 require 的外部脚本 */
     externalSource?: string[];
+    /** 微信构建后的 npm 目录，会原样复制到 dist，并按裸模块外部引入 */
+    npmDir?: string;
     /** 第一页 */
     pageIndex?: string;
     /** 静态文件 */

package/dist/config.js

@@ -14,11 +14,12 @@ const path_1 = __importDefault(require("path"));
 const webpackbar_1 = __importDefault(require("webpackbar"));
 const utils_1 = require("./utils");
 function getDefaultConfig(options) {
-    const { entryPath, source, externalSource, pageIndex, publicDir, isDev } = Object.assign({
+    const { entryPath, source, externalSource, npmDir, pageIndex, publicDir, isDev } = Object.assign({
         isDev: false,
         pageIndex: '',
         publicDir: 'public',
         externalSource: [],
+        npmDir: '',
         entryPath: './src',
         source: [
             'app.(js|ts)',
@@ -31,6 +32,7 @@ function getDefaultConfig(options) {
         entryPath,
         externalFiles,
     });
+    const resolveNpmDirRequest = npmDir ? (0, utils_1.createNpmDirRequestResolver)(npmDir) : () => '';
     // 模式
     const mode = isDev ? 'development' : 'production';
     // 插件
@@ -50,6 +52,7 @@ function getDefaultConfig(options) {
                     noErrorOnMissing: true, // 若 public 目录不存在时不报错
                 },
                 ...(0, utils_1.createExternalCopyPatterns)(entryPath, externalSource),
+                ...(0, utils_1.createNpmDirCopyPatterns)(npmDir),
             ],
         }),
         new webpackbar_1.default(),
@@ -83,35 +86,48 @@ function getDefaultConfig(options) {
         entryPath,
         source,
         externalSource,
+        npmDir,
         publicDir,
         webpack: {
             mode,
             devtool: false,
-            externalsType: 'commonjs',
-            externals: [
-                ({ context, request }, callback) => {
-                    if (!context || !request) {
-                        callback();
-                        return;
-                    }
-                    const targetFile = resolveExternalFile(context, request);
-                    if (!targetFile) {
-                        callback();
-                        return;
-                    }
-                    const targetRequest = path_1.default
-                        .relative((0, utils_1.resolve)(entryPath), targetFile)
-                        .replace(/\\/g, '/')
-                        .replace(/\.js$/, '');
-                    callback(null, `commonjs ${utils_1.externalRequestPlaceholderPrefix}${targetRequest}`);
-                },
-            ],
+            ...(externalSource.length > 0 || Boolean(npmDir)
+                ? {
+                    externalsType: 'commonjs',
+                    externals: [
+                        ({ context, request }, callback) => {
+                            if (!context || !request) {
+                                callback();
+                                return;
+                            }
+                            const npmRequest = resolveNpmDirRequest(request);
+                            if (npmRequest) {
+                                callback(null, `commonjs ${npmRequest}`);
+                                return;
+                            }
+                            const targetFile = resolveExternalFile(context, request);
+                            if (!targetFile) {
+                                callback();
+                                return;
+                            }
+                            const targetRequest = path_1.default
+                                .relative((0, utils_1.resolve)(entryPath), targetFile)
+                                .replace(/\\/g, '/')
+                                .replace(/\.js$/, '');
+                            callback(null, `commonjs ${utils_1.externalRequestPlaceholderPrefix}${targetRequest}`);
+                        },
+                    ],
+                }
+                : {}),
             output: {
                 filename: '[name].js',
                 path: (0, utils_1.resolve)('dist'),
                 publicPath: '/',
                 clean: true,
             },
+            watchOptions: {
+                ignored: (0, utils_1.createWatchIgnored)([publicDir, npmDir]),
+            },
             resolve: {
                 alias: {
                     '@': (0, utils_1.resolve)(entryPath),

package/dist/utils.d.ts

@@ -13,10 +13,13 @@ export declare const parseDir: (entryPath: string, source: string[]) => {
 };
 export declare const resolveExternalFiles: (entryPath: string, externalSource: string[]) => string[];
 export declare const createExternalCopyPatterns: (entryPath: string, externalSource: string[]) => ObjectPattern[];
+export declare const createNpmDirCopyPatterns: (npmDir: string) => ObjectPattern[];
 export declare const createExternalRequestResolver: (options: {
     entryPath: string;
     externalFiles: string[];
 }) => (context: string, request: string) => string;
+export declare const createNpmDirRequestResolver: (npmDir: string) => (request: string) => string;
+export declare const createWatchIgnored: (dirs: string[]) => NonNullable<NonNullable<Configuration["watchOptions"]>["ignored"]>;
 export declare class RewriteExternalRequestPlugin {
     apply(compiler: Compiler): void;
 }

package/dist/utils.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.createOptimization = exports.RewriteExternalRequestPlugin = exports.createExternalRequestResolver = exports.createExternalCopyPatterns = exports.resolveExternalFiles = exports.parseDir = exports.resolveSourceRoot = exports.resolveEntryRoot = exports.resolve = exports.externalRequestPlaceholderPrefix = exports.cmd = void 0;
+exports.createOptimization = exports.RewriteExternalRequestPlugin = exports.createWatchIgnored = exports.createNpmDirRequestResolver = exports.createExternalRequestResolver = exports.createNpmDirCopyPatterns = exports.createExternalCopyPatterns = exports.resolveExternalFiles = exports.parseDir = exports.resolveSourceRoot = exports.resolveEntryRoot = exports.resolve = exports.externalRequestPlaceholderPrefix = exports.cmd = void 0;
 exports.getOptionValue = getOptionValue;
 exports.parseArgv = parseArgv;
 exports.getConfig = getConfig;
@@ -53,6 +53,19 @@ const createExternalCopyPatterns = (entryPath, externalSource) => {
     }));
 };
 exports.createExternalCopyPatterns = createExternalCopyPatterns;
+const createNpmDirCopyPatterns = (npmDir) => {
+    if (!npmDir) {
+        return [];
+    }
+    return [
+        {
+            from: (0, exports.resolve)(npmDir),
+            to: path_1.default.basename(npmDir),
+            noErrorOnMissing: true,
+        },
+    ];
+};
+exports.createNpmDirCopyPatterns = createNpmDirCopyPatterns;
 const createExternalRequestResolver = (options) => {
     const entryRoot = (0, exports.resolveEntryRoot)(options.entryPath);
     const externalFileSet = new Set(options.externalFiles);
@@ -80,6 +93,31 @@ const createExternalRequestResolver = (options) => {
     };
 };
 exports.createExternalRequestResolver = createExternalRequestResolver;
+const createNpmDirRequestResolver = (npmDir) => {
+    const npmRoot = (0, exports.resolve)(npmDir);
+    return (request) => {
+        if (!request ||
+            request.startsWith('.') ||
+            request.startsWith('@/') ||
+            path_1.default.isAbsolute(request)) {
+            return '';
+        }
+        const requestPath = request.replace(/\\/g, '/');
+        const candidates = [
+            path_1.default.join(npmRoot, requestPath),
+            path_1.default.join(npmRoot, `${requestPath}.js`),
+            path_1.default.join(npmRoot, `${requestPath}.json`),
+            path_1.default.join(npmRoot, requestPath, 'index.js'),
+            path_1.default.join(npmRoot, requestPath, 'index.json'),
+        ];
+        return candidates.some((candidate) => fs_1.default.existsSync(candidate)) ? request : '';
+    };
+};
+exports.createNpmDirRequestResolver = createNpmDirRequestResolver;
+const createWatchIgnored = (dirs) => {
+    return dirs.filter(Boolean).map((dir) => (0, exports.resolve)(dir).replace(/\\/g, '/'));
+};
+exports.createWatchIgnored = createWatchIgnored;
 class RewriteExternalRequestPlugin {
     apply(compiler) {
         compiler.hooks.thisCompilation.tap('RewriteExternalRequestPlugin', (compilation) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codelet/cli-service",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "cli-service",
   "bin": {
     "codelet-cli-service": "./bin/codelet-cli-service.js"
@@ -41,10 +41,10 @@
     "webpack": "5.89.0",
     "webpack-merge": "^5.10.0",
     "webpackbar": "^6.0.0",
-    "@codelet/app-json-webpack-plugin": "^0.0.8",
-    "@codelet/copy-loader": "^0.0.7",
     "@codelet/hmr-webpack-plugin": "^0.0.3",
+    "@codelet/app-json-webpack-plugin": "^0.0.8",
     "@codelet/inject-chunk-webpack-plugin": "^0.0.8",
+    "@codelet/copy-loader": "^0.0.7",
     "@codelet/wxml-loader": "^0.0.9"
   },
   "devDependencies": {