xhs-mp-compiler-cli 2.0.0-beta.3 → 2.0.0

package/package.json

@@ -1,11 +1,24 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./sharedFs": {
+      "require": "./dist/sharedFs.js",
+      "import": "./dist/sharedFs.js",
+      "types": "./dist/sharedFs.d.ts"
+    },
+    "./*.map": "./dist/*.map"
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -20,11 +33,6 @@
   "author": "zyu1 <fuzhu@xiaohongshu.com>",
   "license": "MIT",
   "dependencies": {
-    "archiver": "^7.0.1",
-    "debug": "^4.3.4",
-    "globby": "^11.1.0",
-    "query-string": "^8.1.0",
-    "yauzl": "^2.10.0",
     "@babel/core": "^7.12.10",
     "@babel/generator": "^7.12.10",
     "@babel/parser": "^7.12.10",
@@ -38,11 +46,11 @@
     "@swc/core": "^1.3.74",
     "@swc/helpers": "^0.5.1",
     "@vue/babel-preset-jsx": "^1.2.4",
+    "archiver": "^7.0.1",
     "babel-loader": "^8.2.2",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-preset-minify": "^0.4.3",
     "clean-webpack-plugin": "^3.0.0",
-    "uuid": "^9.0.1",
     "clone": "^2.1.2",
     "commander": "^8.0.0",
     "copy-webpack-plugin": "^9.0.1",
@@ -50,11 +58,12 @@
     "css-loader": "^5.0.2",
     "css-minimizer-webpack-plugin": "^1.2.0",
     "cssnano": "4.1.10",
+    "debug": "^4.3.4",
     "enhanced-resolve": "^5.8.3",
     "fork-ts-checker-webpack-plugin": "^6.1.0",
-    "friendly-errors-webpack-plugin": "^1.7.0",
     "fs-extra": "^10.0.0",
     "glob": "^8.0.1",
+    "globby": "^11.1.0",
     "htmlparser2": "^7.1.2",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^1.6.2",
@@ -67,6 +76,7 @@
     "postcss-prefix-selector": "^1.10.0",
     "postcss-preset-env": "^6.7.0",
     "postcss-pxtorem": "^5.1.1",
+    "query-string": "^8.1.0",
     "querystring": "^0.2.1",
     "source-map": "^0.6.1",
     "speed-measure-webpack-plugin": "^1.5.0",
@@ -75,6 +85,7 @@
     "tapable": "^2.2.1",
     "terser-webpack-plugin": "^5.2.4",
     "typescript": "^5.1.6",
+    "uuid": "^9.0.1",
     "vue": "^3.2.26",
     "vue-loader": "^16.4.1",
     "vue-style-loader": "^4.1.2",
@@ -82,11 +93,18 @@
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
-    "xhs-mp-compiler-ml-loader": "2.0.0-beta.3",
-    "xhs-mp-compiler-utils": "2.0.0-beta.3",
-    "xhs-mp-pack": "^2.0.0-beta.3",
-    "xhs-mp-project": "^2.0.0-beta.3",
-    "xhs-mp-utils": "^2.0.0-beta.3"
+    "xhs-mp-workerpool": "^9.1.3",
+    "xhs-mp-ml-loader": "2.0.0",
+    "xhs-mp-compiler-utils": "1.11.0",
+    "xhs-mp-pack": "1.11.0",
+    "xhs-mp-project": "1.11.0",
+    "xhs-mp-shared": "1.11.0",
+    "xhs-mp-shared-fs": "1.11.0",
+    "xhs-mp-sjs-loader": "1.11.0",
+    "yauzl": "^2.10.0"
+  },
+  "peerDependencies": {
+    "xhs-mp-ml-parser": "2.0.0"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",
@@ -110,7 +128,8 @@
     "ts-node": "10.0.0",
     "typescript": "5.1.6",
     "vue3-jest": "27.0.0-alpha.2",
-    "webpack-dev-server": "4.0.0-beta.3"
+    "webpack-dev-server": "4.0.0-beta.3",
+    "xhs-mp-ml-parser": "2.0.0"
   },
   "scripts": {
     "version": "formula changelog && git add .",

package/dist/compilerCP.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/compilerCP.js

@@ -1,175 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const packs_1 = require("./packs");
-let globalConfig = JSON.parse(process.argv[2]);
-let hadWatchBuilt = false;
-let projectCompiler;
-/* 发送消息给父进程 */
-const sendToMaster = (method, data = {}) => {
-    var _a;
-    (_a = process.send) === null || _a === void 0 ? void 0 : _a.call(process, JSON.stringify(Object.assign({ method }, data)));
-};
-const tryGC = () => {
-    if (global.gc) {
-        global.gc();
-    }
-};
-function formatWebpackMessages(err, stats) {
-    if (err) {
-        return { errors: [err.message], warnings: [] };
-    }
-    const json = stats.toJson({ warnings: true, errors: true, all: false });
-    const formattedErrors = json.errors.map(item => item.message);
-    const formattedWarnings = json.warnings.map(item => item.message);
-    const result = { errors: formattedErrors, warnings: formattedWarnings };
-    return result;
-}
-const handlers = {
-    runWatch: (msg) => __awaiter(void 0, void 0, void 0, function* () {
-        const { uuid, data } = msg;
-        if (!projectCompiler) {
-            projectCompiler = (0, packs_1.createCompiler)(data);
-        }
-        sendToMaster('run watch start');
-        const { err, stats } = (yield projectCompiler.watch({
-            scene: data.scene
-        }, (err, stats) => {
-            var _a;
-            console.log('file change...', err, stats);
-            // 修改文件时构建
-            const hasError = err || ((_a = stats === null || stats === void 0 ? void 0 : stats.hasErrors) === null || _a === void 0 ? void 0 : _a.call(stats));
-            if (hasError) {
-                sendToMaster('emitCompileStats', {
-                    stats: formatWebpackMessages(err, stats)
-                });
-                return;
-            }
-            sendToMaster('compileFinishWhenFileChange');
-        }));
-        console.log('it is watching...', err, stats);
-        const hasError = err || stats.hasErrors();
-        if (hasError) {
-            sendToMaster('callback', {
-                uuid,
-                success: false,
-                stats: formatWebpackMessages(err, stats)
-            });
-        }
-        else {
-            hadWatchBuilt = true;
-            sendToMaster('callback', {
-                uuid,
-                success: true
-            });
-        }
-    }),
-    changeCompileOptions(msg) {
-        const { data } = msg;
-        projectCompiler === null || projectCompiler === void 0 ? void 0 : projectCompiler.changeCompileOptions(data);
-    },
-    activatePkgs: (msg) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const { uuid, data: { compilePkgs } } = msg;
-        console.log('run activate start', compilePkgs);
-        const { err, stats } = (yield ((_b = (_a = projectCompiler).activatePkgs) === null || _b === void 0 ? void 0 : _b.call(_a, compilePkgs)));
-        console.log('run activate finish', err, stats);
-        const hasError = err || ((_c = stats === null || stats === void 0 ? void 0 : stats.hasErrors) === null || _c === void 0 ? void 0 : _c.call(stats));
-        if (hasError) {
-            sendToMaster('callback', {
-                uuid,
-                success: false,
-                stats: formatWebpackMessages(err, stats)
-            });
-        }
-        else {
-            hadWatchBuilt = true;
-            sendToMaster('callback', {
-                uuid,
-                success: true
-            });
-        }
-    }),
-    runBuild: msg => {
-        console.log('sp run build', msg);
-        const { uuid, data } = msg;
-        if (!projectCompiler) {
-            projectCompiler = (0, packs_1.createCompiler)(data);
-        }
-        projectCompiler.on('progress', progress => {
-            sendToMaster('compilePercent', {
-                percentage: progress
-            });
-        });
-        projectCompiler.build((err, stats) => {
-            var _a;
-            const hasError = err || ((_a = stats === null || stats === void 0 ? void 0 : stats.hasErrors) === null || _a === void 0 ? void 0 : _a.call(stats));
-            console.log('sp run build finish', stats);
-            if (hasError) {
-                const statsInfo = formatWebpackMessages(err, stats);
-                sendToMaster('callback', {
-                    uuid,
-                    success: false,
-                    stats: statsInfo
-                });
-                return;
-            }
-            sendToMaster('callback', {
-                uuid,
-                success: true
-            });
-            tryGC();
-        });
-    },
-    runTask: (msg) => {
-        if (msg) {
-            globalConfig = Object.assign(Object.assign({}, globalConfig), msg);
-        }
-        const { uuid, data } = globalConfig;
-        if (data.action === 'dev') {
-            handlers.runWatch({ uuid, data });
-        }
-        else {
-            handlers.runBuild({ uuid, data });
-        }
-    },
-    close() {
-        var _a;
-        console.log('close');
-        (_a = projectCompiler === null || projectCompiler === void 0 ? void 0 : projectCompiler.close) === null || _a === void 0 ? void 0 : _a.call(projectCompiler, () => { });
-        projectCompiler = null;
-    }
-};
-process.on('message', (message) => {
-    let objData = {};
-    try {
-        objData = JSON.parse(message);
-    }
-    catch (error) {
-        // do something
-    }
-    const { uuid, method, data = {} } = objData;
-    if (!handlers[method]) {
-        return;
-    }
-    handlers[method](objData);
-});
-process.on('uncaughtException', error => {
-    console.error(error);
-    sendToMaster('emitCompileStats', {
-        stats: {
-            errors: [error.message]
-        }
-    });
-});
-process.on('disconnect', () => {
-    process.exit(-1);
-});

package/dist/presets/loaders/sjs-loader/index.d.ts

@@ -1,12 +0,0 @@
-import type { Span } from '@swc/core';
-export declare const SJS_HELPER = "_sjs$";
-declare function sjsCompiler(code: any, onRequire: (s: string) => string): {
-    code: string;
-    map: string | undefined;
-    legacyCode: string;
-    errors: {
-        message: string;
-        span: Span;
-    }[];
-};
-export default sjsCompiler;