@modern-js/server-utils 1.0.0-rc.15 → 1.0.0-rc.16

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @modern-js/server-utils
 
+## 1.0.0-rc.16
+
+### Patch Changes
+
+- 224f7fe: fix server route match
+- 30ac27c: feat: add generator package description
+- 204c626: feat: initial
+- Updated dependencies [224f7fe]
+- Updated dependencies [30ac27c]
+- Updated dependencies [204c626]
+  - @modern-js/babel-preset-lib@1.0.0-rc.16
+  - @modern-js/plugin@1.0.0-rc.16
+  - @modern-js/utils@1.0.0-rc.16
+
 ## 1.0.0-rc.15
 
 ### Patch Changes

package/dist/js/modern/babel.js

@@ -5,7 +5,7 @@ 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 { getBabelChain } from '@modern-js/babel-preset-lib';
-import { applyOptionsChain, fs, getAlias } from '@modern-js/utils';
+import { applyOptionsChain, fs, getAlias, upath } from '@modern-js/utils';
 import json5 from 'json5';
 export * from '@babel/core';
 export const readTsConfig = (tsconfigPath, noExistReturn = null) => {
@@ -65,14 +65,14 @@ export const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME:
     syntax: option.syntax
   });
   const envOptions = babelChain.preset('@babel/preset-env').options();
-  babelChain.preset('@babel/preset-env').use(require.resolve('@babel/preset-env'), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
+  babelChain.preset('@babel/preset-env').use(upath.normalizeSafe(require.resolve('@babel/preset-env')), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
     loose: true
   })]);
-  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
-  babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
+  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(upath.normalizeSafe(require.resolve('babel-plugin-transform-typescript-metadata')), []);
+  babelChain.plugin('@babel/plugin-proposal-decorators').use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-decorators')), [{
     legacy: true
   }]);
-  babelChain.plugin('@babel/plugin-proposal-class-properties').use(require.resolve('@babel/plugin-proposal-class-properties'), [{
+  babelChain.plugin('@babel/plugin-proposal-class-properties').use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-class-properties')), [{
     loose: true
   }]);
 

package/dist/js/modern/gather.js

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { createMiddlewareCollecter } from "./middleware";
 import { requireModule } from "./requireModule";
 const API_DIR_PATH = 'api';

package/dist/js/node/babel.js

@@ -106,14 +106,14 @@ const resolveBabelConfig = (appDirectory, modernConfig, option // FIXME: babel t
     syntax: option.syntax
   });
   const envOptions = babelChain.preset('@babel/preset-env').options();
-  babelChain.preset('@babel/preset-env').use(require.resolve('@babel/preset-env'), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
+  babelChain.preset('@babel/preset-env').use(_utils.upath.normalizeSafe(require.resolve('@babel/preset-env')), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
     loose: true
   })]);
-  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
-  babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
+  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(_utils.upath.normalizeSafe(require.resolve('babel-plugin-transform-typescript-metadata')), []);
+  babelChain.plugin('@babel/plugin-proposal-decorators').use(_utils.upath.normalizeSafe(require.resolve('@babel/plugin-proposal-decorators')), [{
     legacy: true
   }]);
-  babelChain.plugin('@babel/plugin-proposal-class-properties').use(require.resolve('@babel/plugin-proposal-class-properties'), [{
+  babelChain.plugin('@babel/plugin-proposal-class-properties').use(_utils.upath.normalizeSafe(require.resolve('@babel/plugin-proposal-class-properties')), [{
     loose: true
   }]);
 

package/dist/js/node/gather.js

@@ -5,14 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.gather = void 0;
 
-var _path = _interopRequireDefault(require("path"));
+var _utils = require("@modern-js/utils");
 
 var _middleware = require("./middleware");
 
 var _requireModule = require("./requireModule");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const API_DIR_PATH = 'api';
 const API_APP_NAME = '_app';
 const SERVER_DIR_PATH = 'server';
@@ -25,13 +23,13 @@ const gather = pwd => {
     addWebMiddleware
   } = (0, _middleware.createMiddlewareCollecter)();
 
-  const apiPath = _path.default.resolve(pwd, API_DIR_PATH);
+  const apiPath = _utils.path.resolve(pwd, API_DIR_PATH);
 
-  const apiAppPath = _path.default.resolve(apiPath, API_APP_NAME);
+  const apiAppPath = _utils.path.resolve(apiPath, API_APP_NAME);
 
-  const serverPath = _path.default.resolve(pwd, SERVER_DIR_PATH);
+  const serverPath = _utils.path.resolve(pwd, SERVER_DIR_PATH);
 
-  const webAppPath = _path.default.resolve(serverPath, WEB_APP_NAME);
+  const webAppPath = _utils.path.resolve(serverPath, WEB_APP_NAME);
 
   const apiAttacher = (0, _requireModule.requireModule)(apiAppPath);
 

package/dist/js/treeshaking/babel.js

@@ -5,7 +5,7 @@ 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 { getBabelChain } from '@modern-js/babel-preset-lib';
-import { applyOptionsChain, fs, getAlias } from '@modern-js/utils';
+import { applyOptionsChain, fs, getAlias, upath } from '@modern-js/utils';
 import json5 from 'json5';
 export * from '@babel/core';
 export var readTsConfig = function readTsConfig(tsconfigPath) {
@@ -61,14 +61,14 @@ export var resolveBabelConfig = function resolveBabelConfig(appDirectory, modern
     syntax: option.syntax
   });
   var envOptions = babelChain.preset('@babel/preset-env').options();
-  babelChain.preset('@babel/preset-env').use(require.resolve('@babel/preset-env'), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
+  babelChain.preset('@babel/preset-env').use(upath.normalizeSafe(require.resolve('@babel/preset-env')), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
     loose: true
   })]);
-  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
-  babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
+  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(upath.normalizeSafe(require.resolve('babel-plugin-transform-typescript-metadata')), []);
+  babelChain.plugin('@babel/plugin-proposal-decorators').use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-decorators')), [{
     legacy: true
   }]);
