@modern-js/utils 1.0.0 → 1.1.2

package/dist/types/index.d.ts

@@ -1,5 +1,4 @@
 export * as fs from 'fs-extra';
-export * as upath from 'upath';
 export * from './chalk';
 export * from './formatWebpackMessages';
 export * from './FileSizeReporter';
@@ -23,8 +22,7 @@ export * from './monorepo';
 export * from './getPackageManager';
 export * from './runtimeExports';
 export * from './readTsConfig';
-export { isRelativePath } from './path';
-export * as path from './path';
+export * from './path';
 export * from './generateMetaTags';
 export * from './prettyInstructions';
 export * from './alias';

package/dist/types/is/type.d.ts

@@ -4,4 +4,5 @@ export declare function isArray(obj: any): obj is any[];
 export declare function isFunction(func: any): func is Function;
 export declare function isObject(obj: any): obj is object;
 export declare function isPlainObject(obj: any): obj is Record<string, any>;
-export declare function isPromise(obj: any): obj is Promise<any>;
+export declare function isPromise(obj: any): obj is Promise<any>;
+export declare function isRegExp(obj: any): obj is RegExp;

package/dist/types/monorepo.d.ts

@@ -1,4 +1,4 @@
-import * as path from './path';
+import path from 'path';
 export declare const isLerna: (root: string) => boolean;
 export declare const isYarnWorkspaces: (root: string) => boolean;
 export declare const isPnpmWorkspaces: (root: string) => boolean;

package/dist/types/path.d.ts

@@ -1,12 +1,3 @@
-/// <reference types="node" />
-import path from 'path';
 export declare const isRelativePath: (test: string) => boolean;
-export declare const join: (...paths: string[]) => string;
-export declare const resolve: (...paths: string[]) => string;
-export declare const relative: (from: string, to: string) => string;
-export declare const basename: (p: string, ext?: string | undefined) => string;
-export declare const dirname: (p: string) => string;
-export declare const extname: (p: string) => string;
-export declare const isAbsolute: (p: string) => boolean;
-export declare const normalize: (p: string) => string;
-export declare const sep: string, win32: path.PlatformPath, posix: path.PlatformPath;
+export declare const normalizeOutputPath: (s: string) => string;
+export declare const normalizeToPosixPath: (p: string) => string;

package/dist/types/prettyInstructions.d.ts

@@ -1 +1,6 @@
-export declare const prettyInstructions: (appContext: any, config: any) => string;
+interface EntryPoint {
+  entryName: string;
+}
+export declare const isSingleEntry: (entrypoints: EntryPoint[]) => boolean;
+export declare const prettyInstructions: (appContext: any, config: any) => string;
+export {};

package/dist/types/runtimeExports.d.ts

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

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.0",
+  "version": "1.1.2",
   "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.0.0",
