@modern-js/utils 1.3.1 → 1.3.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @modern-js/utils
 
+## 1.3.2
+
+### Patch Changes
+
+- deeaa602: support svg/proxy/multi-version in unbundled
+
 ## 1.3.1
 
 ### Patch Changes

package/dist/js/modern/constants.js

@@ -151,6 +151,9 @@ export const INTERNAL_PLUGINS = {
   },
   '@modern-js/plugin-nocode': {
     cli: '@modern-js/plugin-nocode/cli'
+  },
+  '@modern-js/plugin-design-token': {
+    cli: '@modern-js/plugin-design-token/cli'
   }
 };
 /**
@@ -222,11 +225,6 @@ export const PLUGIN_SCHEMAS = {
     schema: {
       typeof: ['object', 'function']
     }
-  }, {
-    target: 'source.designSystem',
-    schema: {
-      typeof: ['object']
-    }
   }],
   '@modern-js/plugin-proxy': [{
     target: 'dev.proxy',
@@ -269,6 +267,18 @@ export const PLUGIN_SCHEMAS = {
       type: ['boolean', 'object']
     }
   }],
+  '@modern-js/plugin-design-token': [// Legacy Features
+  {
+    target: 'source.designSystem',
+    schema: {
+      typeof: ['object']
+    }
+  }, {
+    target: 'source.designSystem.supportStyledComponents',
+    schema: {
+      type: ['boolean']
+    }
+  }],
   '@modern-js/plugin-router': [{
     target: 'runtime.router',
     schema: {

package/dist/js/modern/{formatWebpackMessages.js → format.js}

@@ -1,3 +1,9 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
+
 /* eslint-disable no-param-reassign */
 
 /* eslint-disable max-statements */
@@ -100,4 +106,32 @@ function formatWebpackMessages(json) {
 export { formatWebpackMessages };
 /* eslint-enable max-statements */
 
-/* eslint-enable no-param-reassign */
+/* eslint-enable no-param-reassign */
+
+function formatProxyOptions(proxyOptions) {
+  const formatedProxy = [];
+
+  if (!Array.isArray(proxyOptions)) {
+    if ('target' in proxyOptions) {
+      formatedProxy.push(proxyOptions);
+    } else {
+      Array.prototype.push.apply(formatedProxy, Object.keys(proxyOptions).reduce((total, source) => {
+        const option = proxyOptions[source];
+        total.push(_objectSpread({
+          context: source,
+          changeOrigin: true,
+          logLevel: 'warn'
+        }, typeof option === 'string' ? {
+          target: option
+        } : option));
+        return total;
+      }, []));
+    }
+  } else {
+    formatedProxy.push(...proxyOptions);
+  }
+
+  return formatedProxy;
+}
+
+export { formatProxyOptions };

package/dist/js/modern/index.js

@@ -1,7 +1,7 @@
 import * as _fs from 'fs-extra';
 export { _fs as fs };
 export * from "./chalk";
-export * from "./formatWebpackMessages";
+export * from "./format";
 export * from "./FileSizeReporter";
 export * from "./printBuildError";
 export * from "./debug";

package/dist/js/node/constants.js

@@ -169,6 +169,9 @@ const INTERNAL_PLUGINS = {
   },
   '@modern-js/plugin-nocode': {
     cli: '@modern-js/plugin-nocode/cli'
+  },
+  '@modern-js/plugin-design-token': {
+    cli: '@modern-js/plugin-design-token/cli'
   }
 };
 /**
@@ -241,11 +244,6 @@ const PLUGIN_SCHEMAS = {
     schema: {
       typeof: ['object', 'function']
     }
-  }, {
-    target: 'source.designSystem',
-    schema: {
-      typeof: ['object']
-    }
   }],
   '@modern-js/plugin-proxy': [{
     target: 'dev.proxy',
@@ -288,6 +286,18 @@ const PLUGIN_SCHEMAS = {
       type: ['boolean', 'object']
     }
   }],
+  '@modern-js/plugin-design-token': [// Legacy Features
+  {
+    target: 'source.designSystem',
+    schema: {
+      typeof: ['object']
+    }
+  }, {
+    target: 'source.designSystem.supportStyledComponents',
+    schema: {
+      type: ['boolean']
+    }
+  }],
   '@modern-js/plugin-router': [{
     target: 'runtime.router',
     schema: {

package/dist/js/node/{formatWebpackMessages.js → format.js}

@@ -3,8 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.formatProxyOptions = formatProxyOptions;
 exports.formatWebpackMessages = formatWebpackMessages;
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
+
 /* eslint-disable no-param-reassign */
 
 /* eslint-disable max-statements */
