xhs-mp-compiler-cli 1.5.0-beta.7 → 1.5.0

package/dist/index.js

@@ -189,11 +189,10 @@ class Compiler extends events_1.default {
         const distDir = this.getDistDir(entryType);
         const cacheDir = this.getCacheDir(entryType);
         const compilerType = this.getCompilerType(entryType);
-        const packMode = compilerType === constant_config_1.COMPILER_TYPE.legacy_dev || compilerType === constant_config_1.COMPILER_TYPE.legacy_build
+        compilerType === constant_config_1.COMPILER_TYPE.legacy_dev || compilerType === constant_config_1.COMPILER_TYPE.legacy_build
             ? 'webpack'
             : 'mp-pack';
         const options = {
-            packMode,
             projectPath: this.project.projectPath,
             appMode: this.project.appMode,
             extJsonPath: this.project.extJsonDir,

package/dist/packs/mp-pack/index.js

@@ -8,12 +8,15 @@ const presets_1 = require("../../presets");
 const path_1 = __importDefault(require("path"));
 const xhs_mp_pack_1 = require("xhs-mp-pack");
 const apm_1 = require("../../utils/apm");
+const const_1 = __importDefault(require("../../utils/const"));
+const { PACK_MODE } = const_1.default;
 const createCompiler = (startConfig) => {
-    const { action, enableDevServer } = startConfig;
+    // const {action, enableDevServer} = startConfig
     const mppack = new xhs_mp_pack_1.MPPack(startConfig);
     const compilerOptions = {
         project: mppack.project,
         packSetting: mppack.packSetting,
+        packMode: PACK_MODE.MPPACK,
         // 注入apm模块
         reporter: (0, apm_1.createReporter)(mppack.project, startConfig.mpUploadOptions)
     };

package/dist/packs/webpack/dev-server/index.js

@@ -19,14 +19,14 @@ const openBrowser_1 = __importDefault(require("./lib/openBrowser"));
 const presets_1 = require("../../../presets");
 const devServer = (config) => __awaiter(void 0, void 0, void 0, function* () {
     const { packSetting } = config;
-    const { devServerPort, distDir } = packSetting;
+    const { distDir } = packSetting;
     const webpackConfigs = (0, presets_1.createConfigs)(config);
     const compiler = (0, webpack_1.default)(webpackConfigs);
     const host = 'localhost';
     const devServerConfig = {
         open: false,
         historyApiFallback: true,
-        port: devServerPort || 1388,
+        port: 1388,
         hot: false,
         static: [
             // emulator entry 地址

package/dist/packs/webpack/index.js

@@ -15,6 +15,8 @@ const xhs_mp_project_1 = require("xhs-mp-project");
 const xhs_mp_pack_1 = require("xhs-mp-pack");
 const webpack_1 = require("./webpack");
 const apm_1 = require("../../utils/apm");
+const const_1 = __importDefault(require("../../utils/const"));
+const { PACK_MODE } = const_1.default;
 // 防御编程
 const handleVersion = (startConfig) => {
     let { action, enableV1 = true, enableV2 = false, enableVDom = false } = startConfig;
@@ -77,6 +79,7 @@ const createCompiler = (startConfig) => {
     const compilerOptions = {
         project: project,
         packSetting: mppackSetting,
+        packMode: PACK_MODE.WEBPACK,
         // 注入apm模块
         reporter: (0, apm_1.createReporter)(project, startConfig.mpUploadOptions)
     };

package/dist/presets/configs/miniprogram/assets/assetsEntryPlugin.js

@@ -87,7 +87,7 @@ class XhsAssetsPlugin {
         });
     }
     emitAppJson(compilation, appJSON) {
-        const { project, packSetting } = this.options;
+        const { project, packSetting, packMode } = this.options;
         const { compilePkgs = [const_1.default.MAIN_PKG] } = packSetting;
         // const { mainPkg, subPkgs } = packSetting.getCompilePkgsForEntries()
         // 先删除，用户配置的默认不生效
@@ -109,7 +109,7 @@ class XhsAssetsPlugin {
             this.emitJson(compilation, 'v1/app.json', appJsonSource);
         }
         // 独立分包的 app.json
-        const subPkgs = project.getSubPackages().filter(pkg => compilePkgs.includes(pkg.root));
+        const subPkgs = project.getSubPackages();
         subPkgs.forEach(subPkg => {
             if (subPkg === null || subPkg === void 0 ? void 0 : subPkg.independent) {
                 if (packSetting.enableV2) {

package/dist/types/index.d.ts

@@ -113,6 +113,7 @@ export interface IStart extends Pick<ICompilerConfig, CliPick> {
     devServerPort?: number;
 }
 export type IPresetOptions = {
+    packMode: string;
     project: Project;
     packSetting: MPPackSetting;
     otherSetting?: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.5.0-beta.7",
+  "version": "1.5.0",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -82,11 +82,11 @@
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-chain": "^6.5.1",
     "webpack-sources": "^3.2.2",
-    "xhs-mp-compiler-ml-loader": "1.5.0-beta.7",
-    "xhs-mp-compiler-utils": "1.3.0-beta.7",
-    "xhs-mp-pack": "^1.3.0-beta.7",
-    "xhs-mp-project": "^1.3.0-beta.7",
-    "xhs-mp-utils": "^1.5.0-beta.7"
+    "xhs-mp-compiler-ml-loader": "1.5.0",
+    "xhs-mp-compiler-utils": "1.3.0",
+    "xhs-mp-pack": "^1.3.0",
+    "xhs-mp-project": "^1.3.0",
+    "xhs-mp-utils": "^1.5.0"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.3",

package/dist/packs/webpack/dev-server/lib/openChrome.applescript

@@ -1,78 +0,0 @@
-property targetTab: null
-property targetTabIndex: -1
-property targetWindow: null
-
-on run argv
-  set theURL to item 1 of argv
-
-  with timeout of 2 seconds
-    tell application "Chrome"
-
-      if (count every window) = 0 then
-        make new window
-      end if
-
-      -- 1: Looking for tab running debugger
-      -- then, Reload debugging tab if found
-      -- then return
-      set found to my lookupTabWithUrl(theURL)
-      if found then
-        set targetWindow's active tab index to targetTabIndex
-        tell targetTab to reload
-        tell targetWindow to activate
-        set index of targetWindow to 1
-        return
-      end if
-
-      -- 2: Looking for Empty tab
-      -- In case debugging tab was not found
-      -- We try to find an empty tab instead
-      set found to my lookupTabWithUrl("chrome://newtab/")
-      if found then
-        set targetWindow's active tab index to targetTabIndex
-        set URL of targetTab to theURL
-        tell targetWindow to activate
-        return
-      end if
-
-      -- 3: Create new tab
-      -- both debugging and empty tab were not found
-      -- make a new tab with url
-      tell window 1
-        activate
-        make new tab with properties {URL:theURL}
-      end tell
-    end tell
-  end timeout
-end run
-
--- Function:
--- Lookup tab with given url
--- if found, store tab, index, and window in properties
--- (properties were declared on top of file)
-on lookupTabWithUrl(lookupUrl)
-  tell application "Chrome"
-    -- Find a tab with the given url
-    set found to false
-    set theTabIndex to -1
-    repeat with theWindow in every window
-      set theTabIndex to 0
-      repeat with theTab in every tab of theWindow
-        set theTabIndex to theTabIndex + 1
-        if (theTab's URL as string) contains lookupUrl then
-          -- assign tab, tab index, and window to properties
-          set targetTab to theTab
-          set targetTabIndex to theTabIndex
-          set targetWindow to theWindow
-          set found to true
-          exit repeat
-        end if
-      end repeat
-
-      if found then
-        exit repeat
-      end if
-    end repeat
-  end tell
-  return found
-end lookupTabWithUrl