-  babelChain.plugin('@babel/plugin-proposal-class-properties').use(require.resolve('@babel/plugin-proposal-class-properties'), [{
+  babelChain.plugin('@babel/plugin-proposal-class-properties').use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-class-properties')), [{
     loose: true
   }]);
 

package/dist/js/treeshaking/gather.js

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { createMiddlewareCollecter } from "./middleware";
 import { requireModule } from "./requireModule";
 var API_DIR_PATH = 'api';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/server-utils",
-  "version": "1.0.0-rc.15",
+  "version": "1.0.0-rc.16",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -23,15 +23,15 @@
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-typescript": "^7.15.0",
     "@babel/runtime": "^7",
-    "@modern-js/babel-preset-lib": "^1.0.0-rc.15",
-    "@modern-js/plugin": "^1.0.0-rc.15",
-    "@modern-js/utils": "^1.0.0-rc.15",
+    "@modern-js/babel-preset-lib": "^1.0.0-rc.16",
+    "@modern-js/plugin": "^1.0.0-rc.16",
+    "@modern-js/utils": "^1.0.0-rc.16",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "json5": "^2.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "^1.0.0-rc.15",
+    "@modern-js/core": "^1.0.0-rc.16",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^26",
     "@types/node": "^14",
@@ -39,8 +39,8 @@
     "@types/react-dom": "^17",
     "ts-jest": "^27.0.4",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.0.0-rc.15",
-    "@modern-js/module-tools": "^1.0.0-rc.15"
+    "@modern-js/plugin-testing": "^1.0.0-rc.16",
+    "@modern-js/module-tools": "^1.0.0-rc.16"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/babel.ts

@@ -4,7 +4,7 @@ import {
   ISyntaxOption,
 } from '@modern-js/babel-preset-lib';
 import { TransformOptions } from '@babel/core';
-import { applyOptionsChain, fs, getAlias } from '@modern-js/utils';
+import { applyOptionsChain, fs, getAlias, upath } from '@modern-js/utils';
 import type { NormalizedConfig } from '@modern-js/core';
 import json5 from 'json5';
 
@@ -112,7 +112,7 @@ export const resolveBabelConfig = (
   const envOptions = babelChain.preset('@babel/preset-env').options();
   babelChain
     .preset('@babel/preset-env')
-    .use(require.resolve('@babel/preset-env'), [
+    .use(upath.normalizeSafe(require.resolve('@babel/preset-env')), [
       {
         ...envOptions[0],
         loose: true,
@@ -121,17 +121,17 @@ export const resolveBabelConfig = (
 
   babelChain
     .plugin('babel-plugin-transform-typescript-metadata')
-    .use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
+    .use(upath.normalizeSafe(require.resolve('babel-plugin-transform-typescript-metadata')), []);
 
   babelChain
     .plugin('@babel/plugin-proposal-decorators')
-    .use(require.resolve('@babel/plugin-proposal-decorators'), [
+    .use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-decorators')), [
       { legacy: true },
     ]);
 
   babelChain
     .plugin('@babel/plugin-proposal-class-properties')
-    .use(require.resolve('@babel/plugin-proposal-class-properties'), [
+    .use(upath.normalizeSafe(require.resolve('@babel/plugin-proposal-class-properties')), [
       { loose: true },
     ]);
 

package/src/gather.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { createMiddlewareCollecter } from './middleware';
 import { requireModule } from './requireModule';
 

package/tests/babel.test.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { defaults } from './helpers';
 import { resolveBabelConfig } from '@/index';
 

package/tests/gather.test.ts

@@ -1,4 +1,4 @@
-import path from 'path';
+import { path } from '@modern-js/utils';
 import { gather } from '@/index';
 
 describe('@modern-js/server-utils', () => {