@@ -103,6 +110,32 @@ function formatWebpackMessages(json) {
 
   return result;
 }
+
 /* eslint-enable max-statements */
 
-/* eslint-enable no-param-reassign */
+/* eslint-enable no-param-reassign */
+function formatProxyOptions(proxyOptions) {
+  const formatedProxy = [];
+
+  if (!Array.isArray(proxyOptions)) {
+    if ('target' in proxyOptions) {
+      formatedProxy.push(proxyOptions);
+    } else {
+      Array.prototype.push.apply(formatedProxy, Object.keys(proxyOptions).reduce((total, source) => {
+        const option = proxyOptions[source];
+        total.push(_objectSpread({
+          context: source,
+          changeOrigin: true,
+          logLevel: 'warn'
+        }, typeof option === 'string' ? {
+          target: option
+        } : option));
+        return total;
+      }, []));
+    }
+  } else {
+    formatedProxy.push(...proxyOptions);
+  }
+
+  return formatedProxy;
+}

package/dist/js/node/index.js

@@ -26,16 +26,16 @@ Object.keys(_chalk).forEach(function (key) {
   });
 });
 
-var _formatWebpackMessages = require("./formatWebpackMessages");
+var _format = require("./format");
 
-Object.keys(_formatWebpackMessages).forEach(function (key) {
+Object.keys(_format).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _formatWebpackMessages[key]) return;
+  if (key in exports && exports[key] === _format[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _formatWebpackMessages[key];
+      return _format[key];
     }
   });
 });

package/dist/js/treeshaking/constants.js

@@ -153,6 +153,9 @@ export var INTERNAL_PLUGINS = {
   },
   '@modern-js/plugin-nocode': {
     cli: '@modern-js/plugin-nocode/cli'
+  },
+  '@modern-js/plugin-design-token': {
+    cli: '@modern-js/plugin-design-token/cli'
   }
 };
 /**
@@ -222,11 +225,6 @@ export var PLUGIN_SCHEMAS = {
     schema: {
       "typeof": ['object', 'function']
     }
-  }, {
-    target: 'source.designSystem',
-    schema: {
-      "typeof": ['object']
-    }
   }],
   '@modern-js/plugin-proxy': [{
     target: 'dev.proxy',
@@ -269,6 +267,18 @@ export var PLUGIN_SCHEMAS = {
       type: ['boolean', 'object']
     }
   }],
+  '@modern-js/plugin-design-token': [// Legacy Features
+  {
+    target: 'source.designSystem',
+    schema: {
+      "typeof": ['object']
+    }
+  }, {
+    target: 'source.designSystem.supportStyledComponents',
+    schema: {
+      type: ['boolean']
+    }
+  }],
   '@modern-js/plugin-router': [{
     target: 'runtime.router',
     schema: {

package/dist/js/treeshaking/{formatWebpackMessages.js → format.js}

@@ -1,3 +1,17 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -122,4 +136,32 @@ function formatWebpackMessages(json) {
 export { formatWebpackMessages };
 /* eslint-enable max-statements */
 
-/* eslint-enable no-param-reassign */
+/* eslint-enable no-param-reassign */
+
+function formatProxyOptions(proxyOptions) {
+  var formatedProxy = [];
+
+  if (!Array.isArray(proxyOptions)) {
+    if ('target' in proxyOptions) {
+      formatedProxy.push(proxyOptions);
+    } else {
+      Array.prototype.push.apply(formatedProxy, Object.keys(proxyOptions).reduce(function (total, source) {
+        var option = proxyOptions[source];
+        total.push(_objectSpread({
+          context: source,
+          changeOrigin: true,
+          logLevel: 'warn'
+        }, typeof option === 'string' ? {
+          target: option
+        } : option));
+        return total;
+      }, []));
+    }
+  } else {
+    formatedProxy.push.apply(formatedProxy, _toConsumableArray(proxyOptions));
+  }
+
+  return formatedProxy;
+}
+
+export { formatProxyOptions };

package/dist/js/treeshaking/index.js

@@ -1,7 +1,7 @@
 import * as _fs from 'fs-extra';
 export { _fs as fs };
 export * from "./chalk";
