xhs-mp-compiler-cli 1.0.2 → 1.1.0-beta.0

package/dist/utils/const.d.ts

@@ -0,0 +1,27 @@
+declare const CONSTANTS: {
+    PROD_BROWSERSLIST: string[];
+    DEV_BROWSERSLIST: string[];
+    DEV_TARGETS: {
+        chrome: string;
+    };
+    PROD_TARGETS: {
+        chrome: string;
+        ios: string;
+    };
+    ENTRY_CSS_NAME: string;
+    FULL_PKG: string;
+    MAIN_PKG: string;
+    SUB_PKG: string;
+    BUILD_REASON: {
+        INIT: string;
+        FILE_CHANGE: string;
+        ACTIVATE_PKG: string;
+        RECOMPILE: string;
+    };
+    ASSETS_EXTS: string[];
+    PACK_MODE: {
+        MPPACK: string;
+        WEBPACK: string;
+    };
+};
+export default CONSTANTS;

package/dist/utils/const.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const CONSTANTS = {
+    PROD_BROWSERSLIST: ['ios_saf >= 10', 'chrome >= 83'],
+    DEV_BROWSERSLIST: ['last 2 chrome version'],
+    DEV_TARGETS: {
+        chrome: '90',
+    },
+    PROD_TARGETS: {
+        chrome: '83',
+        ios: '10'
+    },
+    ENTRY_CSS_NAME: 'app',
+    FULL_PKG: 'xhs-full',
+    MAIN_PKG: 'xhs-main',
+    SUB_PKG: 'xhs-sub',
+    BUILD_REASON: {
+        INIT: 'INIT',
+        FILE_CHANGE: 'FILE_CHANGE',
+        ACTIVATE_PKG: 'ACTIVATE_PKG',
+        RECOMPILE: 'RECOMPILE',
+    },
+    ASSETS_EXTS: [
+        'png',
+        'jpg',
+        'jpeg',
+        'gif',
+        'svg',
+        'webp',
+        'cer',
+        'mp3',
+        'aac',
+        'm4a',
+        'mp4',
+        'wav',
+        'ogg',
+        'silk',
+        'wasm',
+        'br',
+        'plist',
+    ],
+    PACK_MODE: {
+        MPPACK: 'mp-pack',
+        WEBPACK: 'webpack'
+    }
+};
+exports.default = CONSTANTS;

package/dist/{webpack-config/lib → utils}/css.js

@@ -7,18 +7,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const postcss_preset_env_1 = __importDefault(require("postcss-preset-env"));
 const postcssRpx2Vw_1 = __importDefault(require("./postcssRpx2Vw"));
 const const_1 = __importDefault(require("./const"));
