@modern-js/utils 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @modern-js/utils
 
+## 1.1.2
+
+### Patch Changes
+
+- 0fa83663: support more .env files
+- f594fbc8: fix apple icon and favicon support
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/js/modern/constants.js

@@ -17,6 +17,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
  */

package/dist/js/modern/getEntryOptions.js

@@ -5,11 +5,20 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 import { isPlainObject } from "./is";
-export const getEntryOptions = (name, baseOptions, optionsByEntries) => {
+import { MAIN_ENTRY_NAME } from "./constants";
+export const getEntryOptions = (name, baseOptions, optionsByEntries, packageName) => {
   if (optionsByEntries) {
-    // eslint-disable-next-line no-nested-ternary
-    return optionsByEntries.hasOwnProperty(name) ? isPlainObject(optionsByEntries[name]) && isPlainObject(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntries[name]) : optionsByEntries[name] : baseOptions;
+    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 optionsByEntry !== undefined ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntry) : optionsByEntry : baseOptions;
   } else {
     return baseOptions;
   }
-};
+};
+
+const getOptionsByEntryName = (name, optionsByEntries) => optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : undefined;

package/dist/js/modern/is/type.js

@@ -22,4 +22,7 @@ export function isPromise(obj) {
   /* eslint-disable promise/prefer-await-to-then */
   return Boolean(obj) && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
   /* eslint-enable promise/prefer-await-to-then */
+}
+export function isRegExp(obj) {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
 }

package/dist/js/modern/runtimeExports.js

@@ -18,7 +18,7 @@ const memo = fn => {
   };
 };
 
