@modern-js/core 1.11.0-beta.1 → 1.11.0

package/bin/modern-js.js

@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+
+require('../compiled/v8-compile-cache');
+const { cli } = require('../');
+const { version } = require('../package.json');
+
+process.env.MODERN_JS_VERSION = version;
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV =
+    // eslint-disable-next-line no-nested-ternary
+    ['build', 'start', 'deploy'].indexOf(process.argv[2]) !== -1
+      ? 'production'
+      : process.argv[2] === 'test'
+      ? 'test'
+      : 'development';
+}
+
+cli.run(process.argv.slice(2));

package/dist/cli.d.ts

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

package/dist/cli.js

@@ -0,0 +1,33 @@
+"use strict";
+// 这个文件跟 bin/modern-js.js 基本一样
+// 在开发阶段，因为 package.json 的 exports['./bin']['jsnext:source'] 配置
+// 了这个文件，所以需要保留, 后续如果找到更好的方式之后会移除这个文件
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const _1 = require(".");
+const { version } = require('../package.json');
+// XXX: 通过这个方式去掉了 package.json 里面对于 @modern-js/module-tools 的 devDependencies 依赖
+// 然后可以正常的执行 modern build
+const kModuleToolsCliPath = path_1.default.resolve(__dirname, '../../../solutions/module-tools/src/index.ts');
+process.env.MODERN_JS_VERSION = version;
+if (!process.env.NODE_ENV) {
+    process.env.NODE_ENV =
+        // eslint-disable-next-line no-nested-ternary
+        ['build', 'start', 'deploy'].includes(process.argv[2])
+            ? 'production'
+            : process.argv[2] === 'test'
+                ? 'test'
+                : 'development';
+}
+_1.cli.run(process.argv.slice(2), {
+    plugins: {
+        '@modern-js/module-tools': {
+            cli: kModuleToolsCliPath,
+            // 是否需要强制加载这个组件，跳过 loadPlugins 里面 filter 的检测逻辑
+            forced: true,
+        },
+    },
+});

package/dist/index.d.ts

@@ -15,7 +15,6 @@ export type { PluginAPI } from './pluginAPI';
 export type { NormalizedConfig, IAppContext };
 declare const initAppDir: (cwd?: string | undefined) => Promise<string>;
 export interface CoreOptions {
-    version?: string;
     configFile?: string;
     serverConfigFile?: string;
     packageJsonConfig?: string;
@@ -30,7 +29,6 @@ export interface CoreOptions {
     };
 }
 export declare const mergeOptions: (options?: CoreOptions | undefined) => {
-    version?: string | undefined;
     configFile?: string | undefined;
     serverConfigFile: string;
     packageJsonConfig?: string | undefined;

package/dist/index.js

@@ -43,6 +43,10 @@ Object.defineProperty(exports, "ResolvedConfigContext", { enumerable: true, get:
 Object.defineProperty(exports, "useAppContext", { enumerable: true, get: function () { return pluginAPI_1.useAppContext; } });
 Object.defineProperty(exports, "useConfigContext", { enumerable: true, get: function () { return pluginAPI_1.useConfigContext; } });
 Object.defineProperty(exports, "useResolvedConfigContext", { enumerable: true, get: function () { return pluginAPI_1.useResolvedConfigContext; } });
+utils_1.program
+    .name('modern')
+    .usage('<command> [options]')
+    .version(process.env.MODERN_JS_VERSION || '0.1.0');
 const initAppDir = async (cwd) => {
     if (!cwd) {
         // eslint-disable-next-line no-param-reassign
@@ -65,9 +69,6 @@ const mergeOptions = (options) => {
     };
 };
 exports.mergeOptions = mergeOptions;
-const setProgramVersion = (version = 'unknown') => {
-    utils_1.program.name('modern').usage('<command> [options]').version(version);
-};
 const createCli = () => {
     let hooksRunner;
     let isRestart = false;
@@ -81,7 +82,6 @@ const createCli = () => {
         restartOptions = mergedOptions;
         const appDirectory = await initAppDir();
         (0, commander_1.initCommandsMap)();
-        setProgramVersion(options === null || options === void 0 ? void 0 : options.version);
         const metaName = (_b = (_a = mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.options) === null || _a === void 0 ? void 0 : _a.metaName) !== null && _b !== void 0 ? _b : 'MODERN';
         (0, loadEnv_1.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
         const loaded = await (0, config_1.loadUserConfig)(appDirectory, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.configFile, mergedOptions === null || mergedOptions === void 0 ? void 0 : mergedOptions.packageJsonConfig);

package/dist/loadPlugins.js

@@ -31,7 +31,7 @@ function getAppPlugins(appDirectory, oldPluginConfig, internalPlugins) {
             .filter(name => {
             const config = allPlugins[name];
             if (config.forced === true) {
-                // 参考 packages/cli/core/src/bin.ts 文件
+                // 参考 packages/cli/core/src/cli.ts 文件
                 return true;
             }
             return (0, utils_1.isDepExists)(appDirectory, name);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.11.0-beta.1",
+  "version": "1.11.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -27,8 +27,8 @@
       "default": "./dist/index.js"
     },
     "./bin": {
-      "jsnext:source": "./src/bin.ts",
-      "default": "./dist/bin.js"
+      "jsnext:source": "./src/cli.ts",
+      "default": "./bin/modern-js.js"
     }
   },
   "typesVersions": {
@@ -38,11 +38,11 @@
       ]
     }
   },
-  "bin": "./dist/bin.js",
+  "bin": "./bin/modern-js.js",
   "dependencies": {
-    "@modern-js/load-config": "^1.3.2",
-    "@modern-js/plugin": "^1.3.4",
-    "@modern-js/utils": "^1.7.4"
+    "@modern-js/load-config": "^1.3.3",
+    "@modern-js/plugin": "^1.3.5",
+    "@modern-js/utils": "^1.7.5"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",

package/dist/bin.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/bin.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require('../compiled/v8-compile-cache');
-// eslint-disable-next-line import/first
-const _1 = require(".");
-if (!process.env.NODE_ENV) {
-    const command = process.argv[2];
-    if (['build', 'start', 'deploy'].includes(command)) {
-        process.env.NODE_ENV = 'production';
-    }
-    else if (command === 'test') {
-        process.env.NODE_ENV = 'test';
-    }
-    else {
-        process.env.NODE_ENV = 'development';
-    }
-}
-const { version } = require('../package.json');
-_1.cli.run(process.argv.slice(2), { version });