@modern-js/utils 1.2.2 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @modern-js/utils
 
+## 1.3.0
+
+### Minor Changes
+
+- ec4dbffb: feat: support as a pure api service
+- bada2879: refactor plugin-garfish:
+  - change @modern-js/plugin-micro-frontend => @modern-js/plugin-garfish
+  - remove disableCustomerRouter logic
+  - adding unit test
+  - fix plugin-garfish type error
+
+### Patch Changes
+
+- d099e5c5: fix error when modify modern.config.js
+- 24f616ca: feat: support custom meta info
+- bd819a8d: feat: add wait function
+
 ## 1.2.2
 
 ### Patch Changes

package/dist/js/modern/clearConsole.js

@@ -1,5 +1,5 @@
 export const clearConsole = () => {
-  if (process.stdout.isTTY) {
+  if (process.stdout.isTTY && !process.env.DEBUG) {
     process.stdout.write('\x1B[H\x1B[2J');
   }
 };

package/dist/js/modern/compatRequire.js

@@ -18,4 +18,9 @@ export const requireExistModule = (filename, extensions = ['.ts', '.js']) => {
   }
 
   return compatRequire(exist);
+};
+export const cleanRequireCache = filelist => {
+  filelist.forEach(filepath => {
+    delete require.cache[filepath];
+  });
 };

package/dist/js/modern/constants.js

@@ -1,16 +1,6 @@
-/**
- * alias to src directory
- */
-export const INTERNAL_SRC_ALIAS = '@_modern_js_src';
-/**
- * alias to node_modules/.modern-js
- */
-
-export const INTERNAL_DIR_ALAIS = '@_modern_js_internal';
 /**
  * hmr socket connect path
  */
-
 export const HMR_SOCK_PATH = '/_modern_js_hmr_ws';
 /**
  * route specification file
@@ -47,11 +37,6 @@ export const SERVER_RENDER_FUNCTION_NAME = 'serverRender';
  */
 
 export const LOADABLE_STATS_FILE = 'loadable-stats.json';
-/**
- * real entry generate by modern.js
- */
-
-export const HIDE_MODERN_JS_DIR = './node_modules/.modern-js';
 /**
  * internal specified folder
  */
@@ -133,8 +118,8 @@ export const INTERNAL_PLUGINS = {
     cli: '@modern-js/plugin-server/cli',
     server: '@modern-js/plugin-server/server'
   },
-  '@modern-js/plugin-micro-frontend': {
-    cli: '@modern-js/plugin-micro-frontend/cli'
+  '@modern-js/plugin-garfish': {
+    cli: '@modern-js/plugin-garfish/cli'
   },
   '@modern-js/plugin-jarvis': {
     cli: '@modern-js/plugin-jarvis/cli'
@@ -301,7 +286,7 @@ export const PLUGIN_SCHEMAS = {
       typeof: ['object', 'function']
     }
   }],
