@modern-js/core 2.0.2 → 2.2.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @modern-js/core
 
+## 2.2.0
+
+### Minor Changes
+
+- 12ef50f: feat: `modern-js/core` can watch files change
+  feat: `modern-js/core` 可以监听文件变化
+
+### Patch Changes
+
+- cb12ee7: chore: remove some unused deps, bump postcss version
+
+  chore: 移除未使用的依赖, 升级 postcss 版本
+
+- 360a259: fix: `@modern-js/core` add `afterPrepare` hook
+  fix: `@modern-js/core` 新增 `afterPrepare` hook
+- Updated dependencies [49eff0c]
+  - @modern-js/utils@2.2.0
+  - @modern-js/node-bundle-require@2.2.0
+  - @modern-js/plugin@2.2.0
+
+## 2.1.0
+
+### Patch Changes
+
+- bafa52e: fix(core): incorrect NODE_ENV when run start command
+
+  fix(core): 修复运行 start 命令时 NODE_ENV 设置错误的问题
+
+- Updated dependencies [837620c]
+- Updated dependencies [8a9482c]
+  - @modern-js/utils@2.1.0
+  - @modern-js/node-bundle-require@2.1.0
+  - @modern-js/plugin@2.1.0
+
 ## 2.0.2
 
 ### Patch Changes

package/dist/index.js

@@ -20,7 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initAppContext = exports.initAppDir = exports.cli = exports.mergeOptions = exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = exports.registerHook = exports.createPlugin = exports.mountHook = exports.manager = void 0;
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("@modern-js/utils");
-const commander_1 = require("./utils/commander");
+const utils_2 = require("./utils");
 const loadPlugins_1 = require("./loadPlugins");
 const context_1 = require("./context");
 Object.defineProperty(exports, "initAppContext", { enumerable: true, get: function () { return context_1.initAppContext; } });
