@modern-js/core 1.0.0-rc.18 → 1.0.0-rc.21

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @modern-js/core
 
+## 1.0.0-rc.21
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 0fd196e: feat: fix bugs
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [0fd196e]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0-rc.26
+  - @modern-js/plugin@1.0.0-rc.21
+  - @modern-js/utils@1.0.0-rc.21
+
+## 1.0.0-rc.20
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- feat: fix bugs
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [undefined]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0-rc.24
+  - @modern-js/plugin@1.0.0-rc.20
+  - @modern-js/utils@1.0.0-rc.20
+
+## 1.0.0-rc.19
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- 63be0a5: fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+- Updated dependencies [63be0a5]
+  - @modern-js/load-config@1.0.0-rc.23
+  - @modern-js/plugin@1.0.0-rc.19
+  - @modern-js/utils@1.0.0-rc.19
+
 ## 1.0.0-rc.18
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -107,25 +107,28 @@ const createCli = () => {
       appContext,
       resolved
     } = await init(argv);
-    initWatcher(loadedConfig, appContext.appDirectory, resolved, hooksRunner, argv);
     await hooksRunner.commands({
       program
     });
+    initWatcher(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
     manager.run(() => program.parse(process.argv));
   }
 
   async function restart() {
     isRestart = true;
+    logger.info('Restart...\n');
+    let hasGetError = false;
 
     try {
-      logger.info('Restart...\n');
-      await init();
-      return true;
+      await init(process.argv.slice(2));
     } catch (err) {
-      logger.error(err);
+      console.error(err);
+      hasGetError = true;
+    } finally {
+      if (!hasGetError) {
+        manager.run(() => program.parse(process.argv));
+      }
     }
-
-    return false;
   }
 
   return {

package/dist/js/modern/initWatcher.js

@@ -7,14 +7,9 @@ const debug = createDebugger('watch-files');
 const md5 = data => crypto.createHash('md5').update(data).digest('hex');
 
 const hashMap = new Map();
-export const initWatcher = async (loaded, appDirectory, resovledConfig, hooksRunner, argv) => {
+export const initWatcher = async (loaded, appDirectory, configDir, hooksRunner, argv) => {
   // only add fs watcher on dev mode.
   if (isDev() && argv[0] === 'dev') {
-    const {
-      source: {
-        configDir
-      }
-    } = resovledConfig;
     const extraFiles = await hooksRunner.watchFiles();
     const configPath = path.join(appDirectory, configDir);
     const watched = [`${configPath}/html`, ...extraFiles, loaded === null || loaded === void 0 ? void 0 : loaded.filePath, ...loaded.dependencies].filter(Boolean);

package/dist/js/node/index.js

@@ -206,26 +206,30 @@ const createCli = () => {
       appContext,
       resolved
     } = await init(argv);
-    (0, _initWatcher.initWatcher)(loadedConfig, appContext.appDirectory, resolved, hooksRunner, argv);
     await hooksRunner.commands({
       program: _commander.program
     });
+    (0, _initWatcher.initWatcher)(loadedConfig, appContext.appDirectory, resolved.source.configDir, hooksRunner, argv);
     manager.run(() => _commander.program.parse(process.argv));
   }
 
   async function restart() {
     isRestart = true;
 
-    try {
-      _utils.logger.info('Restart...\n');
+    _utils.logger.info('Restart...\n');
+
+    let hasGetError = false;
 
-      await init();
-      return true;
+    try {
+      await init(process.argv.slice(2));
     } catch (err) {
-      _utils.logger.error(err);
+      console.error(err);
+      hasGetError = true;
+    } finally {
+      if (!hasGetError) {
+        manager.run(() => _commander.program.parse(process.argv));
+      }
     }
-
-    return false;
   }
 
   return {

package/dist/js/node/initWatcher.js

@@ -21,14 +21,9 @@ const md5 = data => _crypto.default.createHash('md5').update(data).digest('hex')
 
 const hashMap = new Map();
 
-const initWatcher = async (loaded, appDirectory, resovledConfig, hooksRunner, argv) => {
+const initWatcher = async (loaded, appDirectory, configDir, hooksRunner, argv) => {
   // only add fs watcher on dev mode.
   if ((0, _utils.isDev)() && argv[0] === 'dev') {
-    const {
-      source: {
-        configDir
-      }
-    } = resovledConfig;
     const extraFiles = await hooksRunner.watchFiles();
 
     const configPath = _utils.path.join(appDirectory, configDir);

package/dist/types/index.d.ts

@@ -84,5 +84,5 @@ export declare const cli: {
     resolved: NormalizedConfig;
   }>;
   run: (argv: string[]) => Promise<void>;
-  restart: () => Promise<boolean>;
+  restart: () => Promise<void>;
 };

package/dist/types/initWatcher.d.ts

@@ -1,4 +1,3 @@
-import { NormalizedConfig } from './config/mergeConfig';
 import { LoadedConfig } from './config';
 import { HooksRunner } from '.';
-export declare const initWatcher: (loaded: LoadedConfig, appDirectory: string, resovledConfig: NormalizedConfig, hooksRunner: HooksRunner, argv: string[]) => Promise<void>;
+export declare const initWatcher: (loaded: LoadedConfig, appDirectory: string, configDir: string | undefined, hooksRunner: HooksRunner, argv: string[]) => Promise<void>;

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@modern-js/core",
-  "version": "1.0.0-rc.18",
+  "description": "Modern.js core package",
+  "version": "1.0.0-rc.21",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -25,11 +26,11 @@
   },
   "bin": "./bin/modern-js.js",
   "dependencies": {
-    "@babel/runtime": "^7",
     "@babel/code-frame": "^7.14.5",
-    "@modern-js/load-config": "^1.0.0-rc.22",
-    "@modern-js/plugin": "^1.0.0-rc.18",
-    "@modern-js/utils": "^1.0.0-rc.18",
+    "@babel/runtime": "^7",
+    "@modern-js/load-config": "^1.0.0-rc.26",
+    "@modern-js/plugin": "^1.0.0-rc.21",
+    "@modern-js/utils": "^1.0.0-rc.21",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -46,7 +47,7 @@
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.0.0-rc.18",
+    "@modern-js/types": "^1.0.0-rc.21",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",
@@ -55,8 +56,8 @@
     "@types/react-dom": "^17",
     "@types/signale": "^1.4.2",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.0.0-rc.18",
-    "@modern-js/module-tools": "^1.0.0-rc.18"
+    "@modern-js/plugin-testing": "^1.0.0-rc.21",
+    "@modern-js/module-tools": "^1.0.0-rc.21"
   },
   "sideEffects": false,
   "modernConfig": {

package/src/index.ts

@@ -208,29 +208,34 @@ const createCli = () => {
   async function run(argv: string[]) {
     const { loadedConfig, appContext, resolved } = await init(argv);
 
+    await hooksRunner.commands({ program });
+
     initWatcher(
       loadedConfig,
       appContext.appDirectory,
-      resolved,
+      resolved.source.configDir,
       hooksRunner,
       argv,
     );
-
-    await hooksRunner.commands({ program });
-
     manager.run(() => program.parse(process.argv));
   }
 
   async function restart() {
     isRestart = true;
+
+    logger.info('Restart...\n');
+
+    let hasGetError = false
     try {
-      logger.info('Restart...\n');
-      await init();
-      return true;
-    } catch (err) {
-      logger.error(err as string);
+      await init(process.argv.slice(2));
+    } catch(err) {
+      console.error(err)
+      hasGetError = true
+    } finally {
+      if (!hasGetError) {
+        manager.run(() => program.parse(process.argv));
+      }
     }
-    return false;
   }
 
   return {

package/src/initWatcher.ts

@@ -16,15 +16,12 @@ const hashMap = new Map<string, string>();
 export const initWatcher = async (
   loaded: LoadedConfig,
   appDirectory: string,
-  resovledConfig: NormalizedConfig,
+  configDir: string | undefined,
   hooksRunner: HooksRunner,
   argv: string[],
 ) => {
   // only add fs watcher on dev mode.
   if (isDev() && argv[0] === 'dev') {
-    const {
-      source: { configDir },
-    } = resovledConfig;
 
     const extraFiles = await hooksRunner.watchFiles();