-  '@modern-js/plugin-micro-frontend': [{
+  '@modern-js/plugin-garfish': [{
     target: 'runtime.masterApp',
     schema: {
       type: ['object']

package/dist/js/modern/index.js

@@ -29,4 +29,5 @@ export * from "./prettyInstructions";
 export * from "./alias";
 export * from "./import";
 export * from "./watch";
-export * from "./nodeEnv";
+export * from "./nodeEnv";
+export * from "./wait";

package/dist/js/modern/prettyInstructions.js

@@ -38,13 +38,14 @@ export const prettyInstructions = (appContext, config) => {
   const {
     entrypoints,
     serverRoutes,
-    port
+    port,
+    existSrc
   } = appContext;
   const urls = getAddressUrls(config.dev.https && isDev() ? 'https' : 'http', port);
-  const routes = serverRoutes.filter(route => route.entryName);
+  const routes = existSrc ? serverRoutes.filter(route => route.entryName) : serverRoutes;
   let message = 'App running at:\n\n';
 
-  if (isSingleEntry(entrypoints)) {
+  if (isSingleEntry(entrypoints) || !existSrc) {
     message += urls.map(({
       type,
       url

package/dist/js/modern/wait.js

@@ -0,0 +1,5 @@
+const wait = (time = 0) => new Promise(resolve => {
+  setTimeout(resolve, time);
+});
+
+export { wait };

package/dist/js/node/clearConsole.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.clearConsole = void 0;
 
 const clearConsole = () => {
-  if (process.stdout.isTTY) {
+  if (process.stdout.isTTY && !process.env.DEBUG) {
     process.stdout.write('\x1B[H\x1B[2J');
   }
 };

package/dist/js/node/compatRequire.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.requireExistModule = exports.compatRequire = void 0;
+exports.requireExistModule = exports.compatRequire = exports.cleanRequireCache = void 0;
 
 var _findExists = require("./findExists");
 
@@ -30,4 +30,12 @@ const requireExistModule = (filename, extensions = ['.ts', '.js']) => {
   return compatRequire(exist);
 };
 
-exports.requireExistModule = requireExistModule;
+exports.requireExistModule = requireExistModule;
+
+const cleanRequireCache = filelist => {
+  filelist.forEach(filepath => {
+    delete require.cache[filepath];
+  });
+};
+
+exports.cleanRequireCache = cleanRequireCache;

package/dist/js/node/constants.js

@@ -3,23 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SHARED_DIR = exports.SERVER_RENDER_FUNCTION_NAME = exports.SERVER_DIR = exports.SERVER_BUNDLE_DIRECTORY = exports.ROUTE_SPEC_FILE = exports.PLUGIN_SCHEMAS = exports.MAIN_ENTRY_NAME = exports.LOADABLE_STATS_FILE = exports.LAUNCH_EDITOR_ENDPOINT = exports.INTERNAL_SRC_ALIAS = exports.INTERNAL_PLUGINS = exports.INTERNAL_DIR_ALAIS = exports.HMR_SOCK_PATH = exports.HIDE_MODERN_JS_DIR = exports.ENTRY_NAME_PATTERN = exports.API_DIR = void 0;
+exports.SHARED_DIR = exports.SERVER_RENDER_FUNCTION_NAME = exports.SERVER_DIR = exports.SERVER_BUNDLE_DIRECTORY = exports.ROUTE_SPEC_FILE = exports.PLUGIN_SCHEMAS = exports.MAIN_ENTRY_NAME = exports.LOADABLE_STATS_FILE = exports.LAUNCH_EDITOR_ENDPOINT = exports.INTERNAL_PLUGINS = exports.HMR_SOCK_PATH = exports.ENTRY_NAME_PATTERN = exports.API_DIR = void 0;
 
-/**
- * alias to src directory
- */
-const INTERNAL_SRC_ALIAS = '@_modern_js_src';
-/**
- * alias to node_modules/.modern-js
- */
-
-exports.INTERNAL_SRC_ALIAS = INTERNAL_SRC_ALIAS;
-const INTERNAL_DIR_ALAIS = '@_modern_js_internal';
 /**
  * hmr socket connect path
  */
-
-exports.INTERNAL_DIR_ALAIS = INTERNAL_DIR_ALAIS;
 const HMR_SOCK_PATH = '/_modern_js_hmr_ws';
 /**
  * route specification file
@@ -63,17 +51,11 @@ const SERVER_RENDER_FUNCTION_NAME = 'serverRender';
 
 exports.SERVER_RENDER_FUNCTION_NAME = SERVER_RENDER_FUNCTION_NAME;
 const LOADABLE_STATS_FILE = 'loadable-stats.json';
-/**
- * real entry generate by modern.js
- */
-
-exports.LOADABLE_STATS_FILE = LOADABLE_STATS_FILE;
-const HIDE_MODERN_JS_DIR = './node_modules/.modern-js';
 /**
  * internal specified folder
  */
 
-exports.HIDE_MODERN_JS_DIR = HIDE_MODERN_JS_DIR;
+exports.LOADABLE_STATS_FILE = LOADABLE_STATS_FILE;
 const API_DIR = 'api';
 exports.API_DIR = API_DIR;
 const SERVER_DIR = 'server';
@@ -154,8 +136,8 @@ const INTERNAL_PLUGINS = {
     cli: '@modern-js/plugin-server/cli',
     server: '@modern-js/plugin-server/server'
   },
-  '@modern-js/plugin-micro-frontend': {
-    cli: '@modern-js/plugin-micro-frontend/cli'
+  '@modern-js/plugin-garfish': {
+    cli: '@modern-js/plugin-garfish/cli'
   },
   '@modern-js/plugin-jarvis': {
     cli: '@modern-js/plugin-jarvis/cli'
@@ -323,7 +305,7 @@ const PLUGIN_SCHEMAS = {
       typeof: ['object', 'function']
     }
   }],
-  '@modern-js/plugin-micro-frontend': [{
+  '@modern-js/plugin-garfish': [{
     target: 'runtime.masterApp',
     schema: {
       type: ['object']

package/dist/js/node/index.js

@@ -432,6 +432,20 @@ Object.keys(_nodeEnv).forEach(function (key) {
   });
 });
 
+var _wait = require("./wait");
+
+Object.keys(_wait).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _wait[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _wait[key];
+    }
+  });
+});
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/dist/js/node/prettyInstructions.js

@@ -52,13 +52,14 @@ const prettyInstructions = (appContext, config) => {
   const {
     entrypoints,
     serverRoutes,
-    port
+    port,
+    existSrc
   } = appContext;
   const urls = getAddressUrls(config.dev.https && (0, _is.isDev)() ? 'https' : 'http', port);
-  const routes = serverRoutes.filter(route => route.entryName);
+  const routes = existSrc ? serverRoutes.filter(route => route.entryName) : serverRoutes;
   let message = 'App running at:\n\n';
 
-  if (isSingleEntry(entrypoints)) {
+  if (isSingleEntry(entrypoints) || !existSrc) {
     message += urls.map(({
       type,
       url

package/dist/js/node/wait.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wait = void 0;
+
+const wait = (time = 0) => new Promise(resolve => {
+  setTimeout(resolve, time);
+});
+
+exports.wait = wait;

package/dist/js/treeshaking/clearConsole.js

@@ -1,5 +1,5 @@
 export var clearConsole = function clearConsole() {
-  if (process.stdout.isTTY) {
+  if (process.stdout.isTTY && !process.env.DEBUG) {
     process.stdout.write('\x1B[H\x1B[2J');
   }
 };

package/dist/js/treeshaking/compatRequire.js

@@ -21,4 +21,9 @@ export var requireExistModule = function requireExistModule(filename) {
   }
 
   return compatRequire(exist);
+};
+export var cleanRequireCache = function cleanRequireCache(filelist) {
+  filelist.forEach(function (filepath) {
+    delete require.cache[filepath];
+  });
 };

package/dist/js/treeshaking/constants.js

@@ -1,18 +1,8 @@
 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; }
 
-/**
- * alias to src directory
- */
-export var INTERNAL_SRC_ALIAS = '@_modern_js_src';
-/**
- * alias to node_modules/.modern-js
- */
-
-export var INTERNAL_DIR_ALAIS = '@_modern_js_internal';
 /**
  * hmr socket connect path
  */
-
 export var HMR_SOCK_PATH = '/_modern_js_hmr_ws';
 /**
  * route specification file
@@ -49,11 +39,6 @@ export var SERVER_RENDER_FUNCTION_NAME = 'serverRender';
  */
 
 export var LOADABLE_STATS_FILE = 'loadable-stats.json';
-/**
- * real entry generate by modern.js
- */
-
-export var HIDE_MODERN_JS_DIR = './node_modules/.modern-js';
 /**
  * internal specified folder
  */
@@ -135,8 +120,8 @@ export var INTERNAL_PLUGINS = {
     cli: '@modern-js/plugin-server/cli',
     server: '@modern-js/plugin-server/server'
   },
-  '@modern-js/plugin-micro-frontend': {
-    cli: '@modern-js/plugin-micro-frontend/cli'
+  '@modern-js/plugin-garfish': {
+    cli: '@modern-js/plugin-garfish/cli'
   },
   '@modern-js/plugin-jarvis': {
     cli: '@modern-js/plugin-jarvis/cli'
@@ -301,7 +286,7 @@ export var PLUGIN_SCHEMAS = {
       "typeof": ['object', 'function']
     }
   }],
-  '@modern-js/plugin-micro-frontend': [{
+  '@modern-js/plugin-garfish': [{
     target: 'runtime.masterApp',
     schema: {
       type: ['object']

package/dist/js/treeshaking/index.js

@@ -29,4 +29,5 @@ export * from "./prettyInstructions";
 export * from "./alias";
 export * from "./import";
 export * from "./watch";
-export * from "./nodeEnv";
+export * from "./nodeEnv";
+export * from "./wait";

package/dist/js/treeshaking/prettyInstructions.js

@@ -56,14 +56,15 @@ export var prettyInstructions = function prettyInstructions(appContext, config)
   var _ref = appContext,
       entrypoints = _ref.entrypoints,
       serverRoutes = _ref.serverRoutes,
-      port = _ref.port;
+      port = _ref.port,
+      existSrc = _ref.existSrc;
   var urls = getAddressUrls(config.dev.https && isDev() ? 'https' : 'http', port);
-  var routes = serverRoutes.filter(function (route) {
+  var routes = existSrc ? serverRoutes.filter(function (route) {
     return route.entryName;
-  });
+  }) : serverRoutes;
   var message = 'App running at:\n\n';
 
-  if (isSingleEntry(entrypoints)) {
+  if (isSingleEntry(entrypoints) || !existSrc) {
     message += urls.map(function (_ref2) {
       var type = _ref2.type,
           url = _ref2.url;

package/dist/js/treeshaking/wait.js

@@ -0,0 +1,8 @@
+var wait = function wait() {
+  var time = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  return new Promise(function (resolve) {
+    setTimeout(resolve, time);
+  });
+};
+
+export { wait };

package/dist/types/compatRequire.d.ts

@@ -4,4 +4,5 @@
  * @returns module export object.
  */
 export declare const compatRequire: (filePath: string) => any;
-export declare const requireExistModule: (filename: string, extensions?: string[]) => any;
+export declare const requireExistModule: (filename: string, extensions?: string[]) => any;
+export declare const cleanRequireCache: (filelist: string[]) => void;

package/dist/types/constants.d.ts

@@ -1,16 +1,6 @@
-/**
- * alias to src directory
- */
-export declare const INTERNAL_SRC_ALIAS = "@_modern_js_src";
-/**
- * alias to node_modules/.modern-js
- */
-
-export declare const INTERNAL_DIR_ALAIS = "@_modern_js_internal";
 /**
  * hmr socket connect path
  */
-
 export declare const HMR_SOCK_PATH = "/_modern_js_hmr_ws";
 /**
  * route specification file
@@ -47,11 +37,6 @@ export declare const SERVER_RENDER_FUNCTION_NAME = "serverRender";
  */
 
 export declare const LOADABLE_STATS_FILE = "loadable-stats.json";
-/**
- * real entry generate by modern.js
- */
-
-export declare const HIDE_MODERN_JS_DIR = "./node_modules/.modern-js";
 /**
  * internal specified folder
  */
@@ -188,7 +173,7 @@ export declare const PLUGIN_SCHEMAS: {
       typeof: string[];
     };
   }[];
-  '@modern-js/plugin-micro-frontend': {
+  '@modern-js/plugin-garfish': {
     target: string;
     schema: {
       type: string[];

package/dist/types/index.d.ts

@@ -28,4 +28,5 @@ export * from './prettyInstructions';
 export * from './alias';
 export * from './import';
 export * from './watch';
-export * from './nodeEnv';
+export * from './nodeEnv';
+export * from './wait';

package/dist/types/wait.d.ts

@@ -0,0 +1,2 @@
+declare const wait: (time?: number) => Promise<unknown>;
+export { wait };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.2",
+  "version": "1.3.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",

package/tests/__snapshots__/prettyInstructions.test.ts.snap

@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`prettyInstructions The src directory does not exist 1`] = `
+"App running at:
+
+  > Network:  http://127.0.0.1:8080/api
+  > Network:  http://11.11.111.11:8080/api
+  > Network:  http://10.100.100.100:8080/api
+"
+`;
+
+exports[`prettyInstructions basic usage 1`] = `
+"App running at:
+
+  > Network:  http://127.0.0.1:8080/
+  > Network:  http://11.11.111.11:8080/
+  > Network:  http://10.100.100.100:8080/
+"
+`;

package/tests/compatRequire.test.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { compatRequire } from '../src/compatRequire';
+import { compatRequire, cleanRequireCache } from '../src/compatRequire';
 
 describe('compat require', () => {
   const fixturePath = path.resolve(__dirname, './fixtures/compat-require');
@@ -19,4 +19,14 @@ describe('compat require', () => {
   test(`should return null`, () => {
     expect(compatRequire(path.join(fixturePath, 'empty.js'))).toEqual(null);
   });
+
+  test('should clearn cache after fn', () => {
+    const foo = module.require('./fixtures/compat-require/foo');
+    const requirePath = require.resolve('./fixtures/compat-require/foo.js');
+    expect(foo.name).toBe('foo');
+    expect(require.cache[requirePath]).toBeDefined();
+    cleanRequireCache([requirePath]);
+    jest.resetModules();
+    expect(require.cache[requirePath]).toBeUndefined();
+  });
 });

package/tests/fixtures/compat-require/foo.js

@@ -0,0 +1,3 @@
+module.exports = {
+  name: 'foo',
+};

package/tests/prettyInstructions.test.ts

@@ -0,0 +1,139 @@
+import { prettyInstructions } from '../src/prettyInstructions';
+
+const mockNetworkInterfaces = {
+  lo0: [
+    {
+      address: '127.0.0.1',
+      netmask: '255.0.0.0',
+      family: 'IPv4',
+      mac: '00:00:00:00:00:00',
+      internal: true,
+      cidr: '127.0.0.1/8',
+    },
+  ],
+  en5: [
+    {
+      address: 'fe80::aede:48ff:fe00:1122',
+      netmask: 'ffff:ffff:ffff:ffff::',
+      family: 'IPv6',
+      mac: 'ac:de:48:00:11:22',
+      internal: false,
+      cidr: 'fe80::aede:48ff:fe00:1122/64',
+      scopeid: 4,
+    },
+  ],
+  en0: [
+    {
+      address: '11.11.111.11',
+      netmask: '255.255.252.0',
+      family: 'IPv4',
+      mac: '90:9c:4a:cf:11:d2',
+      internal: false,
+      cidr: '10.85.117.60/22',
+    },
+  ],
+  utun2: [
+    {
+      address: '10.100.100.100',
+      netmask: '255.255.224.0',
+      family: 'IPv4',
+      mac: '00:00:00:00:00:00',
+      internal: false,
+      cidr: '10.255.182.172/19',
+    },
+  ],
+};
+
+jest.mock('os', () => {
+  const originalModule = jest.requireActual('os');
+  return {
+    __esModule: true,
+    ...originalModule,
+    default: {
+      networkInterfaces() {
+        return mockNetworkInterfaces;
+      },
+    },
+  };
+});
+
+jest.mock('chalk', () => ({
+  __esModule: true,
+  default: {
+    bold: jest.fn(str => str),
+    green: jest.fn(str => str),
+    red: jest.fn(str => str),
+    yellow: jest.fn(str => str),
+    cyanBright: jest.fn(str => str),
+  },
+}));
+
+describe('prettyInstructions', () => {
+  test('basic usage', () => {
+    const mockAppContext = {
+      entrypoints: [
+        {
+          entryName: 'main',
+          entry: '/example/node_modules/.modern-js/main/index.js',
+          isAutoMount: true,
+          customBootstrap: false,
+        },
+      ],
+      serverRoutes: [
+        {
+          urlPath: '/',
+          entryName: 'main',
+          entryPath: 'html/main/index.html',
+          isSPA: true,
+          isSSR: false,
+          enableModernMode: false,
+        },
+        {
+          urlPath: '/api',
+          isApi: true,
+          entryPath: '',
+          isSPA: false,
+          isSSR: false,
+        },
+      ],
+      port: 8080,
+      existSrc: true,
+    };
+    const mockConfig = {
+      dev: {
+        https: true,
+      },
+    };
+
+    const message = prettyInstructions(mockAppContext, mockConfig);
+
+    expect(message).toMatchSnapshot();
+  });
+
+  test('The src directory does not exist', () => {
+    const mockAppContext = {
+      entrypoints: [],
+      serverRoutes: [
+        {
+          urlPath: '/api',
+          isApi: true,
+          entryPath: '',
+          isSPA: false,
+          isSSR: false,
+        },
+      ],
+      port: 8080,
+      existSrc: false,
+    };
+
+    const mockConfig = {
+      dev: {
+        https: true,
+      },
+    };
+
+    const message = prettyInstructions(mockAppContext, mockConfig);
+
+    expect(message).toMatchSnapshot();
+  });
+});

package/tests/wait.ts

@@ -0,0 +1,38 @@
+import { wait } from '../src/wait';
+
+jest.useRealTimers();
+
+describe('wait', () => {
+  test('basic usage', async () => {
+    const fn1 = jest.fn();
+    const fn2 = jest.fn();
+    const fn3 = async () => {
+      fn1();
+      await wait();
+      fn2();
+    };
+
+    fn3();
+    expect(fn1).toBeCalled();
+    expect(fn2).not.toBeCalled();
+    await wait();
+    expect(fn2).toBeCalled();
+  });
+
+  test('delay', async () => {
+    const fn1 = jest.fn();
+    const fn2 = jest.fn();
+    const time = 100;
+    const fn3 = async () => {
+      fn1();
+      await wait(time);
+      fn2();
+    };
+
+    fn3();
+    expect(fn1).toBeCalled();
+    expect(fn2).not.toBeCalled();
+    await wait(time);
+    expect(fn2).toBeCalled();
+  });
+});