@modern-js/utils 1.0.0-rc.2 → 1.0.0-rc.6

package/CHANGELOG.md

@@ -0,0 +1,28 @@
+# @modern-js/utils
+
+## 1.0.0-rc.6
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+
+## 1.0.0-rc.5
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 204c626: feat: initial
+
+## 1.0.0-rc.4
+
+### Patch Changes
+
+- fix server route match
+- 204c626: feat: initial
+
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- feat: initial

package/README.md

@@ -1,6 +1,6 @@
 
 <p align="center">
-  <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs.png" width="300" alt="Modern.js Logo" /></a>
+  <a href="https://modernjs.dev" target="blank"><img src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png" width="300" alt="Modern.js Logo" /></a>
 </p>
 
 <p align="center">现代 Web 工程体系</p>

package/dist/js/modern/alias.js

@@ -31,7 +31,6 @@ export const validAlias = (modernConfig, {
   return null;
 };
 export const getAlias = (aliasOption, option) => {
-  const tsconfig = readTsConfigByFile(option.tsconfigPath);
   const isTsProject = fs.existsSync(option.tsconfigPath);
   let aliasConfig;
 
@@ -47,6 +46,7 @@ export const getAlias = (aliasOption, option) => {
   } else {
     var _tsconfig$compilerOpt, _tsconfig$compilerOpt2;
 
+    const tsconfig = readTsConfigByFile(option.tsconfigPath);
     const baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt === void 0 ? void 0 : _tsconfig$compilerOpt.baseUrl;
     aliasConfig = {
       absoluteBaseUrl: baseUrl ? path.join(option.appDirectory, baseUrl) : option.appDirectory,

package/dist/js/modern/constants.js

@@ -114,6 +114,9 @@ export const INTERNAL_PLUGINS = {
   },
   '@modern-js/plugin-jarvis': {
     cli: '@modern-js/plugin-jarvis/cli'
+  },
+  '@modern-js/plugin-tailwind': {
+    cli: '@modern-js/plugin-tailwind/cli'
   }
 };
 /**
@@ -174,6 +177,17 @@ export const PLUGIN_SCHEMAS = {
       typeof: ['object', 'function']
     }
   }],
+  '@modern-js/plugin-tailwind': [{
+    target: 'tools.tailwind',
+    schema: {
+      typeof: ['object', 'function']
+    }
+  }, {
+    target: 'source.designSystem',
+    schema: {
+      typeof: ['object']
+    }
+  }],
   '@modern-js/plugin-proxy': [{
     target: 'dev.proxy',
     schema: {

package/dist/js/node/alias.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getUserAlias = exports.getAlias = exports.validAlias = void 0;
+exports.validAlias = exports.getUserAlias = exports.getAlias = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -48,8 +48,6 @@ const validAlias = (modernConfig, {
 exports.validAlias = validAlias;
 
 const getAlias = (aliasOption, option) => {
-  const tsconfig = (0, _readTsConfig.readTsConfigByFile)(option.tsconfigPath);
-
   const isTsProject = _fs.default.existsSync(option.tsconfigPath);
 
   let aliasConfig;
@@ -66,6 +64,7 @@ const getAlias = (aliasOption, option) => {
   } else {
     var _tsconfig$compilerOpt, _tsconfig$compilerOpt2;
 
+    const tsconfig = (0, _readTsConfig.readTsConfigByFile)(option.tsconfigPath);
     const baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt === void 0 ? void 0 : _tsconfig$compilerOpt.baseUrl;
     aliasConfig = {
       absoluteBaseUrl: baseUrl ? _path.default.join(option.appDirectory, baseUrl) : option.appDirectory,

package/dist/js/node/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PLUGIN_SCHEMAS = exports.INTERNAL_PLUGINS = exports.LOADABLE_STATS_FILE = exports.SERVER_RENDER_FUNCTION_NAME = exports.ENTRY_NAME_PATTERN = exports.SERVER_BUNDLE_DIRECTORY = exports.LAUNCH_EDITOR_ENDPOINT = exports.ROUTE_SPEC_FILE = exports.HMR_SOCK_PATH = exports.INTERNAL_DIR_ALAIS = exports.INTERNAL_SRC_ALIAS = void 0;
+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.ENTRY_NAME_PATTERN = void 0;
 
 /**
  * alias to src directory
@@ -130,6 +130,9 @@ const INTERNAL_PLUGINS = {
   },
   '@modern-js/plugin-jarvis': {
     cli: '@modern-js/plugin-jarvis/cli'
+  },
+  '@modern-js/plugin-tailwind': {
+    cli: '@modern-js/plugin-tailwind/cli'
   }
 };
 /**
@@ -191,6 +194,17 @@ const PLUGIN_SCHEMAS = {
       typeof: ['object', 'function']
     }
   }],
+  '@modern-js/plugin-tailwind': [{
+    target: 'tools.tailwind',
+    schema: {
+      typeof: ['object', 'function']
+    }
+  }, {
+    target: 'source.designSystem',
+    schema: {
+      typeof: ['object']
+    }
+  }],
   '@modern-js/plugin-proxy': [{
     target: 'dev.proxy',
     schema: {

package/dist/js/node/import.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Import = exports.lazyImport = void 0;
+exports.lazyImport = exports.Import = void 0;
 
 // cover: https://rushstack.io/pages/api/node-core-library.import.lazy/
 const lazy = (moduleName, requireFn) => {

package/dist/js/node/is/index.js

@@ -11,7 +11,7 @@ var _exportNames = {
   isUseSSRBundle: true,
   isFastRefresh: true
 };
-exports.isFastRefresh = exports.isUseSSRBundle = exports.isSSR = exports.isEmpty = exports.isTypescript = exports.isDepExists = void 0;
+exports.isUseSSRBundle = exports.isTypescript = exports.isSSR = exports.isFastRefresh = exports.isEmpty = exports.isDepExists = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 

package/dist/js/node/is/node-env.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isProdProfile = exports.isTest = exports.isProd = exports.isDev = void 0;
+exports.isTest = exports.isProdProfile = exports.isProd = exports.isDev = void 0;
 
 const isDev = () => process.env.NODE_ENV === 'development';
 

package/dist/js/node/is/platform.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isBrowser = exports.isNodeJS = void 0;
+exports.isNodeJS = exports.isBrowser = void 0;
 
 const isNodeJS = () => typeof process !== 'undefined' && process.versions != null && process.versions.node != null && process.versions.electron == null;
 

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

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isString = isString;
-exports.isUndefined = isUndefined;
 exports.isArray = isArray;
 exports.isFunction = isFunction;
 exports.isObject = isObject;
 exports.isPlainObject = isPlainObject;
 exports.isPromise = isPromise;
+exports.isString = isString;
+exports.isUndefined = isUndefined;
 
 function isString(str) {
   return typeof str === 'string';

package/dist/js/node/monorepo.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getMonorepoPackages = exports.findMonorepoRoot = exports.isModernjsMonorepo = exports.isMonorepo = exports.isPnpmWorkspaces = exports.isYarnWorkspaces = exports.isLerna = void 0;
+exports.isYarnWorkspaces = exports.isPnpmWorkspaces = exports.isMonorepo = exports.isModernjsMonorepo = exports.isLerna = exports.getMonorepoPackages = exports.findMonorepoRoot = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 

package/dist/js/node/removeSlash.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeSlash = exports.removeTailSlash = exports.removeLeadingSlash = void 0;
+exports.removeTailSlash = exports.removeSlash = exports.removeLeadingSlash = void 0;
 
 const removeLeadingSlash = s => s.replace(/^\/+/, '');
 

package/dist/js/treeshaking/alias.js

@@ -26,7 +26,6 @@ export var validAlias = function validAlias(modernConfig, _ref) {
   return null;
 };
 export var getAlias = function getAlias(aliasOption, option) {
-  var tsconfig = readTsConfigByFile(option.tsconfigPath);
   var isTsProject = fs.existsSync(option.tsconfigPath);
   var aliasConfig;
 
@@ -42,6 +41,7 @@ export var getAlias = function getAlias(aliasOption, option) {
   } else {
     var _tsconfig$compilerOpt, _tsconfig$compilerOpt2;
 
+    var tsconfig = readTsConfigByFile(option.tsconfigPath);
     var baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt === void 0 ? void 0 : _tsconfig$compilerOpt.baseUrl;
     aliasConfig = {
       absoluteBaseUrl: baseUrl ? path.join(option.appDirectory, baseUrl) : option.appDirectory,

package/dist/js/treeshaking/constants.js

@@ -116,6 +116,9 @@ export var INTERNAL_PLUGINS = {
   },
   '@modern-js/plugin-jarvis': {
     cli: '@modern-js/plugin-jarvis/cli'
+  },
+  '@modern-js/plugin-tailwind': {
+    cli: '@modern-js/plugin-tailwind/cli'
   }
 };
 /**
@@ -174,6 +177,17 @@ export var PLUGIN_SCHEMAS = {
       "typeof": ['object', 'function']
     }
   }],
+  '@modern-js/plugin-tailwind': [{
+    target: 'tools.tailwind',
+    schema: {
+      "typeof": ['object', 'function']
+    }
+  }, {
+    target: 'source.designSystem',
+    schema: {
+      "typeof": ['object']
+    }
+  }],
   '@modern-js/plugin-proxy': [{
     target: 'dev.proxy',
     schema: {

package/dist/js/treeshaking/getPort.js

@@ -1,3 +1,5 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -15,13 +17,13 @@ import { logger } from "./logger";
 /* eslint-disable no-param-reassign, @typescript-eslint/no-loop-func */
 
 export var getPort = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(port) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(port) {
     var tryLimits,
         original,
         found,
         attempts,
         _args = arguments;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:

package/dist/js/treeshaking/watch.js

@@ -1,3 +1,5 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -20,9 +22,9 @@ export var watch = function watch(watchDir, runTask) {
     return ready = true;
   });
   watcher.on('change', /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(filePath) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(filePath) {
       var changedFilePath;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -46,9 +48,9 @@ export var watch = function watch(watchDir, runTask) {
     };
   }());
   watcher.on('add', /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(filePath) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(filePath) {
       var changedFilePath;
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
@@ -78,9 +80,9 @@ export var watch = function watch(watchDir, runTask) {
     };
   }());
   watcher.on('unlink', /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(filePath) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(filePath) {
       var changedFilePath;
-      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:

package/dist/types/constants.d.ts

@@ -111,6 +111,12 @@ export declare const PLUGIN_SCHEMAS: {
       typeof: string[];
     };
   }[];
+  '@modern-js/plugin-tailwind': {
+    target: string;
+    schema: {
+      typeof: string[];
+    };
+  }[];
   '@modern-js/plugin-proxy': {
     target: string;
     schema: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/utils",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -53,13 +53,17 @@
     "@types/recursive-readdir": "^2.2.0",
     "typescript": "^4",
     "webpack": "^5.54.0",
-    "@modern-js/plugin-testing": "^1.0.0-rc.2",
-    "@modern-js/module-tools": "^1.0.0-rc.2"
+    "@modern-js/plugin-testing": "^1.0.0-rc.6",
+    "@modern-js/module-tools": "^1.0.0-rc.6"
   },
   "peerDependencies": {
     "typescript": "^4.4.3"
   },
   "sideEffects": false,
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  },
   "scripts": {
     "new": "modern new",
     "build": "modern build",

package/src/alias.ts

@@ -53,7 +53,6 @@ export const getAlias = (
   aliasOption: AliasOption | Array<AliasOption>,
   option: { appDirectory: string; tsconfigPath: string },
 ) => {
-  const tsconfig = readTsConfigByFile(option.tsconfigPath);
   const isTsProject = fs.existsSync(option.tsconfigPath);
   let aliasConfig: IAliasConfig;
   if (!isTsProject) {
@@ -64,6 +63,7 @@ export const getAlias = (
       isTsProject,
     };
   } else {
+    const tsconfig = readTsConfigByFile(option.tsconfigPath);
     const baseUrl = tsconfig?.compilerOptions?.baseUrl;
     aliasConfig = {
       absoluteBaseUrl: baseUrl

package/src/constants.ts

@@ -87,6 +87,7 @@ export const INTERNAL_PLUGINS: {
     cli: '@modern-js/plugin-micro-frontend/cli',
   },
   '@modern-js/plugin-jarvis': { cli: '@modern-js/plugin-jarvis/cli' },
+  '@modern-js/plugin-tailwind': { cli: '@modern-js/plugin-tailwind/cli' },
 };
 
 /**
@@ -141,6 +142,16 @@ export const PLUGIN_SCHEMAS = {
       schema: { typeof: ['object', 'function'] },
     },
   ],
+  '@modern-js/plugin-tailwind': [
+    {
+      target: 'tools.tailwind',
+      schema: { typeof: ['object', 'function'] },
+    },
+    {
+      target: 'source.designSystem',
+      schema: { typeof: ['object'] },
+    },
+  ],
   '@modern-js/plugin-proxy': [
     {
       target: 'dev.proxy',