-export * from "./formatWebpackMessages";
+export * from "./format";
 export * from "./FileSizeReporter";
 export * from "./printBuildError";
 export * from "./debug";

package/dist/types/constants.d.ts

@@ -161,6 +161,19 @@ export declare const PLUGIN_SCHEMAS: {
       type: string[];
     };
   }[];
+  '@modern-js/plugin-design-token': ({
+    target: string;
+    schema: {
+      typeof: string[];
+      type?: undefined;
+    };
+  } | {
+    target: string;
+    schema: {
+      type: string[];
+      typeof?: undefined;
+    };
+  })[];
   '@modern-js/plugin-router': {
     target: string;
     schema: {

package/dist/types/{formatWebpackMessages.d.ts → format.d.ts}

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

package/dist/types/index.d.ts

@@ -1,6 +1,6 @@
 export * as fs from 'fs-extra';
 export * from './chalk';
-export * from './formatWebpackMessages';
+export * from './format';
 export * from './FileSizeReporter';
 export * from './printBuildError';
 export * from './debug';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.1",
+  "version": "1.3.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -26,9 +26,9 @@
       },
       "default": "./dist/js/treeshaking/index.js"
     },
-    "./formatWebpackMessages": {
-      "jsnext:source": "./src/formatWebpackMessages.ts",
-      "default": "./dist/js/treeshaking/formatWebpackMessages.js"
+    "./format": {
+      "jsnext:source": "./src/format.ts",
+      "default": "./dist/js/treeshaking/format.js"
     },
     "./constants": {
       "jsnext:source": "./src/constants.ts",
@@ -37,8 +37,8 @@
   },
   "typesVersions": {
     "*": {
-      "formatWebpackMessages": [
-        "./dist/types/formatWebpackMessages.d.ts"
+      "format": [
+        "./dist/types/format.d.ts"
       ],
       "constants": [
         "./dist/types/constants.d.ts"
@@ -75,7 +75,8 @@
     "webpack": "^5.54.0",
     "@scripts/build": "0.0.0",
     "jest": "^27",
-    "@scripts/jest-config": "0.0.0"
+    "@scripts/jest-config": "0.0.0",
+    "@modern-js/types": "^1.3.3"
   },
   "sideEffects": false,
   "publishConfig": {

package/tests/format.test.ts

@@ -0,0 +1,60 @@
+import { formatProxyOptions } from '../src/format';
+
+describe('test format', () => {
+  it('should format correctly use simply options', async () => {
+    const proxy = {
+      '/simple': `http://localhost`,
+    };
+
+    const options = formatProxyOptions(proxy);
+    expect(options).toEqual([
+      {
+        context: '/simple',
+        changeOrigin: true,
+        logLevel: 'warn',
+        target: 'http://localhost',
+      },
+    ]);
+  });
+
+  it('should format correctly use simply options', async () => {
+    const proxy = {
+      '/simple-obj': {
+        target: `http://localhost`,
+      },
+    };
+    const options = formatProxyOptions(proxy);
+    expect(options).toEqual([
+      {
+        context: '/simple-obj',
+        changeOrigin: true,
+        logLevel: 'warn',
+        target: 'http://localhost',
+      },
+    ]);
+  });
+
+  it('should format correctly use simply options', async () => {
+    const proxy = {
+      context: '/context',
+      target: `http://localhost`,
+    };
+    const options = formatProxyOptions(proxy);
+    expect(options).toEqual([
+      { context: '/context', target: 'http://localhost' },
+    ]);
+  });
+
+  it('should format correctly use simply options', async () => {
+    const proxy = [
+      {
+        context: '/array',
+        target: `http://localhost`,
+      },
+    ];
+    const options = formatProxyOptions(proxy);
+    expect(options).toEqual([
+      { context: '/array', target: 'http://localhost' },
+    ]);
+  });
+});

package/tests/generateMetaTags.test.ts

@@ -0,0 +1,19 @@
+import { generateMetaTags } from '../src/generateMetaTags';
+
+describe('generateMetaTags', () => {
+  it('should return empty string when params is empty', () => {
+    expect(generateMetaTags()).toEqual('');
+  });
+
+  it('should generate meta tag correctly', () => {
+    const options = {
+      foo: {
+        name: 'viewport',
+        content: 'width=500, initial-scale=1',
+      },
+    };
+    expect(generateMetaTags(options).trim()).toEqual(
+      '<meta name="viewport" content="width=500, initial-scale=1">',
+    );
+  });
+});