-export const createRuntimeExportsUtils = memo((pwd, namespace) => {
+export const createRuntimeExportsUtils = memo((pwd = '', namespace) => {
   const entryExportFile = path.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`); // const ensure = () => {
   //   if (!fs.existsSync(entryExportFile)) {
   //     fs.outputFileSync(entryExportFile, '');

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.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.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;
 
 /**
  * alias to src directory
@@ -28,10 +28,16 @@ const HMR_SOCK_PATH = '/_modern_js_hmr_ws';
 exports.HMR_SOCK_PATH = HMR_SOCK_PATH;
 const ROUTE_SPEC_FILE = 'route.json';
 /**
- * open editor request path
+ * main entry name
  */
 
 exports.ROUTE_SPEC_FILE = ROUTE_SPEC_FILE;
+const MAIN_ENTRY_NAME = 'main';
+/**
+ * open editor request path
+ */
+
+exports.MAIN_ENTRY_NAME = MAIN_ENTRY_NAME;
 const LAUNCH_EDITOR_ENDPOINT = '/__open-stack-frame-in-editor';
 /**
  * server side bundles directory, which relative to dist.

package/dist/js/node/getEntryOptions.js

@@ -7,19 +7,29 @@ exports.getEntryOptions = void 0;
 
 var _is = require("./is");
 
+var _constants = require("./constants");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 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; }
 
-const getEntryOptions = (name, baseOptions, optionsByEntries) => {
+const getEntryOptions = (name, baseOptions, optionsByEntries, packageName) => {
   if (optionsByEntries) {
-    // eslint-disable-next-line no-nested-ternary
-    return optionsByEntries.hasOwnProperty(name) ? (0, _is.isPlainObject)(optionsByEntries[name]) && (0, _is.isPlainObject)(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntries[name]) : optionsByEntries[name] : baseOptions;
+    let optionsByEntry = getOptionsByEntryName(name, optionsByEntries); // compatible with main entry using packageName as the key
+
+    if (optionsByEntry === undefined && name === _constants.MAIN_ENTRY_NAME && packageName) {
+      optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
+    } // eslint-disable-next-line no-nested-ternary
+
+
+    return optionsByEntry !== undefined ? (0, _is.isPlainObject)(optionsByEntry) && (0, _is.isPlainObject)(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntry) : optionsByEntry : baseOptions;
   } else {
     return baseOptions;
   }
 };
 
-exports.getEntryOptions = getEntryOptions;
+exports.getEntryOptions = getEntryOptions;
+
+const getOptionsByEntryName = (name, optionsByEntries) => optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : undefined;

package/dist/js/node/is/type.js

@@ -8,6 +8,7 @@ exports.isFunction = isFunction;
 exports.isObject = isObject;
 exports.isPlainObject = isPlainObject;
 exports.isPromise = isPromise;
+exports.isRegExp = isRegExp;
 exports.isString = isString;
 exports.isUndefined = isUndefined;
 
@@ -41,4 +42,8 @@ function isPromise(obj) {
   /* eslint-disable promise/prefer-await-to-then */
   return Boolean(obj) && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
   /* eslint-enable promise/prefer-await-to-then */
+}
+
+function isRegExp(obj) {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
 }

package/dist/js/node/runtimeExports.js

@@ -29,7 +29,7 @@ const memo = fn => {
   };
 };
 
-const createRuntimeExportsUtils = memo((pwd, namespace) => {
+const createRuntimeExportsUtils = memo((pwd = '', namespace) => {
   const entryExportFile = _path.default.join(pwd, `.runtime-exports/${namespace ? `${namespace}.js` : 'index.js'}`); // const ensure = () => {
   //   if (!fs.existsSync(entryExportFile)) {
   //     fs.outputFileSync(entryExportFile, '');

package/dist/js/treeshaking/constants.js

@@ -19,6 +19,11 @@ export var HMR_SOCK_PATH = '/_modern_js_hmr_ws';
  */
 
 export var ROUTE_SPEC_FILE = 'route.json';
+/**
+ * main entry name
+ */
+
+export var MAIN_ENTRY_NAME = 'main';
 /**
  * open editor request path
  */

package/dist/js/treeshaking/getEntryOptions.js

@@ -5,11 +5,22 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 import { isPlainObject } from "./is";
-export var getEntryOptions = function getEntryOptions(name, baseOptions, optionsByEntries) {
+import { MAIN_ENTRY_NAME } from "./constants";
+export var getEntryOptions = function getEntryOptions(name, baseOptions, optionsByEntries, packageName) {
   if (optionsByEntries) {
-    // eslint-disable-next-line no-nested-ternary
-    return optionsByEntries.hasOwnProperty(name) ? isPlainObject(optionsByEntries[name]) && isPlainObject(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntries[name]) : optionsByEntries[name] : baseOptions;
+    var 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 optionsByEntry !== undefined ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions) ? _objectSpread(_objectSpread({}, baseOptions), optionsByEntry) : optionsByEntry : baseOptions;
   } else {
     return baseOptions;
   }
+};
+
+var getOptionsByEntryName = function getOptionsByEntryName(name, optionsByEntries) {
+  return optionsByEntries.hasOwnProperty(name) ? optionsByEntries[name] : undefined;
 };

package/dist/js/treeshaking/is/type.js

@@ -24,4 +24,7 @@ export function isPromise(obj) {
   /* eslint-disable promise/prefer-await-to-then */
   return Boolean(obj) && (_typeof(obj) === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
   /* eslint-enable promise/prefer-await-to-then */
+}
+export function isRegExp(obj) {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
 }

package/dist/js/treeshaking/runtimeExports.js

@@ -22,7 +22,9 @@ var memo = function memo(fn) {
   };
 };
 
-export var createRuntimeExportsUtils = memo(function (pwd, namespace) {
+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 = () => {
   //   if (!fs.existsSync(entryExportFile)) {
   //     fs.outputFileSync(entryExportFile, '');

package/dist/types/constants.d.ts

@@ -17,6 +17,11 @@ export declare const HMR_SOCK_PATH = "/_modern_js_hmr_ws";
  */
 
 export declare const ROUTE_SPEC_FILE = "route.json";
+/**
+ * main entry name
+ */
+
+export declare const MAIN_ENTRY_NAME = "main";
 /**
  * open editor request path
  */

package/dist/types/getEntryOptions.d.ts

@@ -1 +1 @@
-export declare const getEntryOptions: <T>(name: string, baseOptions?: T | undefined, optionsByEntries?: Record<string, T> | undefined) => T | undefined;
+export declare const getEntryOptions: <T>(name: string, baseOptions?: T | undefined, optionsByEntries?: Record<string, T> | undefined, packageName?: string | undefined) => T | undefined;

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/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.1.1",
+  "version": "1.1.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",

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
  */

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/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/runtimeExports.ts

@@ -20,38 +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) => {
-      // 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:
+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/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',