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

package/CHANGELOG.md

@@ -1,5 +1,65 @@
 # @modern-js/core
 
+## 1.0.0-rc.18
+
+### 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.22
+  - @modern-js/plugin@1.0.0-rc.18
+  - @modern-js/utils@1.0.0-rc.18
+
+## 1.0.0-rc.17
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- fix: #118 #104
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+- Updated dependencies [undefined]
+  - @modern-js/load-config@1.0.0-rc.17
+  - @modern-js/plugin@1.0.0-rc.17
+  - @modern-js/utils@1.0.0-rc.17
+
+## 1.0.0-rc.16
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.16
+  - @modern-js/plugin@1.0.0-rc.16
+  - @modern-js/utils@1.0.0-rc.16
+
+## 1.0.0-rc.15
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+  - @modern-js/load-config@1.0.0-rc.15
+  - @modern-js/plugin@1.0.0-rc.15
+  - @modern-js/utils@1.0.0-rc.15
+
 ## 1.0.0-rc.14
 
 ### Patch Changes

package/dist/js/modern/config/index.js

@@ -20,7 +20,7 @@ const debug = createDebugger('resolve-config');
 export { defaults as defaultsConfig };
 export const defineConfig = config => config;
 export const loadUserConfig = async (appDirectory, filePath) => {
-  const loaded = loadConfig(appDirectory, filePath);
+  const loaded = await loadConfig(appDirectory, filePath);
   const config = !loaded ? {} : await (typeof loaded.config === 'function' ? loaded.config(0) : loaded.config);
   return {
     config: mergeWith({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),

package/dist/js/modern/config/schema/server.js

@@ -162,6 +162,9 @@ export const server = {
     },
     proxy: {
       type: 'object'
+    },
+    enableMicroFrontendDebug: {
+      type: 'boolean'
     }
   }
 };

package/dist/js/modern/context.js

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { createContext } from '@modern-js/plugin';
 import address from 'address';
 export const AppContext = createContext({});

package/dist/js/modern/index.js

@@ -4,10 +4,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import path from 'path';
-import { createAsyncManager, createContext, createAsyncWorkflow, createParallelWorkflow } from '@modern-js/plugin';
+import { path, upath, compatRequire, pkgUp, ensureAbsolutePath, logger } from '@modern-js/utils';
+import { createAsyncManager, createAsyncWorkflow, createParallelWorkflow } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
-import { compatRequire, pkgUp, ensureAbsolutePath, logger } from '@modern-js/utils';
 import { program } from "./utils/commander";
 import { resolveConfig, defineConfig, loadUserConfig } from "./config";
 import { loadPlugins } from "./loadPlugins";
@@ -35,8 +34,8 @@ export const {
   registe: registerHook,
   useRunner: mountHook
 } = manager;
-export const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin(compatRequire(require.resolve(plugin))));
-export { defineConfig, createContext, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
+export const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin(compatRequire(upath.normalize(require.resolve(plugin)))));
+export { defineConfig, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
 
 const initAppDir = async () => {
   const pkg = await pkgUp({

package/dist/js/modern/initWatcher.js

@@ -1,8 +1,7 @@
-import path from 'path';
 import crypto from 'crypto';
 import fs from 'fs';
+import { path, isDev, createDebugger } from '@modern-js/utils';
 import chokidar from 'chokidar';
-import { isDev, createDebugger } from '@modern-js/utils';
 const debug = createDebugger('watch-files');
 
 const md5 = data => crypto.createHash('md5').update(data).digest('hex');

package/dist/js/modern/loadEnv.js

@@ -1,5 +1,5 @@
-import path from 'path';
 import fs from 'fs';
+import { path } from '@modern-js/utils';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
 export const loadEnv = (appDirectory, mode = process.env.NODE_ENV) => {

package/dist/js/modern/loadPlugins.js

@@ -1,4 +1,4 @@
-import { isDepExists, createDebugger, compatRequire, INTERNAL_PLUGINS } from '@modern-js/utils';
+import { isDepExists, createDebugger, compatRequire, INTERNAL_PLUGINS, upath } from '@modern-js/utils';
 const debug = createDebugger('load-plugins');
 
 /**
@@ -12,9 +12,9 @@ const resolvePlugin = (appDirectory, plugin) => {
     let filePath = '';
 
     try {
-      filePath = require.resolve(name, {
+      filePath = upath.normalizeSafe(require.resolve(name, {
         paths: [appDirectory]
-      });
+      }));
       delete require.cache[filePath];
     } catch (err) {
       if (err.code === 'MODULE_NOT_FOUND') {

package/dist/js/node/config/index.js

@@ -50,7 +50,7 @@ const defineConfig = config => config;
 exports.defineConfig = defineConfig;
 
 const loadUserConfig = async (appDirectory, filePath) => {
-  const loaded = (0, _loadConfig.loadConfig)(appDirectory, filePath);
+  const loaded = await (0, _loadConfig.loadConfig)(appDirectory, filePath);
   const config = !loaded ? {} : await (typeof loaded.config === 'function' ? loaded.config(0) : loaded.config);
   return {
     config: (0, _lodash.default)({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),

package/dist/js/node/config/schema/server.js

@@ -170,6 +170,9 @@ const server = {
     },
     proxy: {
       type: 'object'
+    },
+    enableMicroFrontendDebug: {
+      type: 'boolean'
     }
   }
 };

package/dist/js/node/context.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useResolvedConfigContext = exports.useConfigContext = exports.useAppContext = exports.initAppContext = exports.ResolvedConfigContext = exports.ConfigContext = exports.AppContext = void 0;
 
-var _path = _interopRequireDefault(require("path"));
+var _utils = require("@modern-js/utils");
 
 var _plugin = require("@modern-js/plugin");
 
@@ -37,12 +37,12 @@ const initAppContext = (appDirectory, plugins, configFile) => ({
   configFile,
   ip: _address.default.ip(),
   port: 0,
-  packageName: require(_path.default.resolve(appDirectory, './package.json')).name,
-  srcDirectory: _path.default.resolve(appDirectory, './src'),
+  packageName: require(_utils.path.resolve(appDirectory, './package.json')).name,
+  srcDirectory: _utils.path.resolve(appDirectory, './src'),
   distDirectory: '',
-  sharedDirectory: _path.default.resolve(appDirectory, './shared'),
-  nodeModulesDirectory: _path.default.resolve(appDirectory, './node_modules'),
-  internalDirectory: _path.default.resolve(appDirectory, './node_modules/.modern-js'),
+  sharedDirectory: _utils.path.resolve(appDirectory, './shared'),
+  nodeModulesDirectory: _utils.path.resolve(appDirectory, './node_modules'),
+  internalDirectory: _utils.path.resolve(appDirectory, './node_modules/.modern-js'),
   plugins,
   htmlTemplates: {},
   serverRoutes: [],

package/dist/js/node/index.js

@@ -10,7 +10,6 @@ var _exportNames = {
   mountHook: true,
   usePlugins: true,
   cli: true,
-  createContext: true,
   defineConfig: true,
   defaultsConfig: true,
   AppContext: true,
@@ -24,14 +23,7 @@ Object.defineProperty(exports, "AppContext", {
     return _context.AppContext;
   }
 });
-exports.cli = void 0;
-Object.defineProperty(exports, "createContext", {
-  enumerable: true,
-  get: function () {
-    return _plugin.createContext;
-  }
-});
-exports.createPlugin = void 0;
+exports.createPlugin = exports.cli = void 0;
 Object.defineProperty(exports, "defaultsConfig", {
   enumerable: true,
   get: function () {
@@ -65,7 +57,7 @@ Object.defineProperty(exports, "useResolvedConfigContext", {
   }
 });
 
-var _path = _interopRequireDefault(require("path"));
+var _utils = require("@modern-js/utils");
 
 var _plugin = require("@modern-js/plugin");
 
@@ -95,8 +87,6 @@ Object.keys(_node).forEach(function (key) {
   });
 });
 
-var _utils = require("@modern-js/utils");
-
 var _commander = require("./utils/commander");
 
 var _config = require("./config");
@@ -109,8 +99,6 @@ var _initWatcher = require("./initWatcher");
 
 var _loadEnv = require("./loadEnv");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -141,7 +129,7 @@ exports.mountHook = mountHook;
 exports.registerHook = registerHook;
 exports.createPlugin = createPlugin;
 
-const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin((0, _utils.compatRequire)(require.resolve(plugin))));
+const usePlugins = plugins => plugins.forEach(plugin => manager.usePlugin((0, _utils.compatRequire)(_utils.upath.normalize(require.resolve(plugin)))));
 
 exports.usePlugins = usePlugins;
 
@@ -154,7 +142,7 @@ const initAppDir = async () => {
     throw new Error(`no package.json found in current work dir: ${process.cwd()}`);
   }
 
-  return _path.default.dirname(pkg);
+  return _utils.path.dirname(pkg);
 };
 
 const createCli = () => {

package/dist/js/node/initWatcher.js

@@ -5,16 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.initWatcher = void 0;
 
-var _path = _interopRequireDefault(require("path"));
-
 var _crypto = _interopRequireDefault(require("crypto"));
 
 var _fs = _interopRequireDefault(require("fs"));
 
-var _chokidar = _interopRequireDefault(require("chokidar"));
-
 var _utils = require("@modern-js/utils");
 
+var _chokidar = _interopRequireDefault(require("chokidar"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const debug = (0, _utils.createDebugger)('watch-files');
@@ -33,7 +31,7 @@ const initWatcher = async (loaded, appDirectory, resovledConfig, hooksRunner, ar
     } = resovledConfig;
     const extraFiles = await hooksRunner.watchFiles();
 
-    const configPath = _path.default.join(appDirectory, configDir);
+    const configPath = _utils.path.join(appDirectory, configDir);
 
     const watched = [`${configPath}/html`, ...extraFiles, loaded === null || loaded === void 0 ? void 0 : loaded.filePath, ...loaded.dependencies].filter(Boolean);
     debug(`watched: %o`, watched);
@@ -46,7 +44,7 @@ const initWatcher = async (loaded, appDirectory, resovledConfig, hooksRunner, ar
 
     watcher.on('change', changed => {
       const lastHash = hashMap.get(changed);
-      const currentHash = md5(_fs.default.readFileSync(_path.default.join(appDirectory, changed), 'utf8'));
+      const currentHash = md5(_fs.default.readFileSync(_utils.path.join(appDirectory, changed), 'utf8'));
 
       if (currentHash !== lastHash) {
         debug(`file change: %s`, changed);

package/dist/js/node/loadEnv.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.loadEnv = void 0;
 
-var _path = _interopRequireDefault(require("path"));
-
 var _fs = _interopRequireDefault(require("fs"));
 
+var _utils = require("@modern-js/utils");
+
 var _dotenv = _interopRequireDefault(require("dotenv"));
 
 var _dotenvExpand = _interopRequireDefault(require("dotenv-expand"));
@@ -16,7 +16,7 @@ var _dotenvExpand = _interopRequireDefault(require("dotenv-expand"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const loadEnv = (appDirectory, mode = process.env.NODE_ENV) => {
-  [`.env.${mode}`, '.env'].map(name => _path.default.resolve(appDirectory, name)).filter(filePath => _fs.default.existsSync(filePath) && !_fs.default.statSync(filePath).isDirectory()).forEach(filePath => {
+  [`.env.${mode}`, '.env'].map(name => _utils.path.resolve(appDirectory, name)).filter(filePath => _fs.default.existsSync(filePath) && !_fs.default.statSync(filePath).isDirectory()).forEach(filePath => {
     const envConfig = _dotenv.default.config({
       path: filePath
     });

package/dist/js/node/loadPlugins.js

@@ -20,9 +20,9 @@ const resolvePlugin = (appDirectory, plugin) => {
     let filePath = '';
 
     try {
-      filePath = require.resolve(name, {
+      filePath = _utils.upath.normalizeSafe(require.resolve(name, {
         paths: [appDirectory]
-      });
+      }));
       delete require.cache[filePath];
     } catch (err) {
       if (err.code === 'MODULE_NOT_FOUND') {

package/dist/types/config/index.d.ts

@@ -73,6 +73,7 @@ export interface ServerConfig {
   port?: number;
   logger?: Record<string, string>;
   measure?: Record<string, string>;
+  enableMicroFrontendDebug?: boolean;
 }
 export interface DevConfig {
   assetPrefix?: string | boolean;

package/dist/types/config/schema/index.d.ts

@@ -388,6 +388,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         proxy: {
           type: string;
         };
+        enableMicroFrontendDebug: {
+          type: string;
+        };
       };
     };
     deploy: {

package/dist/types/config/schema/server.d.ts

@@ -175,5 +175,8 @@ export declare const server: {
     proxy: {
       type: string;
     };
+    enableMicroFrontendDebug: {
+      type: string;
+    };
   };
 };

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-import { createContext, ParallelWorkflow, AsyncWorkflow, Progresses2Runners } from '@modern-js/plugin';
+import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners } from '@modern-js/plugin';
 import type { Hooks } from '@modern-js/types';
 import { Command } from './utils/commander';
 import { defineConfig, UserConfig, ToolsConfig } from './config';
@@ -72,7 +72,7 @@ export declare const createPlugin: (initializer: import("@modern-js/plugin").Asy
   beforeExit: AsyncWorkflow<void, void>;
 } & import("@modern-js/plugin").ClearDraftProgress<Hooks>>;
 export declare const usePlugins: (plugins: string[]) => void;
-export { defineConfig, createContext, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
+export { defineConfig, AppContext, useAppContext, useConfigContext, useResolvedConfigContext };
 export type { NormalizedConfig, IAppContext, UserConfig, ToolsConfig };
 export interface CoreOption {
   dryRun?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/core",
-  "version": "1.0.0-rc.14",
+  "version": "1.0.0-rc.18",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -27,9 +27,9 @@
   "dependencies": {
     "@babel/runtime": "^7",
     "@babel/code-frame": "^7.14.5",
-    "@modern-js/load-config": "^1.0.0-rc.14",
-    "@modern-js/plugin": "^1.0.0-rc.14",
-    "@modern-js/utils": "^1.0.0-rc.14",
+    "@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",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.0.0-rc.14",
+    "@modern-js/types": "^1.0.0-rc.18",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",
@@ -55,8 +55,8 @@
     "@types/react-dom": "^17",
     "@types/signale": "^1.4.2",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.0.0-rc.14",
-    "@modern-js/module-tools": "^1.0.0-rc.14"
+    "@modern-js/plugin-testing": "^1.0.0-rc.18",
+    "@modern-js/module-tools": "^1.0.0-rc.18"
   },
   "sideEffects": false,
   "modernConfig": {

package/src/config/index.ts

@@ -107,6 +107,7 @@ export interface ServerConfig {
   port?: number;
   logger?: Record<string, string>;
   measure?: Record<string, string>;
+  enableMicroFrontendDebug?: boolean;
 }
 
 export interface DevConfig {
@@ -174,7 +175,7 @@ export const loadUserConfig = async (
   appDirectory: string,
   filePath?: string,
 ): Promise<LoadedConfig> => {
-  const loaded = loadConfig<ConfigParam>(appDirectory, filePath);
+  const loaded = await loadConfig<ConfigParam>(appDirectory, filePath);
 
   const config = !loaded
     ? {}

package/src/config/schema/server.ts

@@ -101,5 +101,6 @@ export const server = {
     logger: { type: 'object' },
     measure: { type: 'object' },
     proxy: { type: 'object' },
+    enableMicroFrontendDebug: { type: 'boolean' },
   },
 };

package/src/context.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { createContext } from '@modern-js/plugin';
 import address from 'address';
 import type { IAppContext } from '@modern-js/types';

package/src/index.ts

@@ -1,7 +1,13 @@
-import path from 'path';
+import {
+  path,
+  upath,
+  compatRequire,
+  pkgUp,
+  ensureAbsolutePath,
+  logger,
+} from '@modern-js/utils';
 import {
   createAsyncManager,
-  createContext,
   createAsyncWorkflow,
   createParallelWorkflow,
   ParallelWorkflow,
@@ -9,12 +15,7 @@ import {
   Progresses2Runners,
 } from '@modern-js/plugin';
 import { enable } from '@modern-js/plugin/node';
-import {
-  compatRequire,
-  pkgUp,
-  ensureAbsolutePath,
-  logger,
-} from '@modern-js/utils';
+
 import type { Hooks } from '@modern-js/types';
 import { program, Command } from './utils/commander';
 import {
@@ -104,12 +105,11 @@ export const {
 
 export const usePlugins = (plugins: string[]) =>
   plugins.forEach(plugin =>
-    manager.usePlugin(compatRequire(require.resolve(plugin))),
+    manager.usePlugin(compatRequire(upath.normalize(require.resolve(plugin)))),
   );
 
 export {
   defineConfig,
-  createContext,
   AppContext,
   useAppContext,
   useConfigContext,

package/src/initWatcher.ts

@@ -1,8 +1,7 @@
-import path from 'path';
 import crypto from 'crypto';
 import fs from 'fs';
+import { path, isDev, createDebugger } from '@modern-js/utils';
 import chokidar from 'chokidar';
-import { isDev, createDebugger } from '@modern-js/utils';
 import { NormalizedConfig } from './config/mergeConfig';
 import { LoadedConfig } from './config';
 import { HooksRunner } from '.';

package/src/loadEnv.ts

@@ -1,5 +1,5 @@
-import path from 'path';
 import fs from 'fs';
+import { path } from '@modern-js/utils';
 import dotenv from 'dotenv';
 import dotenvExpand from 'dotenv-expand';
 

package/src/loadPlugins.ts

@@ -3,6 +3,7 @@ import {
   createDebugger,
   compatRequire,
   INTERNAL_PLUGINS,
+  upath
 } from '@modern-js/utils';
 
 const debug = createDebugger('load-plugins');
@@ -24,7 +25,7 @@ const resolvePlugin = (appDirectory: string, plugin: PluginConfigItem) => {
   const tryResolve = (name: string) => {
     let filePath = '';
     try {
-      filePath = require.resolve(name, { paths: [appDirectory] });
+      filePath = upath.normalizeSafe(require.resolve(name, { paths: [appDirectory] }));
       delete require.cache[filePath];
     } catch (err) {
       if ((err as any).code === 'MODULE_NOT_FOUND') {

package/tests/loadEnv.test.ts

@@ -1,6 +1,6 @@
-import path from 'path';
 import fs from 'fs';
 import { exec } from 'child_process';
+import { path } from '@modern-js/utils';
 import { loadEnv } from '@/loadEnv';
 
 const fixture = path.resolve(__dirname, './fixtures/load-env');

package/tests/loadPlugin.test.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { loadPlugins } from '@/loadPlugins';
 
 describe('load plugins', () => {