-    "@modern-js/module-tools": "^1.0.0"
+    "@modern-js/plugin-testing": "^1.1.0",
+    "@modern-js/module-tools": "^1.1.0"
   },
   "peerDependencies": {
     "typescript": "^4.4.3"

package/src/FileSizeReporter.ts

@@ -12,13 +12,13 @@
 'use strict';
 
 import fs from 'fs';
-import * as path from './path';
+import path from 'path';
 import chalk from 'chalk';
 import filesize from 'filesize';
 import recursive from 'recursive-readdir';
 import stripAnsi from 'strip-ansi';
 import gzipSize from 'gzip-size';
-import { logger } from '.';
+import { logger } from './logger';
 
 
 function canReadAsset(asset:string) {

package/src/alias.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
+import path from 'path';
 import chalk from 'chalk';
-import * as path from './path';
 import { readTsConfigByFile } from './readTsConfig';
 import { applyOptionsChain } from './applyOptionsChain';
 

package/src/applyOptionsChain.ts

@@ -1,4 +1,5 @@
-import { isFunction, logger, isPlainObject } from '.';
+// eslint-disable-next-line import/no-useless-path-segments
+import { isFunction, logger, isPlainObject } from './index';
 
 export const applyOptionsChain = <T, U>(
   defaults: T,

package/src/constants.ts

@@ -18,6 +18,11 @@ export const HMR_SOCK_PATH = '/_modern_js_hmr_ws';
  */
 export const ROUTE_SPEC_FILE = 'route.json';
 
+/**
+ * main entry name
+ */
+export const MAIN_ENTRY_NAME = 'main';
+
 /**
  * open editor request path
  */
@@ -91,6 +96,14 @@ export const INTERNAL_PLUGINS: {
   },
   '@modern-js/plugin-jarvis': { cli: '@modern-js/plugin-jarvis/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': { server: '@modern-js/plugin-polyfill' },
 };
 
 /**
@@ -175,7 +188,13 @@ export const PLUGIN_SCHEMAS = {
   '@modern-js/plugin-ssg': [
     {
       target: 'output.ssg',
-      schema: { oneOf: [{ type: 'boolean' }, { instanceof: 'Function' }] },
+      schema: {
+        oneOf: [
+          { type: 'boolean' },
+          { type: 'object' },
+          { instanceof: 'Function' },
+        ],
+      },
     },
   ],
   '@modern-js/plugin-ssr': [

package/src/ensureAbsolutePath.ts

@@ -1,4 +1,4 @@
-import * as path from './path';
+import path from 'path';
 
 /**
  * ensure absolute file path.

package/src/getEntryOptions.ts

@@ -1,18 +1,37 @@
 import { isPlainObject } from './is';
+import { MAIN_ENTRY_NAME } from './constants';
 
 export const getEntryOptions = <T>(
   name: string,
   baseOptions?: T,
   optionsByEntries?: Record<string, T>,
+  packageName?: string,
 ) => {
   if (optionsByEntries) {
+    let optionsByEntry = getOptionsByEntryName(name, optionsByEntries);
+
+    // compatible with main entry using packageName as the key
+    if (
+      optionsByEntry === undefined &&
+      name === MAIN_ENTRY_NAME &&
+      packageName
+    ) {
+      optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
+    }
+
     // eslint-disable-next-line no-nested-ternary
-    return optionsByEntries.hasOwnProperty(name)
-      ? isPlainObject(optionsByEntries[name]) && isPlainObject(baseOptions)
-        ? { ...baseOptions, ...optionsByEntries[name] }
-        : optionsByEntries[name]
+    return optionsByEntry !== undefined
+      ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions)
+        ? { ...baseOptions, ...optionsByEntry }
+        : optionsByEntry
       : baseOptions;
   } else {
     return baseOptions;
   }
 };
+
+const getOptionsByEntryName = <T>(
+  name: string,
+  optionsByEntries: Record<string, T>,
+) =>
+  optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : undefined;

package/src/getPackageManager.ts

@@ -1,6 +1,6 @@
 import os from 'os';
+import path from 'path';
 import fs from 'fs-extra';
-import * as path from './path';
 
 export function getPackageManager(cwd: string = process.cwd()) {
   let appDirectory = cwd;

package/src/index.ts

@@ -1,5 +1,4 @@
 export * as fs from 'fs-extra';
-export * as upath from 'upath';
 export * from './chalk';
 export * from './formatWebpackMessages';
 export * from './FileSizeReporter';
@@ -23,8 +22,7 @@ export * from './monorepo';
 export * from './getPackageManager';
 export * from './runtimeExports';
 export * from './readTsConfig';
-export { isRelativePath } from './path';
-export * as path from './path';
+export * from './path';
 export * from './generateMetaTags';
 export * from './prettyInstructions';
 export * from './alias';

package/src/is/index.ts

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import * as path from '../path';
+import path from 'path';
 import { isDev } from './node-env';
 
 /**

package/src/is/type.ts

@@ -37,3 +37,7 @@ export function isPromise(obj: any): obj is Promise<any> {
   );
   /* eslint-enable promise/prefer-await-to-then */
 }
+
+export function isRegExp(obj: any): obj is RegExp {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
+}

package/src/monorepo.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
+import path from 'path';
 import glob from 'glob';
 import yaml from 'yaml';
-import * as path from './path';
 
 const PACKAGE_MAX_DEPTH = 5;
 

package/src/path.ts

@@ -4,24 +4,6 @@ import upath from 'upath';
 export const isRelativePath = (test: string): boolean =>
   /^\.\.?($|[\\/])/.test(test);
 
-export const join = (...paths: string[]) =>
-  upath.normalizeSafe(path.join(...paths));
-
-export const resolve = (...paths: string[]) =>
-  upath.normalizeSafe(path.resolve(...paths));
-
-export const relative = (from: string, to: string) =>
-  upath.normalizeSafe(path.relative(from, to));
-
-export const basename = (p: string, ext?: string) =>
-  upath.normalizeSafe(path.basename(p, ext));
-
-export const dirname = (p: string) => upath.normalizeSafe(path.dirname(p));
-
-export const extname = (p: string) => path.extname(p);
-
-export const isAbsolute = (p: string) => path.isAbsolute(p);
-
-export const normalize = (p: string) => upath.normalizeSafe(path.normalize(p));
-
-export const { sep, win32, posix } = path;
+export const normalizeOutputPath = (s: string) => s.replace(/\\/g, '\\\\');
+export const normalizeToPosixPath = (p: string) =>
+  upath.normalizeSafe(path.normalize(p));

package/src/prettyInstructions.ts

@@ -14,7 +14,7 @@ interface ServerRoute {
 }
 
 // TODO: remove hard code 'main'
-const isSPA = (entrypoints: EntryPoint[]) =>
+export const isSingleEntry = (entrypoints: EntryPoint[]) =>
   entrypoints.length === 1 && entrypoints[0].entryName === 'main';
 
 const normalizeUrl = (url: string) => url.replace(/([^:]\/)\/+/g, '$1');
@@ -62,7 +62,7 @@ export const prettyInstructions = (appContext: any, config: any) => {
 
   let message = 'App running at:\n\n';
 
-  if (isSPA(entrypoints)) {
+  if (isSingleEntry(entrypoints)) {
     message += urls
       .map(
         ({ type, url }) =>

package/src/readTsConfig.ts

@@ -1,4 +1,4 @@
-import * as path from './path';
+import path from 'path';
 
 export const readTsConfig = (root: string) => {
   // import typescript from 'typescript' cause eslint fromat error.

package/src/runtimeExports.ts

@@ -1,5 +1,6 @@
+import path from 'path';
 import fs from 'fs-extra';
-import * as path from './path';
+import { normalizeOutputPath } from './path';
 
 const memo = <T extends (...args: any[]) => any>(fn: T) => {
   const cache = new Map();
@@ -19,36 +20,36 @@ const memo = <T extends (...args: any[]) => any>(fn: T) => {
   };
 };
 
-export const createRuntimeExportsUtils = memo(
-  (pwd: string, 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) => {
-      try {
-        fs.ensureFileSync(entryExportFile);
-        if (!fs.readFileSync(entryExportFile, 'utf8').includes(statement)) {
-          fs.appendFileSync(entryExportFile, `${statement}\n`);
-        }
-      } catch {
-        // FIXME:
+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`);
       }
-    };
+    } catch {
+      // FIXME:
+    }
+  };
 
-    const getPath = () => entryExportFile;
+  const getPath = () => entryExportFile;
 
-    return {
-      addExport,
-      getPath,
-    };
-  },
-);
+  return {
+    addExport,
+    getPath,
+  };
+});

package/tests/.eslintrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  extends: ['@modern-js'],
+  parserOptions: {
+    project: require.resolve('./tsconfig.json'),
+  },
+};

package/tests/compatRequire.test.ts

@@ -1,4 +1,4 @@
-import { path } from '@/index';
+import path from 'path';
 import { compatRequire } from '@/compatRequire';
 
 describe('compat require', () => {

package/tests/ensureAbsolutePath.test.ts

@@ -1,13 +1,16 @@
+import path from 'path';
 import { ensureAbsolutePath } from '@/ensureAbsolutePath';
 
 describe('ensure absolute file path', () => {
   test('should return filePath directly', () => {
-    expect(ensureAbsolutePath('/a/b', '/a/b/c/d/e.jsx')).toEqual(
-      '/a/b/c/d/e.jsx',
-    );
+    expect(
+      path.isAbsolute(ensureAbsolutePath('/a/b', '/a/b/c/d/e.jsx')),
+    ).toBeTruthy();
   });
 
   test(`should resolve absolute path`, () => {
-    expect(ensureAbsolutePath('/a/b', 'c/d/e.jsx')).toEqual('/a/b/c/d/e.jsx');
+    expect(
+      path.isAbsolute(ensureAbsolutePath('/a/b', 'c/d/e.jsx')),
+    ).toBeTruthy();
   });
 });

package/tests/findExists.test.ts

@@ -1,4 +1,4 @@
-import { path } from '@/index';
+import path from 'path';
 import { findExists } from '@/findExists';
 
 describe('find first exists file', () => {

package/tests/getBrowserslist.test.ts

@@ -1,4 +1,4 @@
-import { path } from '@/index';
+import path from 'path';
 import { getBrowserslist, defaults } from '@/getBrowserslist';
 
 describe('get browserslist', () => {

package/tests/getEntryOptions.test.ts

@@ -15,6 +15,17 @@ describe('get entry options', () => {
     ).toEqual('a');
   });
 
+  test(`should compatible with main entry using packageName as key`, () => {
+    expect(
+      getEntryOptions(
+        'main',
+        'default value',
+        { 'package-name': 'a' },
+        'package-name',
+      ),
+    ).toEqual('a');
+  });
+
   expect(
     getEntryOptions(
       'page-a',