@modern-js/plugin-server 1.17.0 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @modern-js/plugin-server
 
+## 1.18.0
+
+### Patch Changes
+
+- 2b7406d: feat: use typescript instead of babel as typescript compiler in server
+  feat: 服务端，增加 typescript 作为 typescipt 编译器
+- Updated dependencies [8280920]
+- Updated dependencies [2b7406d]
+- Updated dependencies [0a4d622]
+- Updated dependencies [60a2e3a]
+- Updated dependencies [5227370]
+- Updated dependencies [7928bae]
+  - @modern-js/utils@1.18.0
+  - @modern-js/server-utils@1.18.0
+  - @modern-js/babel-compiler@1.18.0
+
 ## 1.17.0
 
 ### Patch Changes

package/dist/js/modern/cli.js

@@ -1,40 +1,8 @@
 import fs from 'fs';
 import path from 'path';
-import { compiler } from '@modern-js/babel-compiler';
-import { resolveBabelConfig } from '@modern-js/server-utils';
+import { compile } from '@modern-js/server-utils';
 import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
 const TS_CONFIG_FILENAME = 'tsconfig.json';
-const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
-
-const compile = async (appDirectory, modernConfig, compileOptions) => {
-  const {
-    patterns
-  } = compileOptions;
-  const results = await Promise.all(patterns.map(pattern => {
-    const {
-      from,
-      to,
-      tsconfigPath
-    } = pattern;
-    const babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-      tsconfigPath: tsconfigPath ? tsconfigPath : '',
-      syntax: 'es6+',
-      type: 'commonjs'
-    });
-    return compiler({
-      rootDir: appDirectory,
-      distDir: to,
-      sourceDir: from,
-      extensions: FILE_EXTENSIONS
-    }, babelConfig);
-  }));
-  results.forEach(result => {
-    if (result.code === 1) {
-      throw new Error(result.message);
-    }
-  });
-};
-
 export default (() => ({
   name: '@modern-js/plugin-server',
   setup: api => ({
@@ -52,27 +20,21 @@ export default (() => ({
       const serverDir = path.resolve(appDirectory, SERVER_DIR);
       const sharedDir = path.resolve(appDirectory, SHARED_DIR);
       const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-      const patterns = [];
+      const sourceDirs = [];
 
       if (fs.existsSync(serverDir)) {
-        patterns.push({
-          from: serverDir,
-          to: distDir,
-          tsconfigPath
-        });
+        sourceDirs.push(serverDir);
       }
 
       if (fs.existsSync(sharedDir)) {
-        patterns.push({
-          from: sharedDir,
-          to: distDir,
-          tsconfigPath
-        });
+        sourceDirs.push(sharedDir);
       }
 
-      if (patterns.length > 0) {
+      if (sourceDirs.length > 0) {
         await compile(appDirectory, modernConfig, {
-          patterns
+          sourceDirs,
+          distDir,
+          tsconfigPath
         });
       }
     }

package/dist/js/node/cli.js

@@ -9,8 +9,6 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _babelCompiler = require("@modern-js/babel-compiler");
-
 var _serverUtils = require("@modern-js/server-utils");
 
 var _utils = require("@modern-js/utils");
@@ -18,36 +16,6 @@ var _utils = require("@modern-js/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const TS_CONFIG_FILENAME = 'tsconfig.json';
-const FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
-
-const compile = async (appDirectory, modernConfig, compileOptions) => {
-  const {
-    patterns
-  } = compileOptions;
-  const results = await Promise.all(patterns.map(pattern => {
-    const {
-      from,
-      to,
-      tsconfigPath
-    } = pattern;
-    const babelConfig = (0, _serverUtils.resolveBabelConfig)(appDirectory, modernConfig, {
-      tsconfigPath: tsconfigPath ? tsconfigPath : '',
-      syntax: 'es6+',
-      type: 'commonjs'
-    });
-    return (0, _babelCompiler.compiler)({
-      rootDir: appDirectory,
-      distDir: to,
-      sourceDir: from,
-      extensions: FILE_EXTENSIONS
-    }, babelConfig);
-  }));
-  results.forEach(result => {
-    if (result.code === 1) {
-      throw new Error(result.message);
-    }
-  });
-};
 
 var _default = () => ({
   name: '@modern-js/plugin-server',
@@ -71,27 +39,21 @@ var _default = () => ({
 
       const tsconfigPath = _path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
 
-      const patterns = [];
+      const sourceDirs = [];
 
       if (_fs.default.existsSync(serverDir)) {
-        patterns.push({
-          from: serverDir,
-          to: distDir,
-          tsconfigPath
-        });
+        sourceDirs.push(serverDir);
       }
 
       if (_fs.default.existsSync(sharedDir)) {
-        patterns.push({
-          from: sharedDir,
-          to: distDir,
-          tsconfigPath
-        });
+        sourceDirs.push(sharedDir);
       }
 
-      if (patterns.length > 0) {
-        await compile(appDirectory, modernConfig, {
-          patterns
+      if (sourceDirs.length > 0) {
+        await (0, _serverUtils.compile)(appDirectory, modernConfig, {
+          sourceDirs,
+          distDir,
+          tsconfigPath
         });
       }
     }

package/dist/js/treeshaking/cli.js

@@ -2,59 +2,9 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import fs from 'fs';
 import path from 'path';
-import { compiler } from '@modern-js/babel-compiler';
-import { resolveBabelConfig } from '@modern-js/server-utils';
+import { compile } from '@modern-js/server-utils';
 import { SHARED_DIR, SERVER_DIR } from '@modern-js/utils';
 var TS_CONFIG_FILENAME = 'tsconfig.json';
-var FILE_EXTENSIONS = ['.js', '.ts', '.mjs', '.ejs'];
-
-var compile = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(appDirectory, modernConfig, compileOptions) {
-    var patterns, results;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            patterns = compileOptions.patterns;
-            _context.next = 3;
-            return Promise.all(patterns.map(function (pattern) {
-              var from = pattern.from,
-                  to = pattern.to,
-                  tsconfigPath = pattern.tsconfigPath;
-              var babelConfig = resolveBabelConfig(appDirectory, modernConfig, {
-                tsconfigPath: tsconfigPath ? tsconfigPath : '',
-                syntax: 'es6+',
-                type: 'commonjs'
-              });
-              return compiler({
-                rootDir: appDirectory,
-                distDir: to,
-                sourceDir: from,
-                extensions: FILE_EXTENSIONS
-              }, babelConfig);
-            }));
-
-          case 3:
-            results = _context.sent;
-            results.forEach(function (result) {
-              if (result.code === 1) {
-                throw new Error(result.message);
-              }
-            });
-
-          case 5:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function compile(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 export default (function () {
   return {
     name: '@modern-js/plugin-server',
@@ -64,12 +14,12 @@ export default (function () {
           return {};
         },
         afterBuild: function afterBuild() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-            var _api$useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, patterns;
+          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+            var _api$useAppContext, appDirectory, distDirectory, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs;
 
-            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) {
-                switch (_context2.prev = _context2.next) {
+                switch (_context.prev = _context.next) {
                   case 0:
                     _api$useAppContext = api.useAppContext(), appDirectory = _api$useAppContext.appDirectory, distDirectory = _api$useAppContext.distDirectory;
                     modernConfig = api.useResolvedConfigContext();
@@ -77,40 +27,34 @@ export default (function () {
                     serverDir = path.resolve(appDirectory, SERVER_DIR);
                     sharedDir = path.resolve(appDirectory, SHARED_DIR);
                     tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-                    patterns = [];
+                    sourceDirs = [];
 
                     if (fs.existsSync(serverDir)) {
-                      patterns.push({
-                        from: serverDir,
-                        to: distDir,
-                        tsconfigPath: tsconfigPath
-                      });
+                      sourceDirs.push(serverDir);
                     }
 
                     if (fs.existsSync(sharedDir)) {
-                      patterns.push({
-                        from: sharedDir,
-                        to: distDir,
-                        tsconfigPath: tsconfigPath
-                      });
+                      sourceDirs.push(sharedDir);
                     }
 
-                    if (!(patterns.length > 0)) {
-                      _context2.next = 12;
+                    if (!(sourceDirs.length > 0)) {
+                      _context.next = 12;
                       break;
                     }
 
-                    _context2.next = 12;
+                    _context.next = 12;
                     return compile(appDirectory, modernConfig, {
-                      patterns: patterns
+                      sourceDirs: sourceDirs,
+                      distDir: distDir,
+                      tsconfigPath: tsconfigPath
                     });
 
                   case 12:
                   case "end":
-                    return _context2.stop();
+                    return _context.stop();
                 }
               }
-            }, _callee2);
+            }, _callee);
           }))();
         }
       };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.17.0",
+  "version": "1.18.0",
   "types": "./dist/types/server.d.ts",
   "jsnext:source": "./src/server.ts",
   "main": "./dist/js/node/server.js",
@@ -48,20 +48,20 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "1.17.0",
-    "@modern-js/server-utils": "1.17.0",
-    "@modern-js/utils": "1.17.0"
+    "@modern-js/babel-compiler": "1.18.0",
+    "@modern-js/server-utils": "1.18.0",
+    "@modern-js/utils": "1.18.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "1.17.0",
-    "@modern-js/core": "1.17.0",
-    "@scripts/build": "1.17.0",
-    "@modern-js/types": "1.17.0",
+    "@modern-js/server-core": "1.18.0",
+    "@modern-js/core": "1.18.0",
+    "@scripts/build": "1.18.0",
+    "@modern-js/types": "1.18.0",
     "typescript": "^4",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
-    "@scripts/jest-config": "1.17.0"
+    "@scripts/jest-config": "1.18.0"
   },
   "sideEffects": [
     "*.css",