@modern-js/utils 2.0.0-beta.2 → 2.0.0-beta.3

package/compiled/webpack-dev-middleware/types/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export = wdm;
 /** @typedef {import('../schema-utils3/declarations/validate').Schema} Schema */
 /** @typedef {import('webpack').Compiler} Compiler */
@@ -35,31 +36,31 @@ export = wdm;
  * @param {Stats | MultiStats} [stats]
  */
 /**
- * @template {IncomingMessage} Request
- * @template {ServerResponse} Response
+ * @template {IncomingMessage} RequestInternal
+ * @template {ServerResponse} ResponseInternal
  * @typedef {Object} Context
  * @property {boolean} state
  * @property {Stats | MultiStats | undefined} stats
  * @property {Callback[]} callbacks
- * @property {Options<Request, Response>} options
+ * @property {Options<RequestInternal, ResponseInternal>} options
  * @property {Compiler | MultiCompiler} compiler
  * @property {Watching | MultiWatching} watching
  * @property {Logger} logger
  * @property {OutputFileSystem} outputFileSystem
  */
 /**
- * @template {IncomingMessage} Request
- * @template {ServerResponse} Response
- * @typedef {Record<string, string | number> | Array<{ key: string, value: number | string }> | ((req: Request, res: Response, context: Context<Request, Response>) =>  void | undefined | Record<string, string | number>) | undefined} Headers
+ * @template {IncomingMessage} RequestInternal
+ * @template {ServerResponse} ResponseInternal
+ * @typedef {Record<string, string | number> | Array<{ key: string, value: number | string }> | ((req: RequestInternal, res: ResponseInternal, context: Context<RequestInternal, ResponseInternal>) =>  void | undefined | Record<string, string | number>) | undefined} Headers
  */
 /**
- * @template {IncomingMessage} Request
- * @template {ServerResponse} Response
+ * @template {IncomingMessage} RequestInternal
+ * @template {ServerResponse} ResponseInternal
  * @typedef {Object} Options
  * @property {{[key: string]: string}} [mimeTypes]
  * @property {boolean | ((targetPath: string) => boolean)} [writeToDisk]
  * @property {string} [methods]
- * @property {Headers<Request, Response>} [headers]
+ * @property {Headers<RequestInternal, ResponseInternal>} [headers]
  * @property {NonNullable<Configuration["output"]>["publicPath"]} [publicPath]
  * @property {Configuration["stats"]} [stats]
  * @property {boolean} [serverSideRender]
@@ -67,11 +68,11 @@ export = wdm;
  * @property {boolean | string} [index]
  */
 /**
- * @template {IncomingMessage} Request
- * @template {ServerResponse} Response
+ * @template {IncomingMessage} RequestInternal
+ * @template {ServerResponse} ResponseInternal
  * @callback Middleware
- * @param {Request} req
- * @param {Response} res
+ * @param {RequestInternal} req
+ * @param {ResponseInternal} res
  * @param {NextFunction} next
  * @return {Promise<void>}
  */
@@ -93,34 +94,34 @@ export = wdm;
  * @param {(err: Error | null | undefined) => void} callback
  */
 /**
- * @template {IncomingMessage} Request
- * @template {ServerResponse} Response
+ * @template {IncomingMessage} RequestInternal
+ * @template {ServerResponse} ResponseInternal
  * @typedef {Object} AdditionalMethods
  * @property {GetFilenameFromUrl} getFilenameFromUrl
  * @property {WaitUntilValid} waitUntilValid
  * @property {Invalidate} invalidate
  * @property {Close} close
- * @property {Context<Request, Response>} context
+ * @property {Context<RequestInternal, ResponseInternal>} context
  */
 /**
- * @template {IncomingMessage} Request
- * @template {ServerResponse} Response
- * @typedef {Middleware<Request, Response> & AdditionalMethods<Request, Response>} API
+ * @template {IncomingMessage} RequestInternal
+ * @template {ServerResponse} ResponseInternal
+ * @typedef {Middleware<RequestInternal, ResponseInternal> & AdditionalMethods<RequestInternal, ResponseInternal>} API
  */
 /**
- * @template {IncomingMessage} Request
- * @template {ServerResponse} Response
+ * @template {IncomingMessage} RequestInternal
+ * @template {ServerResponse} ResponseInternal
  * @param {Compiler | MultiCompiler} compiler
- * @param {Options<Request, Response>} [options]
- * @returns {API<Request, Response>}
+ * @param {Options<RequestInternal, ResponseInternal>} [options]
+ * @returns {API<RequestInternal, ResponseInternal>}
  */
 declare function wdm<
