@modern-js/utils 1.1.2 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @modern-js/utils
 
+## 1.1.3
+
+### Patch Changes
+
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server conifg
+- d280ea33: chore: runtime exports can choose to generate d.ts file
+- 085a6a58: support server runtime
+- 085a6a58: feat: refactor server plugin
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/js/modern/compatRequire.js

@@ -1,10 +1,21 @@
+import { findExists } from "./findExists";
 /**
  * Require function compatible with esm and cjs module.
  * @param filePath - File to required.
  * @returns module export object.
  */
+
 export const compatRequire = filePath => {
   const mod = require(filePath);
 
   return mod !== null && mod !== void 0 && mod.__esModule ? mod.default : mod;
+};
+export const requireExistModule = (filename, extensions = ['.ts', '.js']) => {
+  const exist = findExists(extensions.map(ext => `${filename}${ext}`));
+
+  if (!exist) {
+    return null;
+  }
+
+  return compatRequire(exist);
 };

package/dist/js/modern/constants.js

@@ -47,7 +47,18 @@ 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
+ */
+
+export const API_DIR = 'api';
+export const SERVER_DIR = 'server';
+export const SHARED_DIR = 'shared';
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -118,6 +129,10 @@ export const INTERNAL_PLUGINS = {
   '@modern-js/plugin-server-build': {
     cli: '@modern-js/plugin-server-build'
   },
+  '@modern-js/plugin-server': {
+    cli: '@modern-js/plugin-server/cli',
+    server: '@modern-js/plugin-server/server'
+  },
   '@modern-js/plugin-micro-frontend': {
     cli: '@modern-js/plugin-micro-frontend/cli'
   },
@@ -175,7 +190,10 @@ export const PLUGIN_SCHEMAS = {
       type: 'object',
       properties: {
         prefix: {
-          type: 'string'
+          type: ['string', 'array'],
+          items: {
+            type: 'string'
+          }
         },
         fetcher: {
           type: 'string'
@@ -183,7 +201,7 @@ export const PLUGIN_SCHEMAS = {
         proxy: {
           type: 'object'
         },
-        requestCreater: {
+        requestCreator: {
           type: 'string'
         }
       }

package/dist/js/modern/runtimeExports.js

@@ -18,8 +18,9 @@ const memo = fn => {
   };
 };
 
-export const createRuntimeExportsUtils = memo((pwd = '', namespace) => {
-  const entryExportFile = path.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`); // const ensure = () => {
+export const createRuntimeExportsUtils = memo((pwd = '', namespace, ts = false) => {
+  const entryExportFile = path.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`);
+  const entryExportTsFile = path.join(pwd, `.runtime-exports/${namespace ? `${namespace}.d.ts` : 'index.d.ts'}`); // const ensure = () => {
   //   if (!fs.existsSync(entryExportFile)) {
   //     fs.outputFileSync(entryExportFile, '');
   //   }
@@ -32,9 +33,11 @@ export const createRuntimeExportsUtils = memo((pwd = '', namespace) => {
 
     try {
       fs.ensureFileSync(entryExportFile);
+      fs.ensureFileSync(entryExportTsFile);
 
       if (!fs.readFileSync(entryExportFile, 'utf8').includes(statement)) {
         fs.appendFileSync(entryExportFile, `${statement}\n`);
+        ts && fs.appendFileSync(entryExportTsFile, `${statement.replace('.js', '.d')}\n`);
       }
     } catch (_unused) {// FIXME:
     }

package/dist/js/node/compatRequire.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.compatRequire = void 0;
+exports.requireExistModule = exports.compatRequire = void 0;
+
+var _findExists = require("./findExists");
 
 /**
  * Require function compatible with esm and cjs module.
@@ -16,4 +18,16 @@ const compatRequire = filePath => {
   return mod !== null && mod !== void 0 && mod.__esModule ? mod.default : mod;
 };
 
-exports.compatRequire = compatRequire;
+exports.compatRequire = compatRequire;
+
+const requireExistModule = (filename, extensions = ['.ts', '.js']) => {
+  const exist = (0, _findExists.findExists)(extensions.map(ext => `${filename}${ext}`));
+
+  if (!exist) {
+    return null;
+  }
+
+  return compatRequire(exist);
+};
+
+exports.requireExistModule = requireExistModule;

package/dist/js/node/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SERVER_RENDER_FUNCTION_NAME = 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 = 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_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;
 
 /**
  * alias to src directory
@@ -63,13 +63,27 @@ 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 plugins that work as soon as they are installed.
+ * internal specified folder
  */
 
 exports.HIDE_MODERN_JS_DIR = HIDE_MODERN_JS_DIR;
+const API_DIR = 'api';
+exports.API_DIR = API_DIR;
+const SERVER_DIR = 'server';
+exports.SERVER_DIR = SERVER_DIR;
+const SHARED_DIR = 'shared';
+/**
+ * Internal plugins that work as soon as they are installed.
+ */
+
+exports.SHARED_DIR = SHARED_DIR;
 const INTERNAL_PLUGINS = {
   '@modern-js/app-tools': {
     cli: '@modern-js/app-tools/cli'
@@ -136,6 +150,10 @@ const INTERNAL_PLUGINS = {
   '@modern-js/plugin-server-build': {
     cli: '@modern-js/plugin-server-build'
   },
+  '@modern-js/plugin-server': {
+    cli: '@modern-js/plugin-server/cli',
+    server: '@modern-js/plugin-server/server'
+  },
   '@modern-js/plugin-micro-frontend': {
     cli: '@modern-js/plugin-micro-frontend/cli'
   },
@@ -194,7 +212,10 @@ const PLUGIN_SCHEMAS = {
       type: 'object',
       properties: {
         prefix: {
-          type: 'string'
+          type: ['string', 'array'],
+          items: {
+            type: 'string'
+          }
         },
         fetcher: {
           type: 'string'
@@ -202,7 +223,7 @@ const PLUGIN_SCHEMAS = {
         proxy: {
           type: 'object'
         },
-        requestCreater: {
+        requestCreator: {
           type: 'string'
         }
       }

package/dist/js/node/runtimeExports.js

@@ -29,8 +29,10 @@ const memo = fn => {
   };
 };
 
-const createRuntimeExportsUtils = memo((pwd = '', namespace) => {
-  const entryExportFile = _path.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`); // const ensure = () => {
+const createRuntimeExportsUtils = memo((pwd = '', namespace, ts = false) => {
+  const entryExportFile = _path.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`);
+
+  const entryExportTsFile = _path.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.d.ts` : 'index.d.ts'}`); // const ensure = () => {
   //   if (!fs.existsSync(entryExportFile)) {
   //     fs.outputFileSync(entryExportFile, '');
   //   }
@@ -45,8 +47,12 @@ const createRuntimeExportsUtils = memo((pwd = '', namespace) => {
     try {
       _fsExtra.default.ensureFileSync(entryExportFile);
 
+      _fsExtra.default.ensureFileSync(entryExportTsFile);
+
       if (!_fsExtra.default.readFileSync(entryExportFile, 'utf8').includes(statement)) {
         _fsExtra.default.appendFileSync(entryExportFile, `${statement}\n`);
+
+        ts && _fsExtra.default.appendFileSync(entryExportTsFile, `${statement.replace('.js', '.d')}\n`);
       }
     } catch (_unused) {// FIXME:
     }

package/dist/js/treeshaking/compatRequire.js

@@ -1,10 +1,24 @@
+import { findExists } from "./findExists";
 /**
  * Require function compatible with esm and cjs module.
  * @param filePath - File to required.
  * @returns module export object.
  */
+
 export var compatRequire = function compatRequire(filePath) {
   var mod = require(filePath);
 
   return mod !== null && mod !== void 0 && mod.__esModule ? mod["default"] : mod;
+};
+export var requireExistModule = function requireExistModule(filename) {
+  var extensions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['.ts', '.js'];
+  var exist = findExists(extensions.map(function (ext) {
+    return "".concat(filename).concat(ext);
+  }));
+
+  if (!exist) {
+    return null;
+  }
+
+  return compatRequire(exist);
 };

package/dist/js/treeshaking/constants.js

@@ -49,7 +49,18 @@ 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
+ */
+
+export var API_DIR = 'api';
+export var SERVER_DIR = 'server';
+export var SHARED_DIR = 'shared';
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -120,6 +131,10 @@ export var INTERNAL_PLUGINS = {
   '@modern-js/plugin-server-build': {
     cli: '@modern-js/plugin-server-build'
   },
+  '@modern-js/plugin-server': {
+    cli: '@modern-js/plugin-server/cli',
+    server: '@modern-js/plugin-server/server'
+  },
   '@modern-js/plugin-micro-frontend': {
     cli: '@modern-js/plugin-micro-frontend/cli'
   },
@@ -175,7 +190,10 @@ export var PLUGIN_SCHEMAS = {
       type: 'object',
       properties: {
         prefix: {
-          type: 'string'
+          type: ['string', 'array'],
+          items: {
+            type: 'string'
+          }
         },
         fetcher: {
           type: 'string'
@@ -183,7 +201,7 @@ export var PLUGIN_SCHEMAS = {
         proxy: {
           type: 'object'
         },
-        requestCreater: {
+        requestCreator: {
           type: 'string'
         }
       }

package/dist/js/treeshaking/runtimeExports.js

@@ -25,7 +25,9 @@ var memo = function memo(fn) {
 export var createRuntimeExportsUtils = memo(function () {
   var pwd = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var namespace = arguments.length > 1 ? arguments[1] : undefined;
-  var entryExportFile = path.join(pwd, ".runtime-exports/".concat(namespace ? "".concat(namespace, ".js") : 'index.js')); // const ensure = () => {
+  var ts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var entryExportFile = path.join(pwd, ".runtime-exports/".concat(namespace ? "".concat(namespace, ".js") : 'index.js'));
+  var entryExportTsFile = path.join(pwd, ".runtime-exports/".concat(namespace ? "".concat(namespace, ".d.ts") : 'index.d.ts')); // const ensure = () => {
   //   if (!fs.existsSync(entryExportFile)) {
   //     fs.outputFileSync(entryExportFile, '');
   //   }
@@ -38,9 +40,11 @@ export var createRuntimeExportsUtils = memo(function () {
 
     try {
       fs.ensureFileSync(entryExportFile);
+      fs.ensureFileSync(entryExportTsFile);
 
       if (!fs.readFileSync(entryExportFile, 'utf8').includes(statement)) {
         fs.appendFileSync(entryExportFile, "".concat(statement, "\n"));
+        ts && fs.appendFileSync(entryExportTsFile, "".concat(statement.replace('.js', '.d'), "\n"));
       }
     } catch (_unused) {// FIXME:
     }

package/dist/types/compatRequire.d.ts

@@ -3,4 +3,5 @@
  * @param filePath - File to required.
  * @returns module export object.
  */
-export declare const compatRequire: (filePath: string) => any;
+export declare const compatRequire: (filePath: string) => any;
+export declare const requireExistModule: (filename: string, extensions?: string[]) => any;

package/dist/types/constants.d.ts

@@ -47,7 +47,18 @@ 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
+ */
+
+export declare const API_DIR = "api";
+export declare const SERVER_DIR = "server";
+export declare const SHARED_DIR = "shared";
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -88,7 +99,10 @@ export declare const PLUGIN_SCHEMAS: {
       type: string;
       properties: {
         prefix: {
-          type: string;
+          type: string[];
+          items: {
+            type: string;
+          };
         };
         fetcher: {
           type: string;
@@ -96,7 +110,7 @@ export declare const PLUGIN_SCHEMAS: {
         proxy: {
           type: string;
         };
-        requestCreater: {
+        requestCreator: {
           type: string;
         };
       };

package/dist/types/runtimeExports.d.ts

@@ -1,4 +1,4 @@
-export declare const createRuntimeExportsUtils: (pwd: any, namespace: string) => {
+export declare const createRuntimeExportsUtils: (pwd: any, namespace: string, ts?: any) => {
   addExport: (statement: string) => void;
   getPath: () => string;
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.2",
+  "version": "1.1.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -65,8 +65,8 @@
     "@types/recursive-readdir": "^2.2.0",
     "typescript": "^4",
     "webpack": "^5.54.0",
-    "@modern-js/plugin-testing": "^1.1.0",
-    "@modern-js/module-tools": "^1.1.0"
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.1"
   },
   "peerDependencies": {
     "typescript": "^4.4.3"

package/src/compatRequire.ts

@@ -1,3 +1,5 @@
+import { findExists } from './findExists';
+
 /**
  * Require function compatible with esm and cjs module.
  * @param filePath - File to required.
@@ -8,3 +10,16 @@ export const compatRequire = (filePath: string) => {
 
   return mod?.__esModule ? mod.default : mod;
 };
+
+export const requireExistModule = (
+  filename: string,
+  extensions = ['.ts', '.js'],
+) => {
+  const exist = findExists(extensions.map(ext => `${filename}${ext}`));
+
+  if (!exist) {
+    return null;
+  }
+
+  return compatRequire(exist);
+};

package/src/constants.ts

@@ -48,8 +48,20 @@ 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
+ */
+export const API_DIR = 'api';
+
+export const SERVER_DIR = 'server';
+
+export const SHARED_DIR = 'shared';
+
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -91,6 +103,10 @@ export const INTERNAL_PLUGINS: {
   },
   '@modern-js/plugin-unbundle': { cli: '@modern-js/plugin-unbundle' },
   '@modern-js/plugin-server-build': { cli: '@modern-js/plugin-server-build' },
+  '@modern-js/plugin-server': {
+    cli: '@modern-js/plugin-server/cli',
+    server: '@modern-js/plugin-server/server',
+  },
   '@modern-js/plugin-micro-frontend': {
     cli: '@modern-js/plugin-micro-frontend/cli',
   },
@@ -133,10 +149,13 @@ export const PLUGIN_SCHEMAS = {
       schema: {
         type: 'object',
         properties: {
-          prefix: { type: 'string' },
+          prefix: {
+            type: ['string', 'array'],
+            items: { type: 'string' },
+          },
           fetcher: { type: 'string' },
           proxy: { type: 'object' },
-          requestCreater: { type: 'string' },
+          requestCreator: { type: 'string' },
         },
       },
     },

package/src/runtimeExports.ts

@@ -20,36 +20,49 @@ const memo = <T extends (...args: any[]) => any>(fn: T) => {
   };
 };
 
-export const createRuntimeExportsUtils = memo((pwd = '', namespace: string) => {
-  const entryExportFile = path.join(
-    pwd,
-    `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`,
-  );
-
-  // const ensure = () => {
-  //   if (!fs.existsSync(entryExportFile)) {
-  //     fs.outputFileSync(entryExportFile, '');
-  //   }
-  //   fs.ensureFileSync(entryExportFile);
-  // };
-
-  const addExport = (statement: string) => {
-    // eslint-disable-next-line no-param-reassign
-    statement = normalizeOutputPath(statement);
-    try {
-      fs.ensureFileSync(entryExportFile);
-      if (!fs.readFileSync(entryExportFile, 'utf8').includes(statement)) {
-        fs.appendFileSync(entryExportFile, `${statement}\n`);
+export const createRuntimeExportsUtils = memo(
+  (pwd = '', namespace: string, ts = false) => {
+    const entryExportFile = path.join(
+      pwd,
+      `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`,
+    );
+    const entryExportTsFile = path.join(
+      pwd,
+      `.runtime-exports/${namespace ? `${namespace}.d.ts` : 'index.d.ts'}`,
+    );
+
+    // const ensure = () => {
+    //   if (!fs.existsSync(entryExportFile)) {
+    //     fs.outputFileSync(entryExportFile, '');
+    //   }
+    //   fs.ensureFileSync(entryExportFile);
+    // };
+
+    const addExport = (statement: string) => {
+      // eslint-disable-next-line no-param-reassign
+      statement = normalizeOutputPath(statement);
+      try {
+        fs.ensureFileSync(entryExportFile);
+        fs.ensureFileSync(entryExportTsFile);
+
+        if (!fs.readFileSync(entryExportFile, 'utf8').includes(statement)) {
+          fs.appendFileSync(entryExportFile, `${statement}\n`);
+          ts &&
+            fs.appendFileSync(
+              entryExportTsFile,
+              `${statement.replace('.js', '.d')}\n`,
+            );
+        }
+      } catch {
+        // FIXME:
       }
-    } catch {
-      // FIXME:
-    }
-  };
+    };
 
-  const getPath = () => entryExportFile;
+    const getPath = () => entryExportFile;
 
-  return {
-    addExport,
-    getPath,
-  };
-});
+    return {
+      addExport,
+      getPath,
+    };
+  },
+);