@@ -76,7 +76,7 @@ const createCli = () => {
         const mergedOptions = (0, exports.mergeOptions)(options);
         initOptions = mergedOptions;
         const appDirectory = await initAppDir(options === null || options === void 0 ? void 0 : options.cwd);
-        (0, commander_1.initCommandsMap)();
+        (0, utils_2.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`]);
@@ -123,14 +123,16 @@ const createCli = () => {
         context_1.ResolvedConfigContext.set(resolved);
         await hooksRunner.addRuntimeExports();
         await hooksRunner.prepare();
+        await hooksRunner.afterPrepare();
         return {
             resolved,
             appContext: (0, context_1.useAppContext)(),
         };
     };
     async function run(options) {
-        await init(options);
+        const { appContext } = await init(options);
         await hooksRunner.commands({ program: utils_1.program });
+        await (0, utils_2.createFileWatcher)(appContext, hooksRunner);
         utils_1.program.parse(process.argv);
     }
     async function test(argv, options) {

package/dist/manager.d.ts

@@ -6,6 +6,12 @@ export declare const manager: import("@modern-js/plugin").AsyncManager<{
     }>;
     validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    fileChange: import("@modern-js/plugin").AsyncWorkflow<{
+        filename: string;
+        eventType: "add" | "unlink" | "change";
+    }, void>;
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
@@ -19,6 +25,12 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }>;
     validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    fileChange: import("@modern-js/plugin").AsyncWorkflow<{
+        filename: string;
+        eventType: "add" | "unlink" | "change";
+    }, void>;
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
@@ -31,6 +43,12 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }>;
     validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    fileChange: import("@modern-js/plugin").AsyncWorkflow<{
+        filename: string;
+        eventType: "add" | "unlink" | "change";
+    }, void>;
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
@@ -43,6 +61,12 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }>;
     validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    fileChange: import("@modern-js/plugin").AsyncWorkflow<{
+        filename: string;
+        eventType: "add" | "unlink" | "change";
+    }, void>;
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
@@ -55,6 +79,12 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }>;
     validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    fileChange: import("@modern-js/plugin").AsyncWorkflow<{
+        filename: string;
+        eventType: "add" | "unlink" | "change";
+    }, void>;
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
@@ -67,6 +97,12 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }>;
     validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    fileChange: import("@modern-js/plugin").AsyncWorkflow<{
+        filename: string;
+        eventType: "add" | "unlink" | "change";
+    }, void>;
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;
@@ -79,6 +115,12 @@ export declare const createPlugin: (setup?: import("@modern-js/plugin").AsyncSet
     }>;
     validateSchema: import("@modern-js/plugin").ParallelWorkflow<void, any>;
     prepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    afterPrepare: import("@modern-js/plugin").AsyncWorkflow<void, void>;
+    watchFiles: import("@modern-js/plugin").ParallelWorkflow<void, any>;
+    fileChange: import("@modern-js/plugin").AsyncWorkflow<{
+        filename: string;
+        eventType: "add" | "unlink" | "change";
+    }, void>;
     commands: import("@modern-js/plugin").AsyncWorkflow<{
         program: import("@modern-js/utils").Command;
     }, void>;

package/dist/manager.js

@@ -9,7 +9,10 @@ const baseHooks = {
     resolvedConfig: (0, plugin_1.createAsyncWaterfall)(),
     validateSchema: (0, plugin_1.createParallelWorkflow)(),
     prepare: (0, plugin_1.createAsyncWorkflow)(),
+    afterPrepare: (0, plugin_1.createAsyncWorkflow)(),
     commands: (0, plugin_1.createAsyncWorkflow)(),
+    watchFiles: (0, plugin_1.createParallelWorkflow)(),
+    fileChange: (0, plugin_1.createAsyncWorkflow)(),
     beforeExit: (0, plugin_1.createAsyncWorkflow)(),
     addRuntimeExports: (0, plugin_1.createAsyncWaterfall)(),
 };

package/dist/runBin.js

@@ -7,7 +7,7 @@ const _1 = require(".");
 const run = async (otherCoreOptions = {}, options = {}) => {
     const command = process.argv[2];
     if (!process.env.NODE_ENV) {
-        if (['build', 'start', 'serve', 'deploy', 'release'].includes(command)) {
+        if (['build', 'serve', 'deploy', 'release'].includes(command)) {
             process.env.NODE_ENV = 'production';
         }
         else if (command === 'test') {

package/dist/types/hooks.d.ts

@@ -12,6 +12,12 @@ export type BaseHooks<Extends extends {
     }>;
     validateSchema: ParallelWorkflow<void>;
     prepare: AsyncWorkflow<void, void>;
+    afterPrepare: AsyncWorkflow<void, void>;
+    watchFiles: ParallelWorkflow<void>;
+    fileChange: AsyncWorkflow<{
+        filename: string;
+        eventType: 'add' | 'change' | 'unlink';
+    }, void>;
     commands: AsyncWorkflow<{
         program: Command;
     }, void>;

package/dist/utils/createFileWatcher.d.ts

@@ -0,0 +1,2 @@
+import type { CliHooksRunner, IAppContext } from '../types';
+export declare const createFileWatcher: (appContext: IAppContext, hooksRunner: CliHooksRunner) => Promise<import("@modern-js/utils").FSWatcher | undefined>;

package/dist/utils/createFileWatcher.js

@@ -0,0 +1,84 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createFileWatcher = void 0;
+const crypto_1 = __importDefault(require("crypto"));
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+const utils_1 = require("@modern-js/utils");
+const debug = (0, utils_1.createDebugger)('watch-files');
+const hashMap = new Map();
+const md5 = (data) => crypto_1.default.createHash('md5').update(data).digest('hex');
+const createFileWatcher = async (appContext, hooksRunner) => {
+    // only add fs watcher on dev mode.
+    if ((0, utils_1.isDev)() || (0, utils_1.isTest)()) {
+        const { appDirectory } = appContext;
+        const extraFiles = await hooksRunner.watchFiles();
+        const watched = extraFiles.filter(Boolean);
+        debug(`watched: %o`, watched);
+        const watcher = utils_1.chokidar.watch(watched, {
+            cwd: appDirectory,
+            ignoreInitial: true,
+            ignorePermissionErrors: true,
+            ignored: [
+                /node_modules/,
+                '**/__test__/**',
+                '**/*.test.(js|jsx|ts|tsx)',
+                '**/*.spec.(js|jsx|ts|tsx)',
+                '**/*.stories.(js|jsx|ts|tsx)',
+            ],
+        });
+        watcher.on('change', changed => {
+            const lastHash = hashMap.get(changed);
+            const currentHash = md5(fs.readFileSync(path.join(appDirectory, changed), 'utf8'));
+            if (currentHash !== lastHash) {
+                debug(`file change: %s`, changed);
+                hashMap.set(changed, currentHash);
+                hooksRunner.fileChange({ filename: changed, eventType: 'change' });
+            }
+        });
+        watcher.on('add', name => {
+            debug(`add file: %s`, name);
+            const currentHash = md5(fs.readFileSync(path.join(appDirectory, name), 'utf8'));
+            hashMap.set(name, currentHash);
+            hooksRunner.fileChange({ filename: name, eventType: 'add' });
+        });
+        watcher.on('unlink', name => {
+            debug(`remove file: %s`, name);
+            if (hashMap.has(name)) {
+                hashMap.delete(name);
+            }
+            hooksRunner.fileChange({ filename: name, eventType: 'unlink' });
+        });
+        watcher.on('error', err => {
+            throw err;
+        });
+        return watcher;
+    }
+};
+exports.createFileWatcher = createFileWatcher;

package/dist/utils/index.d.ts

@@ -0,0 +1,4 @@
+export * from './commander';
+export * from './createFileWatcher';
+export * from './mergeConfig';
+export * from './repeatKeyWarning';

package/dist/utils/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./commander"), exports);
+__exportStar(require("./createFileWatcher"), exports);
+__exportStar(require("./mergeConfig"), exports);
+__exportStar(require("./repeatKeyWarning"), exports);

package/package.json

@@ -10,7 +10,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.2",
+  "version": "2.2.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -51,9 +51,9 @@
     }
   },
   "dependencies": {
-    "@modern-js/node-bundle-require": "2.0.2",
-    "@modern-js/plugin": "2.0.2",
-    "@modern-js/utils": "2.0.2"
+    "@modern-js/node-bundle-require": "2.2.0",
+    "@modern-js/plugin": "2.2.0",
+    "@modern-js/utils": "2.2.0"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
@@ -64,19 +64,18 @@
     "@types/node": "^14",
     "autoprefixer": "^10.3.1",
     "btsm": "2.2.2",
-    "electron-builder": "22.7.0",
     "html-webpack-plugin": "5.5.0",
     "jest": "^27",
-    "postcss": "^8.4.14",
+    "postcss": "8.4.21",
     "sass": "^1.45.0",
     "terser-webpack-plugin": "^5.1.4",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/builder-shared": "2.0.2",
-    "@modern-js/babel-preset-app": "2.0.2",
-    "@modern-js/types": "2.0.2",
-    "@scripts/jest-config": "2.0.2",
-    "@scripts/build": "2.0.2"
+    "@modern-js/builder-shared": "2.2.0",
+    "@modern-js/babel-preset-app": "2.2.0",
+    "@modern-js/types": "2.2.0",
+    "@scripts/jest-config": "2.2.0",
+    "@scripts/build": "2.2.0"
   },
   "sideEffects": false,
   "publishConfig": {