-  Request_1 extends import('http').IncomingMessage,
-  Response_1 extends ServerResponse
+  RequestInternal extends import('http').IncomingMessage,
+  ResponseInternal extends ServerResponse
 >(
   compiler: Compiler | MultiCompiler,
-  options?: Options<Request_1, Response_1> | undefined
-): API<Request_1, Response_1>;
+  options?: Options<RequestInternal, ResponseInternal> | undefined
+): API<RequestInternal, ResponseInternal>;
 declare namespace wdm {
   export {
     Schema,
@@ -155,8 +156,8 @@ type ServerResponse = import('http').ServerResponse & ExtendedServerResponse;
 type Compiler = import('webpack').Compiler;
 type MultiCompiler = import('webpack').MultiCompiler;
 type Options<
-  Request_1 extends import('http').IncomingMessage,
-  Response_1 extends ServerResponse
+  RequestInternal extends import('http').IncomingMessage,
+  ResponseInternal extends ServerResponse
 > = {
   mimeTypes?:
     | {
@@ -165,7 +166,7 @@ type Options<
     | undefined;
   writeToDisk?: boolean | ((targetPath: string) => boolean) | undefined;
   methods?: string | undefined;
-  headers?: Headers<Request_1, Response_1>;
+  headers?: Headers<RequestInternal, ResponseInternal>;
   publicPath?: NonNullable<Configuration["output"]>["publicPath"];
   stats?: Configuration["stats"];
   serverSideRender?: boolean | undefined;
@@ -173,10 +174,10 @@ type Options<
   index?: string | boolean | undefined;
 };
 type API<
-  Request_1 extends import('http').IncomingMessage,
-  Response_1 extends ServerResponse
-> = Middleware<Request_1, Response_1> &
-  AdditionalMethods<Request_1, Response_1>;
+  RequestInternal extends import('http').IncomingMessage,
+  ResponseInternal extends ServerResponse
+> = Middleware<RequestInternal, ResponseInternal> &
+  AdditionalMethods<RequestInternal, ResponseInternal>;
 type Schema = import('../schema-utils3/declarations/validate').Schema;
 type Configuration = import('webpack').Configuration;
 type Stats = import('webpack').Stats;
@@ -201,7 +202,7 @@ type Watching = Compiler["watching"];
 type MultiWatching = ReturnType<Compiler["watch"]>;
 type OutputFileSystem = Compiler["outputFileSystem"] & {
   createReadStream?: typeof import('fs').createReadStream;
-  statSync?: typeof import('fs').statSync;
+  statSync?: import('fs').StatSyncFn;
   lstat?: typeof import('fs').lstat;
   readFileSync?: typeof import('fs').readFileSync;
 };
@@ -210,21 +211,21 @@ type Callback = (
   stats?: import('webpack').Stats | import('webpack').MultiStats | undefined
 ) => any;
 type Context<
-  Request_1 extends import('http').IncomingMessage,
-  Response_1 extends ServerResponse
+  RequestInternal extends import('http').IncomingMessage,
+  ResponseInternal extends ServerResponse
 > = {
   state: boolean;
   stats: Stats | MultiStats | undefined;
   callbacks: Callback[];
-  options: Options<Request_1, Response_1>;
+  options: Options<RequestInternal, ResponseInternal>;
   compiler: Compiler | MultiCompiler;
   watching: Watching | MultiWatching;
   logger: Logger;
   outputFileSystem: OutputFileSystem;
 };
 type Headers<
-  Request_1 extends import('http').IncomingMessage,
-  Response_1 extends ServerResponse
+  RequestInternal extends import('http').IncomingMessage,
+  ResponseInternal extends ServerResponse
 > =
   | Record<string, string | number>
   | {
@@ -232,26 +233,30 @@ type Headers<
       value: number | string;
     }[]
   | ((
-      req: Request_1,
-      res: Response_1,
-      context: Context<Request_1, Response_1>
+      req: RequestInternal,
+      res: ResponseInternal,
+      context: Context<RequestInternal, ResponseInternal>
     ) => void | undefined | Record<string, string | number>)
   | undefined;
 type Middleware<
-  Request_1 extends import('http').IncomingMessage,
-  Response_1 extends ServerResponse
-> = (req: Request_1, res: Response_1, next: NextFunction) => Promise<void>;
+  RequestInternal extends import('http').IncomingMessage,
+  ResponseInternal extends ServerResponse
+> = (
+  req: RequestInternal,
+  res: ResponseInternal,
+  next: NextFunction
+) => Promise<void>;
 type GetFilenameFromUrl = (url: string) => string | undefined;
 type WaitUntilValid = (callback: Callback) => any;
 type Invalidate = (callback: Callback) => any;
 type Close = (callback: (err: Error | null | undefined) => void) => any;
 type AdditionalMethods<
-  Request_1 extends import('http').IncomingMessage,
-  Response_1 extends ServerResponse
+  RequestInternal extends import('http').IncomingMessage,
+  ResponseInternal extends ServerResponse
 > = {
   getFilenameFromUrl: GetFilenameFromUrl;
   waitUntilValid: WaitUntilValid;
   invalidate: Invalidate;
   close: Close;
-  context: Context<Request_1, Response_1>;
+  context: Context<RequestInternal, ResponseInternal>;
 };

package/dist/chainId.d.ts

@@ -56,6 +56,7 @@ export declare const CHAIN_ID: {
         readonly ASSETS: "assets";
         readonly ASSETS_URL: "assets-url";
         readonly ASSETS_INLINE: "assets-inline";
+        readonly IMAGE_COMPRESS: "image-compress";
     };
     /** Predefined loaders */
     readonly USE: {
@@ -99,6 +100,8 @@ export declare const CHAIN_ID: {
         readonly CSS_MODULES_TS: "css-modules-typescript";
         /** mini-css-extract-plugin.loader */
         readonly MINI_CSS_EXTRACT: "mini-css-extract";
+        /** builder-plugin-image-compress.loader */
+        readonly IMAGE_COMPRESS: "image-compress";
     };
     /** Predefined plugins */
     readonly PLUGIN: {

package/dist/chainId.js

@@ -59,6 +59,7 @@ exports.CHAIN_ID = {
         ASSETS: 'assets',
         ASSETS_URL: 'assets-url',
         ASSETS_INLINE: 'assets-inline',
+        IMAGE_COMPRESS: 'image-compress',
     },
     /** Predefined loaders */
     USE: {
@@ -102,6 +103,8 @@ exports.CHAIN_ID = {
         CSS_MODULES_TS: 'css-modules-typescript',
         /** mini-css-extract-plugin.loader */
         MINI_CSS_EXTRACT: 'mini-css-extract',
+        /** builder-plugin-image-compress.loader */
+        IMAGE_COMPRESS: 'image-compress',
     },
     /** Predefined plugins */
     PLUGIN: {

package/dist/constants.d.ts

@@ -58,6 +58,26 @@ export declare const ROUTE_MINIFEST_FILE = "routes-manifest.json";
  * Property mounted on window that describes route manifest
  */
 export declare const ROUTE_MANIFEST = "_MODERNJS_ROUTE_MANIFEST";
+/**
+ * directory name for loader routes
+ */
+export declare const LOADER_ROUTES_DIR = "loader-routes";
+/**
+ * Internal app-tools plugins that work as soon as they are installed.
+ */
+export declare const INTERNAL_APP_TOOLS_PLUGINS: InternalPlugins;
+/**
+ * Internal module-tools plugins that work as soon as they are installed.
+ */
+export declare const INTERNAL_MODULE_TOOLS_PLUGINS: InternalPlugins;
+/**
+ * Internal module-tools plugins that work as soon as they are installed.
+ */
+export declare const INTERNAL_MONOREPO_TOOLS_PLUGINS: InternalPlugins;
+/**
+ * Internal module-tools plugins that work as soon as they are installed.
+ */
+export declare const INTERNAL_DOC_TOOLS_PLUGINS: InternalPlugins;
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -86,6 +106,12 @@ export declare const PLUGIN_SCHEMAS: {
             additionalProperties: boolean;
         };
     })[];
+    '@modern-js/plugin-swc': {
+        target: string;
+        schema: {
+            typeof: string[];
+        };
+    }[];
     '@modern-js/plugin-bff': {
         target: string;
         schema: {

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLUGIN_SCHEMAS = exports.INTERNAL_SERVER_PLUGINS = exports.INTERNAL_CLI_PLUGINS = exports.ROUTE_MANIFEST = exports.ROUTE_MINIFEST_FILE = exports.DEFAULT_SERVER_CONFIG = exports.OUTPUT_CONFIG_FILE = exports.CONFIG_FILE_EXTENSIONS = exports.CONFIG_CACHE_DIR = exports.SHARED_DIR = exports.SERVER_DIR = exports.API_DIR = exports.LOADABLE_STATS_FILE = exports.SERVER_RENDER_FUNCTION_NAME = exports.ENTRY_NAME_PATTERN = exports.SERVER_BUNDLE_DIRECTORY = exports.LAUNCH_EDITOR_ENDPOINT = exports.MAIN_ENTRY_NAME = exports.ROUTE_SPEC_FILE = exports.HMR_SOCK_PATH = void 0;
+exports.PLUGIN_SCHEMAS = exports.INTERNAL_SERVER_PLUGINS = exports.INTERNAL_CLI_PLUGINS = exports.INTERNAL_DOC_TOOLS_PLUGINS = exports.INTERNAL_MONOREPO_TOOLS_PLUGINS = exports.INTERNAL_MODULE_TOOLS_PLUGINS = exports.INTERNAL_APP_TOOLS_PLUGINS = exports.LOADER_ROUTES_DIR = exports.ROUTE_MANIFEST = exports.ROUTE_MINIFEST_FILE = exports.DEFAULT_SERVER_CONFIG = exports.OUTPUT_CONFIG_FILE = exports.CONFIG_FILE_EXTENSIONS = exports.CONFIG_CACHE_DIR = exports.SHARED_DIR = exports.SERVER_DIR = exports.API_DIR = exports.LOADABLE_STATS_FILE = exports.SERVER_RENDER_FUNCTION_NAME = exports.ENTRY_NAME_PATTERN = exports.SERVER_BUNDLE_DIRECTORY = exports.LAUNCH_EDITOR_ENDPOINT = exports.MAIN_ENTRY_NAME = exports.ROUTE_SPEC_FILE = exports.HMR_SOCK_PATH = void 0;
 /**
  * hmr socket connect path
  */
@@ -60,6 +60,61 @@ exports.ROUTE_MINIFEST_FILE = 'routes-manifest.json';
  * Property mounted on window that describes route manifest
  */
 exports.ROUTE_MANIFEST = `_MODERNJS_ROUTE_MANIFEST`;
+/**
+ * directory name for loader routes
+ */
+exports.LOADER_ROUTES_DIR = `loader-routes`;
+/**
+ * Internal app-tools plugins that work as soon as they are installed.
+ */
+exports.INTERNAL_APP_TOOLS_PLUGINS = {
+    '@modern-js/app-tools': '@modern-js/app-tools/cli',
+    '@modern-js/runtime': '@modern-js/runtime/cli',
+    '@modern-js/plugin-proxy': '@modern-js/plugin-proxy/cli',
+    '@modern-js/plugin-ssg': '@modern-js/plugin-ssg/cli',
+    '@modern-js/plugin-bff': '@modern-js/plugin-bff/cli',
+    '@modern-js/plugin-testing': '@modern-js/plugin-testing/cli',
+    '@modern-js/plugin-storybook': '@modern-js/plugin-storybook/cli',
+    '@modern-js/plugin-express': '@modern-js/plugin-express/cli',
+    '@modern-js/plugin-egg': '@modern-js/plugin-egg/cli',
+    '@modern-js/plugin-koa': '@modern-js/plugin-koa/cli',
+    '@modern-js/plugin-nest': '@modern-js/plugin-nest/cli',
+    '@modern-js/plugin-server': '@modern-js/plugin-server/cli',
+    '@modern-js/plugin-garfish': '@modern-js/plugin-garfish/cli',
+    '@modern-js/plugin-tailwindcss': '@modern-js/plugin-tailwindcss/cli',
+    '@modern-js/plugin-polyfill': '@modern-js/plugin-polyfill/cli',
+    // legacy router (inner react-router-dom v5)
+    '@modern-js/plugin-router-legacy': '@modern-js/plugin-router-legacy/cli',
+};
+/**
+ * Internal module-tools plugins that work as soon as they are installed.
+ */
+exports.INTERNAL_MODULE_TOOLS_PLUGINS = {
+    '@modern-js/module-tools': '@modern-js/module-tools/cli',
+    '@modern-js/module-tools-v2': '@modern-js/module-tools-v2',
+    '@modern-js/doc-tools': '@modern-js/doc-tools',
+    '@modern-js/runtime': '@modern-js/runtime/cli',
+    '@modern-js/plugin-testing': '@modern-js/plugin-testing/cli',
+    '@modern-js/plugin-storybook': '@modern-js/plugin-storybook/cli',
+    '@modern-js/plugin-tailwindcss': '@modern-js/plugin-tailwindcss/cli',
+    // TODO: Maybe can remove it
+    '@modern-js/plugin-nocode': '@modern-js/plugin-nocode/cli',
+};
+/**
+ * Internal module-tools plugins that work as soon as they are installed.
+ */
+exports.INTERNAL_MONOREPO_TOOLS_PLUGINS = {
+    '@modern-js/monorepo-tools': '@modern-js/monorepo-tools/cli',
+    '@modern-js/plugin-testing': '@modern-js/plugin-testing/cli',
+};
+/**
+ * Internal module-tools plugins that work as soon as they are installed.
+ */
+exports.INTERNAL_DOC_TOOLS_PLUGINS = {
+    '@modern-js/doc-tools': '@modern-js/doc-tools',
+    '@modern-js/runtime': '@modern-js/runtime/cli',
+    '@modern-js/plugin-testing': '@modern-js/plugin-testing/cli',
+};
 /**
  * Internal plugins that work as soon as they are installed.
  */
@@ -80,6 +135,7 @@ exports.INTERNAL_CLI_PLUGINS = {
     '@modern-js/plugin-koa': '@modern-js/plugin-koa/cli',
     '@modern-js/plugin-nest': '@modern-js/plugin-nest/cli',
     '@modern-js/plugin-server': '@modern-js/plugin-server/cli',
+    '@modern-js/plugin-swc': '@modern-js/plugin-swc',
     '@modern-js/plugin-garfish': '@modern-js/plugin-garfish/cli',
     '@modern-js/plugin-tailwindcss': '@modern-js/plugin-tailwindcss/cli',
     '@modern-js/plugin-polyfill': '@modern-js/plugin-polyfill/cli',
@@ -118,6 +174,12 @@ exports.PLUGIN_SCHEMAS = {
             },
         },
     ],
+    '@modern-js/plugin-swc': [
+        {
+            target: 'tools.swc',
+            schema: { typeof: ['object'] },
+        },
+    ],
     '@modern-js/plugin-bff': [
         {
             target: 'bff',

package/dist/index.d.ts

@@ -38,3 +38,4 @@ export * from './chainId';
 export * from './version';
 export * from './plugin';
 export * from './routes';
+export * from './test-utils';

package/dist/index.js

@@ -54,3 +54,4 @@ __exportStar(require("./chainId"), exports);
 __exportStar(require("./version"), exports);
 __exportStar(require("./plugin"), exports);
 __exportStar(require("./routes"), exports);
+__exportStar(require("./test-utils"), exports);

package/dist/routes.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRouteId = exports.getPathWithoutExt = void 0;
 const path_1 = __importDefault(require("path"));
 const path_2 = require("./path");
+const constants_1 = require("./constants");
 const getPathWithoutExt = (filename) => {
     const extname = path_1.default.extname(filename);
     return filename.slice(0, -extname.length);
@@ -14,7 +15,13 @@ exports.getPathWithoutExt = getPathWithoutExt;
 const getRouteId = (componentPath, routesDir, entryName) => {
     const relativePath = (0, path_2.normalizeToPosixPath)(path_1.default.relative(routesDir, componentPath));
     const pathWithoutExt = (0, exports.getPathWithoutExt)(relativePath);
-    const id = `${entryName}_${pathWithoutExt}`;
+    let id = ``;
+    if (entryName === constants_1.MAIN_ENTRY_NAME) {
+        id = pathWithoutExt;
+    }
+    else {
+        id = `${entryName}_${pathWithoutExt}`;
+    }
     return id;
 };
 exports.getRouteId = getRouteId;

package/dist/test-utils.d.ts

@@ -0,0 +1,5 @@
+/**
+ *
+ * remove the path before "modern.js"
+ */
+export declare const initSnapshotSerializer: (root: string) => void;

package/dist/test-utils.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initSnapshotSerializer = void 0;
+/**
+ *
+ * remove the path before "modern.js"
+ */
+const initSnapshotSerializer = (root) => {
+    expect.addSnapshotSerializer({
+        test: (val) => typeof val === 'string' &&
+            (val.includes('modern.js') ||
+                val.includes('node_modules') ||
+                val.includes(root)),
+        print: (val) => 
+        // eslint-disable-next-line no-nested-ternary
+        typeof val === 'string'
+            ? // eslint-disable-next-line no-nested-ternary
+                val.includes('node_modules')
+                    ? `"${val.replace(/.+node_modules/, ``)}"`
+                    : val.includes('modern.js')
+                        ? `"${val.replace(/.+modern\.js/, ``)}"`
+                        : `"${val.replace(root, '')}"`
+            : val,
+    });
+};
+exports.initSnapshotSerializer = initSnapshotSerializer;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -133,10 +133,10 @@
     "@types/node": "^14",
     "typescript": "^4",
     "jest": "^27",
-    "webpack": "^5.74.0",
-    "@modern-js/types": "2.0.0-beta.2",
-    "@scripts/build": "2.0.0-beta.2",
-    "@scripts/jest-config": "2.0.0-beta.2"
+    "webpack": "^5.75.0",
+    "@modern-js/types": "2.0.0-beta.3",
+    "@scripts/build": "2.0.0-beta.3",
+    "@scripts/jest-config": "2.0.0-beta.3"
   },
   "sideEffects": false,
   "scripts": {

package/compiled/tsconfig-paths/lib/options.d.ts

@@ -1,4 +0,0 @@
-export interface Options {
-    cwd: string;
-}
-export declare const options: Options;