-const types_1 = require("../../types");
+const types_1 = require("../types");
 const { DEV_BROWSERSLIST, PROD_BROWSERSLIST } = const_1.default;
 const getCssConfig = (options, presets) => {
     const isDev = options.env === types_1.ENV.development;
     const browsers = isDev ? DEV_BROWSERSLIST : PROD_BROWSERSLIST;
     const loaders = {
         'mini-style-loader': {
-            loader: require.resolve('../loaders/mini-style-loader'),
-            options
-        },
-        'wxss-loader': {
-            loader: require.resolve('../loaders/wxss-loader'),
+            loader: require.resolve('../presets/loaders/mini-style-loader'),
+            options: Object.assign(Object.assign({}, options), { independent: true })
         },
         'postcss-loader': {
             loader: require.resolve('postcss-loader'),
@@ -30,6 +27,9 @@ const getCssConfig = (options, presets) => {
                 },
             },
         },
+        'wxss-loader': {
+            loader: require.resolve('../presets/loaders/wxss-loader'),
+        },
     };
     return presets.flat().reduce((acc, cur) => {
         if (typeof cur === "string" && loaders[cur]) {

package/dist/utils/getSuffixName.d.ts

@@ -0,0 +1,3 @@
+export declare function getMlSuffixName(): string;
+export declare function getCssSuffixName(): "css" | "wxss";
+export declare function getPrefixName(): string | undefined;

package/dist/utils/getSuffixName.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPrefixName = exports.getCssSuffixName = exports.getMlSuffixName = void 0;
+function getMlSuffixName() {
+    return `${process.env.__platform}ml`.trim();
+}
+exports.getMlSuffixName = getMlSuffixName;
+function getCssSuffixName() {
+    if (process.env.__platform === 'xhs') {
+        return 'css';
+    }
+    return 'wxss';
+}
+exports.getCssSuffixName = getCssSuffixName;
+function getPrefixName() {
+    return process.env.__platform;
+}
+exports.getPrefixName = getPrefixName;

package/dist/{webpack-config/loaders/utils.d.ts → utils/loader-utils.d.ts}

@@ -1,3 +1,5 @@
+export declare const formatPath: (pathStr?: string) => string;
+export declare const getShortPath: (projectMiniprogramPath: string, rootContext: string) => string;
 /**
  * 根据是否分包获取资源路径
  */

package/dist/{webpack-config/loaders/utils.js → utils/loader-utils.js}

@@ -1,6 +1,24 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRequire = exports.getResourceUris = void 0;
+exports.createRequire = exports.getResourceUris = exports.getShortPath = exports.formatPath = void 0;
+const path_1 = __importDefault(require("path"));
+const common_1 = require("./common");
+const getSuffixName_1 = require("./getSuffixName");
+const formatPath = (pathStr = '') => pathStr.split(path_1.default.sep).join(path_1.default.posix.sep);
+exports.formatPath = formatPath;
+const getShortPath = (projectMiniprogramPath, rootContext) => {
+    const suffix = (0, getSuffixName_1.getMlSuffixName)();
+    const reg = new RegExp(`.${suffix}$`, 'g');
+    projectMiniprogramPath = (0, common_1.toUnixPath)(projectMiniprogramPath);
+    projectMiniprogramPath = projectMiniprogramPath.endsWith('/')
+        ? projectMiniprogramPath
+        : `${projectMiniprogramPath}/`;
+    return (0, common_1.toUnixPath)(rootContext).replace(reg, '').replace(projectMiniprogramPath, '');
+};
+exports.getShortPath = getShortPath;
 /**
  * 根据是否分包获取资源路径
  */

package/dist/utils/projectConfig.d.ts

@@ -1 +1 @@
-export declare function getProjectConfig(mpDir: any): any;
+export declare function getProjectConfig(projectPath: any): any;

package/dist/utils/projectConfig.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-function getProjectConfig(mpDir) {
-    const projectJsonPath = path_1.default.join(mpDir, 'project.config.json');
+function getProjectConfig(projectPath) {
+    const projectJsonPath = path_1.default.join(projectPath, 'project.config.json');
     let projectJson = {};
     try {
         projectJson = fs_extra_1.default.readJSONSync(projectJsonPath);

package/dist/{webpack-config/lib → utils}/utils.js

@@ -18,8 +18,8 @@ const hasFile = filepath => {
 const getTsconfigPath = config => {
     let res = '';
     // 查询距离最近的 tsconfig.json
-    if (config.mpDir) {
-        res = path_1.default.resolve(process.cwd(), config.mpDir, 'tsconfig.json');
+    if (config.projectPath) {
+        res = path_1.default.resolve(process.cwd(), config.projectPath, 'tsconfig.json');
         if (hasFile(res)) {
             return res;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.0.2",
+  "version": "1.1.0-beta.0",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -33,13 +33,11 @@
     "@swc/core": "^1.3.74",
     "@swc/helpers": "^0.5.1",
     "@vue/babel-preset-jsx": "^1.2.4",
-    "xhs-mp-compiler-core-fork": "1.0.1",
-    "xhs-mp-compiler-ml-loader": "1.0.2",
-    "xhs-mp-compiler-utils": "1.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",
@@ -53,7 +51,6 @@
     "fs-extra": "^10.0.0",
     "glob": "^8.0.1",
     "htmlparser2": "^7.1.2",
-    "json-to-ast": "^2.1.0",
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^1.6.2",
     "module-alias": "^2.2.2",
@@ -79,14 +76,17 @@
     "webpack": "^5.88.2",
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-chain": "^6.5.1",
-    "webpack-sources": "^3.2.2"
+    "webpack-sources": "^3.2.2",
+    "xhs-mp-compiler-ml-loader": "1.1.0-beta.0",
+    "xhs-mp-compiler-utils": "1.1.0-beta.0",
+    "xhs-mp-pack": "^1.1.0-beta.0",
+    "xhs-mp-project": "^1.1.0-beta.0"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",
     "@types/babel__traverse": "7.14.1",
     "@types/fs-extra": "9.0.12",
     "@types/jest": "26.0.24",
-    "@types/json-to-ast": "2.1.2",
     "@types/mini-css-extract-plugin": "2.0.1",
     "@types/postcss-import": "12.0.1",
     "@types/postcss-preset-env": "6.7.3",
@@ -110,11 +110,12 @@
     "version": "formula changelog && git add .",
     "clean": "rimraf ./dist",
     "copy-files": "cpy '**/*' '!**/*.ts' ../dist/ --cwd=src/ --no-overwrite --parents",
+    "watch": "npm run dev",
+    "dev": "npm run prebuild && tsc --watch && npm run postbuild",
+    "build": "npm run prebuild && tsc && npm run postbuild",
     "prebuild": "npm run clean",
     "postbuild": "npm run copy-files",
     "lint": "eslint . --fix",
-    "build": "npm run prebuild && tsc && npm run postbuild",
-    "dev": "npm run prebuild && tsc --watch && npm run postbuild",
     "compile": "jest '(/tests/.*\\.spec)\\.ts$'",
     "unit": "jest '(/tests/.*\\.test)\\.ts$' --collectCoverage=false",
     "test": "npm run compile && npm run unit",

package/dist/build/index.d.ts

@@ -1,3 +0,0 @@
-import { CliConfig } from '../types';
-declare const build: (config: CliConfig, callback?: () => void) => Promise<unknown>;
-export default build;

package/dist/build/index.js

@@ -1,22 +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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_config_1 = __importDefault(require("../webpack-config"));
-const asyncWebpack_1 = __importDefault(require("../utils/asyncWebpack"));
-const build = (config, callback) => __awaiter(void 0, void 0, void 0, function* () {
-    // 构建 render
-    const webpackConfig = (0, webpack_config_1.default)(config);
-    return (0, asyncWebpack_1.default)(webpackConfig, callback);
-});
-exports.default = build;

package/dist/globalData/SjsModule.d.ts

@@ -1,32 +0,0 @@
-export type ModuleMap = {
-    [key: string]: {
-        [key: string]: string;
-    };
-};
-declare class SjsModule {
-    /**
-     * @NOTE
-     *  管理 file 与 sjs module 的关系
-     */
-    moduleMap: ModuleMap;
-    /**
-     * @NOTE
-     *  收集 sjs 的相对路径
-     */
-    sjsAbsoulatePaths: Set<string>;
-    templateHashToModuleName: Map<string, string[]>;
-    constructor();
-    /**
-     * key:
-     *  template path hash
-     * value:
-     *  sjsScopeNames
-     *
-     * { 'Cc9103733ab20cb5ce2c008224782e53f': ['a1', 'b1', 'c1' ] }
-     */
-    addTemplateHash(hash: string, sjsScopeNames: string[]): void;
-    add(issuer: any, moduleName: any, target: any): void;
-    addPath(path: string): void;
-}
-declare const _default: SjsModule;
-export default _default;

package/dist/globalData/SjsModule.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class SjsModule {
-    constructor() {
-        this.moduleMap = {};
-        this.templateHashToModuleName = new Map();
-        this.sjsAbsoulatePaths = new Set();
-    }
-    /**
-     * key:
-     *  template path hash
-     * value:
-     *  sjsScopeNames
-     *
-     * { 'Cc9103733ab20cb5ce2c008224782e53f': ['a1', 'b1', 'c1' ] }
-     */
-    addTemplateHash(hash, sjsScopeNames) {
-        this.templateHashToModuleName.set(hash, sjsScopeNames);
-    }
-    add(issuer, moduleName, target) {
-        if (this.moduleMap[issuer]) {
-            this.moduleMap[issuer][moduleName] = target;
-        }
-        else {
-            this.moduleMap[issuer] = {
-                [moduleName]: target
-            };
-        }
-    }
-    addPath(path) {
-        this.sjsAbsoulatePaths.add(path);
-    }
-}
-exports.default = new SjsModule();

package/dist/utils/combineExtJson.d.ts

@@ -1,3 +0,0 @@
-import { Compilation } from 'webpack';
-declare const combineExtJson: (appJSON: any, extJson: any, compilation?: Compilation) => any;
-export default combineExtJson;

package/dist/utils/combineExtJson.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_1 = require("webpack");
-const validateExtJson = (appJSON, extJson, compilation) => {
-    var _a;
-    const emitError = (details) => {
-        const err = new webpack_1.WebpackError(`[ ext.json 内容错误 ]: ${details}`);
-        err.file = 'ext.json';
-        err.stack = undefined;
-        compilation === null || compilation === void 0 ? void 0 : compilation.errors.push(err);
-    };
-    const limitedPages = appJSON.pages;
-    if (extJson.pages) {
-        for (const page of extJson.pages) {
-            if (!limitedPages.includes(page)) {
-                emitError(`page 错误: "${page}" 不在 app.json 内`);
-                return false;
-            }
-        }
-    }
-    if (extJson.extPages) {
-        for (const page of Object.keys(extJson.extPages)) {
-            if (!limitedPages.includes(page)) {
-                emitError(`extPages 错误: "${page}" 不在 app.json 内`);
-                return false;
-            }
-        }
-    }
-    if ((_a = extJson === null || extJson === void 0 ? void 0 : extJson.tabBar) === null || _a === void 0 ? void 0 : _a.list) {
-        if (extJson.tabBar.list.length < 2) {
-            emitError(`tabBar.list 错误: tabBar.list 需至少包含 2 项`);
-            return false;
-        }
-        for (const { pagePath } of extJson.tabBar.list) {
-            if (!pagePath) {
-                emitError(`tabBar.list 错误: "pagePath" 不能为空`);
-                return false;
-            }
-            if (!limitedPages.includes(pagePath)) {
-                emitError(`tabBar.list 错误: "${pagePath}" 不在 app.json 内`);
-                return false;
-            }
-        }
-    }
-    return true;
-};
-/**
- * https://wiki.xiaohongshu.com/pages/viewpage.action?pageId=127531115
- */
-const mergeList = ['window', 'networkTimeout', 'tabBar'];
-const combineExtJson = (appJSON, extJson, compilation) => {
-    if (!validateExtJson(appJSON, extJson, compilation)) {
-        return appJSON;
-    }
-    for (const [key, val] of Object.entries(extJson)) {
-        if (key === 'extPages') {
-            // extPages 字段作用于每个页面的 json 文件，在 transformAppJson 中处理
-            continue;
-        }
-        else if (typeof val === 'object' && mergeList.includes(key)) {
-            // 对需要 merge 的字段进行 merge
-            const isArray = Array.isArray(val);
-            appJSON[`${key}`] = appJSON[`${key}`] || (isArray ? [] : {});
-            // @ts-ignore
-            appJSON[`${key}`] = isArray ? [...new Set([...appJSON[`${key}`], ...val])] : Object.assign(Object.assign({}, appJSON[`${key}`]), val);
-        }
-        else {
-            // 除此之外直接用 ext.json 的内容覆盖
-            appJSON[`${key}`] = val;
-        }
-    }
-    return appJSON;
-};
-exports.default = combineExtJson;

package/dist/utils/getCssSuffixName.d.ts

@@ -1 +0,0 @@
-export default function getCssSuffixName(): "css" | "wxss";

package/dist/utils/getCssSuffixName.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function getCssSuffixName() {
-    if (process.env.__platform === 'xhs') {
-        return 'css';
-    }
-    return 'wxss';
-}
-exports.default = getCssSuffixName;

package/dist/utils/getMlSuffixName.d.ts

@@ -1 +0,0 @@
-export default function getMlSuffixName(): string;

package/dist/utils/getMlSuffixName.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function getMlSuffixName() {
-    return `${process.env.__platform}ml`.trim();
-}
-exports.default = getMlSuffixName;

package/dist/utils/getPrefixName.d.ts

@@ -1 +0,0 @@
-export default function getPrefixName(): string | undefined;

package/dist/utils/getPrefixName.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-function getPrefixName() {
-    return process.env.__platform;
-}
-exports.default = getPrefixName;

package/dist/utils/transformAppJson.d.ts

@@ -1,16 +0,0 @@
-import { Compilation } from 'webpack';
-import { AppJSON } from '../types';
-export declare const PATH_REG: RegExp;
-/**
- * wx: https://developers.weixin.qq.com/miniprogram/dev/reference/configuration/app.html
- * bilibili: http://miniapp.bilibili.com/small-app-doc/framework/global-config/
- * 对于小程序开发者，按照 wx 的文档格式来定义 json 文件
- * 根据端侧需求将 json 文件的 pages 字段转换为 bilibili 格式
- * @param miniprogramDir 小程序目录(带miniprogramRoot)
- * @returns 转换后的 bilibili 格式的 app.json
- */
-declare const transformAppJson: (mpDir: string, miniprogramDir: string, extJsonPath?: string, compilation?: Compilation) => {
-    legacyAppJSON: any;
-    appJSON: AppJSON;
-};
-export default transformAppJson;