@modern-js/utils 1.8.1 → 1.16.0-alpha.underfin.1

package/dist/chainId.js

@@ -8,6 +8,30 @@ exports.CHAIN_ID = {
         MJS: 'mjs',
         /** Rule for predefined loaders */
         LOADERS: 'loaders',
+        /** Rule for fonts */
+        FONT: 'font',
+        /** Rule for images */
+        IMAGE: 'image',
+        /** Rule for media */
+        MEDIA: 'media',
+        /** Rule for js */
+        JS: 'js',
+        /** Rule for ts */
+        TS: 'ts',
+        /** Rule for css */
+        CSS: 'css',
+        /** Rule for less */
+        LESS: 'less',
+        /** Rule for sass */
+        SASS: 'sass',
+        /** Rule for svg */
+        SVG: 'svg',
+        /** Rule for pug */
+        PUG: 'pug',
+        /** Rule for toml */
+        TOML: 'toml',
+        /** Rule for yaml */
+        YAML: 'yaml',
     },
     /** Predefined rule groups */
     ONE_OF: {
@@ -26,6 +50,7 @@ exports.CHAIN_ID = {
         SASS_MODULES: 'sass-modules',
         SVG: 'svg',
         SVG_URL: 'svg-url',
+        SVG_ASSET: 'svg-asset',
         SVG_INLINE: 'svg-inline',
         ASSETS: 'assets',
         ASSETS_URL: 'assets-url',
@@ -37,8 +62,14 @@ exports.CHAIN_ID = {
         TS: 'ts',
         /** css-loader */
         CSS: 'css',
+        /** sass-loader */
+        SASS: 'sass',
+        /** less-loader */
+        LESS: 'less',
         /** url-loader */
         URL: 'url',
+        /** pug-loader */
+        PUG: 'pug',
         /** file-loader */
         FILE: 'file',
         /** @svgr/webpack */
@@ -51,6 +82,8 @@ exports.CHAIN_ID = {
         HTML: 'html',
         /** babel-loader */
         BABEL: 'babel',
+        /** esbuild-loader */
+        ESBUILD: 'esbuild',
         /** style-loader */
         STYLE: 'style-loader',
         /** postcss-loader */
@@ -92,12 +125,16 @@ exports.CHAIN_ID = {
         BUNDLE_ANALYZER: 'bundle-analyze',
         /** BottomTemplatePlugin */
         BOTTOM_TEMPLATE: 'bottom-template',
+        /** HtmlCrossOriginPlugin */
+        HTML_CROSS_ORIGIN: 'html-cross-origin',
         /** MiniCssExtractPlugin */
         MINI_CSS_EXTRACT: 'mini-css-extract',
         /** ReactFastRefreshPlugin */
         REACT_FAST_REFRESH: 'react-fast-refresh',
         /** ProvidePlugin for node polyfill */
         NODE_POLYFILL_PROVIDE: 'node-polyfill-provide',
+        /** ModuleDependencyErrorPlugin */
+        MODULE_DEPENDENCY_ERROR: 'module-dependency-error',
     },
     /** Predefined minimizers */
     MINIMIZER: {

package/dist/constants.js

@@ -72,7 +72,6 @@ exports.INTERNAL_PLUGINS = {
     '@modern-js/plugin-electron': { cli: '@modern-js/plugin-electron/cli' },
     '@modern-js/plugin-testing': { cli: '@modern-js/plugin-testing/cli' },
     '@modern-js/plugin-storybook': { cli: '@modern-js/plugin-storybook/cli' },
-    '@modern-js/plugin-docsite': { cli: '@modern-js/plugin-docsite/cli' },
     '@modern-js/plugin-express': {
         cli: '@modern-js/plugin-express/cli',
         server: '@modern-js/plugin-express',
@@ -99,25 +98,12 @@ exports.INTERNAL_PLUGINS = {
         cli: '@modern-js/plugin-garfish/cli',
     },
     '@modern-js/plugin-tailwindcss': { cli: '@modern-js/plugin-tailwindcss/cli' },
-    '@modern-js/plugin-lambda-fc': { cli: '@modern-js/plugin-lambda-fc/cli' },
-    '@modern-js/plugin-lambda-scf': { cli: '@modern-js/plugin-lambda-scf/cli' },
-    '@modern-js/plugin-cdn-oss': { cli: '@modern-js/plugin-cdn-oss/cli' },
-    '@modern-js/plugin-cdn-cos': { cli: '@modern-js/plugin-cdn-cos/cli' },
-    '@modern-js/plugin-static-hosting': {
-        cli: '@modern-js/plugin-static-hosting/cli',
-    },
     '@modern-js/plugin-polyfill': {
         cli: '@modern-js/plugin-polyfill/cli',
         server: '@modern-js/plugin-polyfill',
     },
-    '@modern-js/plugin-multiprocess': {
-        cli: '@modern-js/plugin-multiprocess/cli',
-    },
     // TODO: Maybe can remove it
     '@modern-js/plugin-nocode': { cli: '@modern-js/plugin-nocode/cli' },
-    '@modern-js/plugin-design-token': {
-        cli: '@modern-js/plugin-design-token/cli',
-    },
 };
 /**
  * The schema registered in the plugin.

package/dist/format.d.ts

@@ -5,12 +5,9 @@
  * LICENSE file at
  * https://github.com/facebook/create-react-app/blob/master/LICENSE
  */
-import { StatsCompilation } from 'webpack';
-import type { ProxyDetail, BffProxyOptions } from '@modern-js/types';
+import type { StatsCompilation } from 'webpack';
 declare function formatWebpackMessages(json: StatsCompilation): {
     errors: string[];
     warnings: string[];
 };
 export { formatWebpackMessages };
-declare function formatProxyOptions(proxyOptions: BffProxyOptions): ProxyDetail[];
-export { formatProxyOptions };

package/dist/format.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable no-param-reassign */
 /**
  * Copyright (c) 2015-present, Facebook, Inc.
  *
@@ -8,23 +7,27 @@
  * https://github.com/facebook/create-react-app/blob/master/LICENSE
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatProxyOptions = exports.formatWebpackMessages = void 0;
-const friendlySyntaxErrorLabel = 'Syntax error:';
+exports.formatWebpackMessages = void 0;
+const friendlySyntaxErrorLabel = 'SyntaxError:';
 function isLikelyASyntaxError(message) {
     return message.includes(friendlySyntaxErrorLabel);
 }
 // Cleans up webpack error messages.
-function formatMessage(message) {
-    var _a;
+function formatMessage(stats) {
     let lines = [];
+    let message;
     // webpack 5 stats error object
-    if (typeof message === 'object') {
-        message = `${(message.moduleName && `${message.moduleName}\n`)}${message.details || message.stack || message.message}`;
+    if (typeof stats === 'object') {
+        const fileName = stats.moduleName ? `File: ${stats.moduleName}\n` : '';
+        const mainMessage = stats.message;
+        const details = stats.details ? `\nDetails: ${stats.details}\n` : '';
+        const stack = stats.stack ? `\n${stats.stack}` : '';
+        message = `${fileName}${mainMessage}${details}${stack}`;
+    }
+    else {
+        message = stats;
     }
     lines = message.split('\n');
-    // Strip webpack-added headers off errors/warnings
-    // https://github.com/webpack/webpack/blob/master/lib/ModuleError.js
-    lines = lines.filter(line => !/Module [A-z ]+\(from/.test(line));
     // Transform parsing error into syntax error
     lines = lines.map(line => {
         const parsingError = /Line (\d+):(?:(\d+):)?\s*Parsing error: (.+)$/.exec(line);
@@ -45,15 +48,8 @@ function formatMessage(message) {
     // Clean up file name
     lines[0] = lines[0].replace(/^(.*) \d+:\d+-\d+$/, '$1');
     // Cleans up verbose "module not found" messages for files and packages.
-    if ((_a = lines[1]) === null || _a === void 0 ? void 0 : _a.startsWith('Module not found: ')) {
-        lines = [
-            lines[0],
-            lines[1]
-                .replace('Error: ', '')
-                .replace('Module not found: Cannot find file:', 'Cannot find file:')
-                .replace('[CaseSensitivePathsPlugin] ', '')
-                .replace("Cannot resolve 'file' or 'directory' ", ''),
-        ];
+    if (lines[1] && lines[1].indexOf('Module not found:') !== -1) {
+        lines[1] = lines[1].replace('Error: ', '');
     }
     message = lines.join('\n');
     // Internal stacks are generally useless so we strip them... with the
@@ -90,29 +86,3 @@ function formatWebpackMessages(json) {
     return result;
 }
 exports.formatWebpackMessages = formatWebpackMessages;
-/* eslint-enable no-param-reassign */
-function formatProxyOptions(proxyOptions) {
-    const formattedProxy = [];
-    if (!Array.isArray(proxyOptions)) {
-        if ('target' in proxyOptions) {
-            formattedProxy.push(proxyOptions);
-        }
-        else {
-            Array.prototype.push.apply(formattedProxy, Object.keys(proxyOptions).reduce((total, source) => {
-                const option = proxyOptions[source];
-                total.push({
-                    context: source,
-                    changeOrigin: true,
-                    logLevel: 'warn',
-                    ...(typeof option === 'string' ? { target: option } : option),
-                });
-                return total;
-            }, []));
-        }
-    }
-    else {
-        formattedProxy.push(...proxyOptions);
-    }
-    return formattedProxy;
-}
-exports.formatProxyOptions = formatProxyOptions;

package/dist/index.d.ts

@@ -34,3 +34,4 @@ export * from './ssr';
 export * from './tryResolve';
 export * from './analyzeProject';
 export * from './chainId';
+export * from './reactVersion';

package/dist/index.js

@@ -50,3 +50,4 @@ __exportStar(require("./ssr"), exports);
 __exportStar(require("./tryResolve"), exports);
 __exportStar(require("./analyzeProject"), exports);
 __exportStar(require("./chainId"), exports);
+__exportStar(require("./reactVersion"), exports);

package/dist/prettyInstructions.d.ts

@@ -5,5 +5,9 @@ interface EntryPoint {
 }
 export declare const isSingleEntry: (entrypoints: EntryPoint[]) => boolean;
 export declare const getIpv4Interfaces: () => os.NetworkInterfaceInfo[];
+export declare const getAddressUrls: (protocol: string | undefined, port: number) => {
+    type: string;
+    url: string;
+}[];
 export declare const prettyInstructions: (appContext: any, config: any) => string;
 export {};

package/dist/prettyInstructions.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prettyInstructions = exports.getIpv4Interfaces = exports.isSingleEntry = void 0;
+exports.prettyInstructions = exports.getAddressUrls = exports.getIpv4Interfaces = exports.isSingleEntry = void 0;
 const os_1 = __importDefault(require("os"));
 const compiled_1 = require("./compiled");
 const is_1 = require("./is");
@@ -39,9 +39,10 @@ const getAddressUrls = (protocol = 'http', port) => {
         return memo;
     }, []);
 };
+exports.getAddressUrls = getAddressUrls;
 const prettyInstructions = (appContext, config) => {
     const { entrypoints, serverRoutes, port, apiOnly, checkedEntries } = appContext;
-    const urls = getAddressUrls(config.dev.https && (0, is_1.isDev)() ? 'https' : 'http', port);
+    const urls = (0, exports.getAddressUrls)(config.dev.https && (0, is_1.isDev)() ? 'https' : 'http', port);
     const routes = !apiOnly
         ? serverRoutes.filter(route => route.entryName)
         : serverRoutes;

package/dist/reactVersion.d.ts

@@ -0,0 +1 @@
+export declare const isReact18: (cwd: string) => boolean;

package/dist/reactVersion.js

@@ -0,0 +1,24 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isReact18 = void 0;
+const path_1 = __importDefault(require("path"));
+const compiled_1 = require("./compiled");
+const isReact18 = (cwd) => {
+    const pkgPath = path_1.default.join(cwd, 'package.json');
+    if (!compiled_1.fs.existsSync(pkgPath)) {
+        return false;
+    }
+    const pkgInfo = JSON.parse(compiled_1.fs.readFileSync(pkgPath, 'utf8'));
+    const deps = {
+        ...pkgInfo.devDependencies,
+        ...pkgInfo.dependencies,
+    };
+    if (typeof deps.react !== 'string') {
+        return false;
+    }
+    return compiled_1.semver.satisfies(compiled_1.semver.minVersion(deps.react), '>=18.0.0');
+};
+exports.isReact18 = isReact18;

package/dist/runtimeExports.d.ts

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

package/dist/runtimeExports.js

@@ -20,9 +20,8 @@ const memo = (fn) => {
         return res;
     };
 };
-exports.createRuntimeExportsUtils = memo((pwd = '', namespace, ts = false) => {
-    const entryExportFile = path_1.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`);
-    const entryExportTsFile = path_1.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.d.ts` : 'index.d.ts'}`);
+exports.createRuntimeExportsUtils = memo((pwd = '', namespace = 'index') => {
+    const entryExportFile = path_1.default.join(pwd, `.runtime-exports/${namespace}.js`);
     // const ensure = () => {
     //   if (!fs.existsSync(entryExportFile)) {
     //     fs.outputFileSync(entryExportFile, '');
@@ -34,11 +33,8 @@ exports.createRuntimeExportsUtils = memo((pwd = '', namespace, ts = false) => {
         statement = (0, path_2.normalizeOutputPath)(statement);
         try {
             compiled_1.fs.ensureFileSync(entryExportFile);
-            compiled_1.fs.ensureFileSync(entryExportTsFile);
             if (!compiled_1.fs.readFileSync(entryExportFile, 'utf8').includes(statement)) {
                 compiled_1.fs.appendFileSync(entryExportFile, `${statement}\n`);
-                ts &&
-                    compiled_1.fs.appendFileSync(entryExportTsFile, `${statement.replace('.js', '.d')}\n`);
             }
         }
         catch {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.8.1",
+  "version": "1.16.0-alpha.underfin.001",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -23,19 +23,25 @@
     "./format": "./dist/format.js",
     "./constants": "./dist/constants.js",
     "./ssr": "./dist/ssr.js",
+    "./ajv": "./compiled/ajv/index.js",
     "./glob": "./compiled/glob/index.js",
     "./chalk": "./compiled/chalk/index.js",
     "./json5": "./compiled/json5/index.js",
     "./semver": "./compiled/semver/index.js",
     "./lodash": "./compiled/lodash/index.js",
     "./globby": "./compiled/globby/index.js",
+    "./fs-extra": "./compiled/fs-extra/index.js",
     "./fast-glob": "./compiled/fast-glob/index.js",
     "./gzip-size": "./compiled/gzip-size/index.js",
     "./mime-types": "./compiled/mime-types/index.js",
     "./strip-ansi": "./compiled/strip-ansi/index.js",
+    "./ajv-keywords": "./compiled/ajv-keywords/index.js",
     "./browserslist": "./compiled/browserslist/index.js",
     "./webpack-chain": "./compiled/webpack-chain/index.js",
-    "./tsconfig-paths": "./compiled/tsconfig-paths/index.js"
+    "./tsconfig-paths": "./compiled/tsconfig-paths/index.js",
+    "./better-ajv-errors": "./compiled/better-ajv-errors/index.js",
+    "./webpack-dev-middleware": "./compiled/webpack-dev-middleware/index.js",
+    "./chain-id": "./dist/chainId.js"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -52,6 +58,12 @@
       "ssr": [
         "./dist/ssr.d.ts"
       ],
+      "ajv": [
+        "./compiled/ajv/types/ajv.d.ts"
+      ],
+      "ajv/json-schema": [
+        "./compiled/ajv/types/types/json-schema.d.ts"
+      ],
       "glob": [
         "./compiled/glob/index.d.ts"
       ],
@@ -70,6 +82,9 @@
       "globby": [
         "./compiled/globby/index.d.ts"
       ],
+      "fs-extra": [
+        "./compiled/fs-extra/index.d.ts"
+      ],
       "fast-glob": [
         "./compiled/fast-glob/index.d.ts"
       ],
@@ -82,6 +97,9 @@
       "strip-ansi": [
         "./compiled/strip-ansi/index.d.ts"
       ],
+      "ajv-keywords": [
+        "./compiled/ajv-keywords/index.d.ts"
+      ],
       "browserslist": [
         "./compiled/browserslist/index.d.ts"
       ],
@@ -90,6 +108,15 @@
       ],
       "tsconfig-paths": [
         "./compiled/tsconfig-paths/lib/index.d.ts"
+      ],
+      "better-ajv-errors": [
+        "./compiled/better-ajv-errors/index.d.ts"
+      ],
+      "webpack-dev-middleware": [
+        "./compiled/webpack-dev-middleware/types/index.d.ts"
+      ],
+      "chain-id": [
+        "./dist/chainId.d.ts"
       ]
     }
   },
@@ -98,9 +125,9 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@modern-js/types": "1.6.2",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0",
+    "@modern-js/types": "1.16.0",
+    "@scripts/build": "1.15.0",
+    "@scripts/jest-config": "1.15.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "typescript": "^4",