@modern-js/utils 1.3.4 → 1.3.7

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @modern-js/utils
 
+## 1.3.7
+
+### Patch Changes
+
+- 132f7b53: feat: move config declarations to @modern-js/core
+
+## 1.3.6
+
+### Patch Changes
+
+- c2046f37: fix: plugin unbundle schema define
+
+## 1.3.5
+
+### Patch Changes
+
+- 5bf5868d: fix: isObject should return false when input is null
+
 ## 1.3.4
 
 ### Patch Changes

package/dist/js/modern/constants.js

@@ -233,12 +233,7 @@ export const PLUGIN_SCHEMAS = {
     }
   }],
   '@modern-js/plugin-unbundle': [{
-    target: 'source.disableAutoImportStyle',
-    schema: {
-      type: 'boolean'
-    }
-  }, {
-    target: 'server.https',
+    target: 'output.disableAutoImportStyle',
     schema: {
       type: 'boolean'
     }

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

@@ -5,23 +5,20 @@ export function isUndefined(obj) {
   return typeof obj === 'undefined';
 }
 export function isArray(obj) {
-  return Object.prototype.toString.call(obj) === '[object Array]';
+  return Array.isArray(obj);
 } // eslint-disable-next-line @typescript-eslint/ban-types
 
 export function isFunction(func) {
   return typeof func === 'function';
-} // eslint-disable-next-line @typescript-eslint/ban-types
-
+}
 export function isObject(obj) {
-  return typeof obj === 'object';
+  return obj !== null && typeof obj === 'object';
 }
 export function isPlainObject(obj) {
-  return obj && typeof obj === 'object' && Object.prototype.toString.call(obj) === '[object Object]';
+  return isObject(obj) && Object.prototype.toString.call(obj) === '[object Object]';
 }
 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/node/constants.js

@@ -252,12 +252,7 @@ const PLUGIN_SCHEMAS = {
     }
   }],
   '@modern-js/plugin-unbundle': [{
-    target: 'source.disableAutoImportStyle',
-    schema: {
-      type: 'boolean'
-    }
-  }, {
-    target: 'server.https',
+    target: 'output.disableAutoImportStyle',
     schema: {
       type: 'boolean'
     }

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

@@ -21,27 +21,24 @@ function isUndefined(obj) {
 }
 
 function isArray(obj) {
-  return Object.prototype.toString.call(obj) === '[object Array]';
+  return Array.isArray(obj);
 } // eslint-disable-next-line @typescript-eslint/ban-types
 
 
 function isFunction(func) {
   return typeof func === 'function';
-} // eslint-disable-next-line @typescript-eslint/ban-types
-
+}
 
 function isObject(obj) {
-  return typeof obj === 'object';
+  return obj !== null && typeof obj === 'object';
 }
 
 function isPlainObject(obj) {
-  return obj && typeof obj === 'object' && Object.prototype.toString.call(obj) === '[object Object]';
+  return isObject(obj) && Object.prototype.toString.call(obj) === '[object Object]';
 }
 
 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) {

package/dist/js/treeshaking/constants.js

@@ -233,12 +233,7 @@ export var PLUGIN_SCHEMAS = {
     }
   }],
   '@modern-js/plugin-unbundle': [{
-    target: 'source.disableAutoImportStyle',
-    schema: {
-      type: 'boolean'
-    }
-  }, {
-    target: 'server.https',
+    target: 'output.disableAutoImportStyle',
     schema: {
       type: 'boolean'
     }

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

@@ -7,23 +7,20 @@ export function isUndefined(obj) {
   return typeof obj === 'undefined';
 }
 export function isArray(obj) {
-  return Object.prototype.toString.call(obj) === '[object Array]';
+  return Array.isArray(obj);
 } // eslint-disable-next-line @typescript-eslint/ban-types
 
 export function isFunction(func) {
   return typeof func === 'function';
-} // eslint-disable-next-line @typescript-eslint/ban-types
-
+}
 export function isObject(obj) {
-  return _typeof(obj) === 'object';
+  return obj !== null && _typeof(obj) === 'object';
 }
 export function isPlainObject(obj) {
-  return obj && _typeof(obj) === 'object' && Object.prototype.toString.call(obj) === '[object Object]';
+  return isObject(obj) && Object.prototype.toString.call(obj) === '[object Object]';
 }
 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/types/format.d.ts

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

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

@@ -1,8 +1,8 @@
 export declare function isString(str: any): str is string;
 export declare function isUndefined(obj: any): obj is undefined;
-export declare function isArray(obj: any): obj is any[];
+export declare function isArray(obj: unknown): 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 isObject(obj: unknown): obj is Record<string, any>;
+export declare function isPlainObject(obj: unknown): obj is Record<string, any>;
 export declare function isPromise(obj: any): obj is Promise<any>;
 export declare function isRegExp(obj: any): obj is RegExp;

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
   modulePathIgnorePatterns: [

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.4",
+  "version": "1.3.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -52,6 +52,7 @@
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "debug": "^4.3.2",
+    "execa": "5",
     "filesize": "^7.0.0",
     "fs-extra": "^10.0.0",
     "glob": "^7.1.7",
@@ -60,23 +61,22 @@
     "pkg-up": "^3.1.0",
     "recursive-readdir": "^2.2.2",
     "strip-ansi": "6.0.0",
+    "typescript": "^4",
     "upath": "^2.0.1",
-    "yaml": "^1.10.2",
-    "execa": "5",
-    "typescript": "^4"
+    "yaml": "^1.10.2"
   },
   "devDependencies": {
+    "@modern-js/types": "^1.3.6",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.12",
     "@types/glob": "^7.1.4",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/recursive-readdir": "^2.2.0",
-    "webpack": "^5.54.0",
-    "@scripts/build": "0.0.0",
     "jest": "^27",
-    "@scripts/jest-config": "0.0.0",
-    "@modern-js/types": "^1.3.4"
+    "webpack": "^5.71.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/tests/is.test.ts

@@ -0,0 +1,27 @@
+import { isEmpty, isFastRefresh } from '../src/is';
+
+describe('validate', () => {
+  it('should validate empty object correctly', () => {
+    expect(isEmpty({})).toBeTruthy();
+    expect(isEmpty({ foo: 'bar' })).toBeFalsy();
+  });
+
+  it('should validate fast refresh correctly', () => {
+    const { NODE_ENV, FAST_REFRESH } = process.env;
+
+    process.env.NODE_ENV = 'development';
+    process.env.FAST_REFRESH = 'true';
+    expect(isFastRefresh()).toBeTruthy();
+
+    process.env.NODE_ENV = 'production';
+    process.env.FAST_REFRESH = 'true';
+    expect(isFastRefresh()).toBeFalsy();
+
+    process.env.NODE_ENV = 'development';
+    process.env.FAST_REFRESH = 'false';
+    expect(isFastRefresh()).toBeFalsy();
+
+    process.env.NODE_ENV = NODE_ENV;
+    process.env.FAST_REFRESH = FAST_REFRESH;
+  });
+});

package/tests/isPlatform.test.ts

@@ -0,0 +1,19 @@
+import { isNodeJS, isBrowser } from '../src/is/platform';
+
+describe('validate platform', () => {
+  it('should validate Node.js correctly', () => {
+    expect(isNodeJS()).toBeTruthy();
+  });
+
+  it('should validate browser correctly', () => {
+    const windowSpy = jest.spyOn(window, 'window', 'get');
+
+    windowSpy.mockImplementation((): any => undefined);
+    expect(isBrowser()).toBeFalsy();
+
+    windowSpy.mockImplementation((): any => global);
+    expect(isBrowser()).toBeTruthy();
+
+    windowSpy.mockRestore();
+  });
+});

package/tests/isType.test.ts

@@ -1,4 +1,12 @@
-import { isString, isUndefined } from '../src/is/type';
+import {
+  isArray,
+  isObject,
+  isString,
+  isRegExp,
+  isPromise,
+  isUndefined,
+  isPlainObject,
+} from '../src/is/type';
 
 describe('validate type', () => {
   it('should validate string correctly', () => {
@@ -8,10 +16,70 @@ describe('validate type', () => {
     expect(isString(123)).toBeFalsy();
   });
 
-  it('should validate undeinfed correctly', () => {
+  it('should validate undefined correctly', () => {
     expect(isUndefined(undefined)).toBeTruthy();
     expect(isUndefined(null)).toBeFalsy();
     expect(isUndefined('')).toBeFalsy();
     expect(isUndefined(123)).toBeFalsy();
   });
+
+  it('should validate array correctly', () => {
+    expect(isArray(undefined)).toBeFalsy();
+    expect(isArray(null)).toBeFalsy();
+    expect(isArray('')).toBeFalsy();
+    expect(isArray(123)).toBeFalsy();
+    expect(isArray({})).toBeFalsy();
+    expect(isArray([])).toBeTruthy();
+  });
+
+  it('should validate object correctly', () => {
+    expect(isObject(1)).toBeFalsy();
+    expect(isObject('1')).toBeFalsy();
+    expect(isObject(undefined)).toBeFalsy();
+    expect(isObject(null)).toBeFalsy();
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    expect(isObject(() => {})).toBeFalsy();
+    expect(isObject({})).toBeTruthy();
+    expect(isObject([])).toBeTruthy();
+    expect(isObject(/foo/)).toBeTruthy();
+  });
+
+  it('should validate plain object correctly', () => {
+    expect(isPlainObject(1)).toBeFalsy();
+    expect(isPlainObject('1')).toBeFalsy();
+    expect(isPlainObject(undefined)).toBeFalsy();
+    expect(isPlainObject(null)).toBeFalsy();
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    expect(isPlainObject(() => {})).toBeFalsy();
+    expect(isPlainObject({})).toBeTruthy();
+    expect(isPlainObject([])).toBeFalsy();
+    expect(isPlainObject(/foo/)).toBeFalsy();
+  });
+
+  it('should validate RegExp correctly', () => {
+    expect(isRegExp(1)).toBeFalsy();
+    expect(isRegExp('1')).toBeFalsy();
+    expect(isRegExp(undefined)).toBeFalsy();
+    expect(isRegExp(null)).toBeFalsy();
+    expect(isRegExp({})).toBeFalsy();
+    expect(isRegExp([])).toBeFalsy();
+    expect(isRegExp(/foo/)).toBeTruthy();
+  });
+
+  it('should validate Promise correctly', () => {
+    expect(isPromise(1)).toBeFalsy();
+    expect(isPromise('1')).toBeFalsy();
+    expect(isPromise(undefined)).toBeFalsy();
+    expect(isPromise(null)).toBeFalsy();
+    expect(isPromise({})).toBeFalsy();
+    expect(isPromise([])).toBeFalsy();
+    expect(isPromise(/foo/)).toBeFalsy();
+    expect(
+      isPromise(
+        new Promise<void>(resolve => {
+          resolve();
+        }),
+      ),
+    ).toBeTruthy();
+  });
 });