@modern-js/server-utils 2.15.0 → 2.16.0

package/dist/esm-node/compilers/babel/index.js

@@ -1,49 +1,43 @@
 import * as path from "path";
-import {
-  getBabelChain,
-  applyUserBabelConfig
-} from "@modern-js/babel-preset-lib";
+import { getBabelChain, applyUserBabelConfig } from "@modern-js/babel-preset-lib";
 import { fs, json5, getAliasConfig } from "@modern-js/utils";
 import { compiler } from "@modern-js/babel-compiler";
 import { FILE_EXTENSIONS } from "../../common";
 export * from "@babel/core";
-const readTsConfig = (tsconfigPath, noExistReturn = null) => {
+export const readTsConfig = (tsconfigPath, noExistReturn = null) => {
   if (!fs.existsSync(tsconfigPath)) {
     return noExistReturn;
   }
   const content = fs.readFileSync(tsconfigPath, "utf-8");
   return json5.parse(content);
 };
-const existTsConfigFile = (tsconfigAbsolutePath) => {
+export const existTsConfigFile = (tsconfigAbsolutePath) => {
   const tsconfig = readTsConfig(tsconfigAbsolutePath);
   return Boolean(tsconfig);
 };
-const getBabelConfig = (libPresetOption, syntaxOption) => {
+export const getBabelConfig = (libPresetOption, syntaxOption) => {
   const chain = getBabelChain(libPresetOption, syntaxOption);
   return {
     sourceType: "unambiguous",
     ...chain.toJSON()
   };
 };
-const resolveBabelConfig = (appDirectory, config, option) => {
+export const resolveBabelConfig = (appDirectory, config, option) => {
   const { alias, babelConfig } = config;
   const aliasConfig = getAliasConfig(alias, {
     appDirectory,
     ...option
   });
-  const babelChain = getBabelChain(
-    {
-      appDirectory,
-      enableReactPreset: true,
-      enableTypescriptPreset: true,
-      alias: aliasConfig,
-      envVars: []
-    },
-    {
-      type: option.type,
-      syntax: option.syntax
-    }
-  );
+  const babelChain = getBabelChain({
+    appDirectory,
+    enableReactPreset: true,
+    enableTypescriptPreset: true,
+    alias: aliasConfig,
+    envVars: []
+  }, {
+    type: option.type,
+    syntax: option.syntax
+  });
   const envOptions = babelChain.preset("@babel/preset-env").options();
   babelChain.preset("@babel/preset-env").use(require.resolve("@babel/preset-env"), [
     {
@@ -51,58 +45,50 @@ const resolveBabelConfig = (appDirectory, config, option) => {
       loose: true
     }
   ]);
-  babelChain.plugin("babel-plugin-transform-typescript-metadata").use(
-    require.resolve("babel-plugin-transform-typescript-metadata"),
-    []
-  );
+  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"), [
-    { legacy: true }
+    {
+      legacy: true
+    }
   ]);
   babelChain.plugin("@babel/plugin-proposal-class-properties").use(require.resolve("@babel/plugin-proposal-class-properties"), [
     {
       loose: true
     }
   ]);
-  const internalBabelConfig = { ...babelChain.toJSON() };
+  const internalBabelConfig = {
+    ...babelChain.toJSON()
+  };
   return applyUserBabelConfig(internalBabelConfig, babelConfig);
 };
-const compileByBabel = async (appDirectory, config, compileOptions) => {
+export const compileByBabel = async (appDirectory, config, compileOptions) => {
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
-  const results = await Promise.all(
-    sourceDirs.map(async (sourceDir) => {
-      const babelConfig = resolveBabelConfig(appDirectory, config, {
-        tsconfigPath: tsconfigPath ? tsconfigPath : "",
-        syntax: "es6+",
-        type: "commonjs"
+  const results = await Promise.all(sourceDirs.map(async (sourceDir) => {
+    const babelConfig = resolveBabelConfig(appDirectory, config, {
+      tsconfigPath: tsconfigPath ? tsconfigPath : "",
+      syntax: "es6+",
+      type: "commonjs"
+    });
+    if (await fs.pathExists(sourceDir)) {
+      const basename = path.basename(sourceDir);
+      const targetDir = path.join(distDir, basename);
+      await fs.copy(sourceDir, targetDir, {
+        filter: (src) => ![
+          ".ts",
+          ".js"
+        ].includes(path.extname(src)) && src !== tsconfigPath
       });
-      if (await fs.pathExists(sourceDir)) {
-        const basename = path.basename(sourceDir);
-        const targetDir = path.join(distDir, basename);
-        await fs.copy(sourceDir, targetDir, {
-          filter: (src) => ![".ts", ".js"].includes(path.extname(src)) && src !== tsconfigPath
-        });
-      }
-      return compiler(
-        {
-          rootDir: appDirectory,
-          distDir,
-          sourceDir,
-          extensions: FILE_EXTENSIONS
-        },
-        babelConfig
-      );
-    })
-  );
+    }
+    return compiler({
+      rootDir: appDirectory,
+      distDir,
+      sourceDir,
+      extensions: FILE_EXTENSIONS
+    }, babelConfig);
+  }));
   results.forEach((result) => {
     if (result.code === 1) {
       throw new Error(result.message);
     }
   });
 };
-export {
-  compileByBabel,
-  existTsConfigFile,
-  getBabelConfig,
-  readTsConfig,
-  resolveBabelConfig
-};

package/dist/esm-node/compilers/typescript/index.js

@@ -4,24 +4,26 @@ import ts from "typescript";
 import { TypescriptLoader } from "./typescriptLoader";
 import { tsconfigPathsBeforeHookFactory } from "./tsconfigPathsPlugin";
 const readTsConfigByFile = (tsConfigFile) => {
-  const parsedCmd = ts.getParsedCommandLineOfConfigFile(
-    tsConfigFile,
-    void 0,
-    ts.sys
-  );
+  const parsedCmd = ts.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, ts.sys);
   const { options, fileNames, projectReferences } = parsedCmd;
-  return { options, fileNames, projectReferences };
+  return {
+    options,
+    fileNames,
+    projectReferences
+  };
 };
 const copyFiles = async (from, to, appDirectory, tsconfigPath) => {
   if (await fs.pathExists(from)) {
     const relativePath = path.relative(appDirectory, from);
     const targetDir = path.join(to, relativePath);
     await fs.copy(from, targetDir, {
-      filter: (src) => ![".ts"].includes(path.extname(src)) && src !== tsconfigPath
+      filter: (src) => ![
+        ".ts"
+      ].includes(path.extname(src)) && src !== tsconfigPath
     });
   }
 };
-const compileByTs = async (appDirectory, config, compileOptions) => {
+export const compileByTs = async (appDirectory, config, compileOptions) => {
   logger.info(`Running ts compile...`);
   const { sourceDirs, distDir, tsconfigPath } = compileOptions;
   if (!tsconfigPath) {
@@ -39,9 +41,7 @@ const compileByTs = async (appDirectory, config, compileOptions) => {
   });
   const { paths = {}, absoluteBaseUrl = "./" } = aliasOption;
   const { options, fileNames, projectReferences } = readTsConfigByFile(tsconfigPath);
-  const sourcePosixPaths = sourceDirs.map(
-    (sourceDir) => sourceDir.split(path.sep).join(path.posix.sep)
-  );
+  const sourcePosixPaths = sourceDirs.map((sourceDir) => sourceDir.split(path.sep).join(path.posix.sep));
   const rootNames = fileNames.filter((fileName) => {
     return fileName.endsWith(".d.ts") || sourcePosixPaths.some((sourceDir) => {
       return fileName.includes(sourceDir);
@@ -56,23 +56,18 @@ const compileByTs = async (appDirectory, config, compileOptions) => {
       ...options
     }
   });
-  const tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(
-    ts2,
-    absoluteBaseUrl,
-    paths
-  );
+  const tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(ts2, absoluteBaseUrl, paths);
   const emitResult = program.emit(void 0, void 0, void 0, void 0, {
-    before: [tsconfigPathsPlugin]
+    before: [
+      tsconfigPathsPlugin
+    ]
   });
   const allDiagnostics = ts2.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
   const { noEmitOnError } = options;
   if (allDiagnostics.length > 0) {
-    logger.error(
-      ts2.formatDiagnosticsWithColorAndContext(
-        [...new Set(allDiagnostics)],
-        formatHost
-      )
-    );
+    logger.error(ts2.formatDiagnosticsWithColorAndContext([
+      ...new Set(allDiagnostics)
+    ], formatHost));
     if (typeof noEmitOnError === "undefined" || noEmitOnError === true) {
       process.exit(1);
     }
@@ -89,6 +84,3 @@ const getFormatHost = (ts2) => {
     getNewLine: () => ts2.sys.newLine
   };
 };
-export {
-  compileByTs
-};

package/dist/esm-node/compilers/typescript/tsconfigPathsPlugin.js

@@ -16,10 +16,16 @@ const createAliasMatcher = (baseUrl, alias) => {
     if (isRegExpKey(key)) {
       const regexp = new RegExp(key);
       const aliasPath = resolveAliasPath(baseUrl, alias[key]);
-      o.push([regexp, aliasPath]);
+      o.push([
+        regexp,
+        aliasPath
+      ]);
     } else {
       const aliasPath = resolveAliasPath(baseUrl, alias[key]);
-      o.push([key, aliasPath]);
+      o.push([
+        key,
+        aliasPath
+      ]);
     }
     return o;
   }, []);
@@ -45,7 +51,7 @@ const createAliasMatcher = (baseUrl, alias) => {
 const isDynamicImport = (tsBinary, node) => {
   return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
 };
-function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
+export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   const tsPaths = {};
   const alias = {};
   Object.keys(paths).forEach((key) => {
@@ -56,14 +62,11 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
     }
   });
   const matchAliasPath = createAliasMatcher(baseUrl, alias);
-  const matchTsPath = createMatchPath(baseUrl, tsPaths, ["main"]);
+  const matchTsPath = createMatchPath(baseUrl, tsPaths, [
+    "main"
+  ]);
   const matchPath = (requestedModule, readJSONSync, fileExists, extensions) => {
-    const result = matchTsPath(
-      requestedModule,
-      readJSONSync,
-      fileExists,
-      extensions
-    );
+    const result = matchTsPath(requestedModule, readJSONSync, fileExists, extensions);
     if (result) {
       return result;
     }
@@ -75,36 +78,25 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   return (ctx) => {
     return (sf) => {
       const visitNode = (node) => {
-        var _a;
         if (isDynamicImport(tsBinary, node)) {
           const importPathWithQuotes = node.arguments[0].getText(sf);
-          const text = importPathWithQuotes.slice(
-            1,
-            importPathWithQuotes.length - 1
-          );
+          const text = importPathWithQuotes.slice(1, importPathWithQuotes.length - 1);
           const result = getNotAliasedPath(sf, matchPath, text);
           if (!result) {
             return node;
           }
-          return tsBinary.factory.updateCallExpression(
-            node,
-            node.expression,
-            node.typeArguments,
-            tsBinary.factory.createNodeArray([
-              tsBinary.factory.createStringLiteral(result)
-            ])
-          );
+          return tsBinary.factory.updateCallExpression(node, node.expression, node.typeArguments, tsBinary.factory.createNodeArray([
+            tsBinary.factory.createStringLiteral(result)
+          ]));
         }
         if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
           try {
-            const importPathWithQuotes = (_a = node == null ? void 0 : node.moduleSpecifier) == null ? void 0 : _a.getText();
+            var _node_moduleSpecifier;
+            const importPathWithQuotes = node === null || node === void 0 ? void 0 : (_node_moduleSpecifier = node.moduleSpecifier) === null || _node_moduleSpecifier === void 0 ? void 0 : _node_moduleSpecifier.getText();
             if (!importPathWithQuotes) {
               return node;
             }
-            const text = importPathWithQuotes.substring(
-              1,
-              importPathWithQuotes.length - 1
-            );
+            const text = importPathWithQuotes.substring(1, importPathWithQuotes.length - 1);
             const result = getNotAliasedPath(sf, matchPath, text);
             if (!result) {
               return node;
@@ -113,22 +105,9 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
             moduleSpecifier.parent = node.moduleSpecifier.parent;
             let newNode;
             if (tsBinary.isImportDeclaration(node)) {
-              newNode = tsBinary.factory.updateImportDeclaration(
-                node,
-                node.modifiers,
-                node.importClause,
-                moduleSpecifier,
-                node.assertClause
-              );
+              newNode = tsBinary.factory.updateImportDeclaration(node, node.modifiers, node.importClause, moduleSpecifier, node.assertClause);
             } else {
-              newNode = tsBinary.factory.updateExportDeclaration(
-                node,
-                node.modifiers,
-                node.isTypeOnly,
-                node.exportClause,
-                moduleSpecifier,
-                node.assertClause
-              );
+              newNode = tsBinary.factory.updateExportDeclaration(node, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
             }
             newNode.flags = node.flags;
             return newNode;
@@ -159,7 +138,10 @@ function getNotAliasedPath(sf, matcher, text) {
     if (!result.startsWith(".") && !result.startsWith("..")) {
       try {
         const packagePath = require.resolve(result, {
-          paths: [process.cwd(), ...module.paths]
+          paths: [
+            process.cwd(),
+            ...module.paths
+          ]
         });
         if (packagePath) {
           return result;
@@ -169,7 +151,10 @@ function getNotAliasedPath(sf, matcher, text) {
     }
     try {
       const packagePath = require.resolve(text, {
-        paths: [process.cwd(), ...module.paths]
+        paths: [
+          process.cwd(),
+          ...module.paths
+        ]
       });
       if (packagePath) {
         return text;
@@ -180,6 +165,3 @@ function getNotAliasedPath(sf, matcher, text) {
   const resolvedPath = posix.relative(dirname(sf.fileName), result) || "./";
   return resolvedPath[0] === "." ? resolvedPath : `./${resolvedPath}`;
 }
-export {
-  tsconfigPathsBeforeHookFactory
-};

package/dist/esm-node/compilers/typescript/typescriptLoader.js

@@ -1,24 +1,36 @@
-class TypescriptLoader {
-  constructor({ appDirectory }) {
-    this.appDirectory = appDirectory;
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
   }
+  return obj;
+}
+export class TypescriptLoader {
   load() {
     if (this.tsBinary) {
       return this.tsBinary;
     }
     try {
       const tsPath = require.resolve("typescript", {
-        paths: [this.appDirectory || process.cwd()]
+        paths: [
+          this.appDirectory || process.cwd()
+        ]
       });
       const ts = require(tsPath);
       return ts;
     } catch (error) {
-      throw new Error(
-        'TypeScript could not be found! Please, install "typescript" package.'
-      );
+      throw new Error('TypeScript could not be found! Please, install "typescript" package.');
     }
   }
+  constructor({ appDirectory }) {
+    _define_property(this, "tsBinary", void 0);
+    _define_property(this, "appDirectory", void 0);
+    this.appDirectory = appDirectory;
+  }
 }
-export {
-  TypescriptLoader
-};

package/dist/esm-node/index.js

@@ -1,5 +1,2 @@
 export * from "./compilers/babel";
-import { compile } from "./common";
-export {
-  compile
-};
+export { compile } from "./common";

package/package.json

@@ -3,7 +3,11 @@
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/web-infra-dev/modern.js/issues",
-  "repository": "web-infra-dev/modern.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/web-infra-dev/modern.js",
+    "directory": "packages/server/utils"
+  },
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.15.0",
+  "version": "2.16.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -35,9 +39,9 @@
     "@babel/runtime": "^7.18.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "@modern-js/babel-compiler": "2.15.0",
-    "@modern-js/babel-preset-lib": "2.15.0",
-    "@modern-js/utils": "2.15.0"
+    "@modern-js/babel-compiler": "2.16.0",
+    "@modern-js/babel-preset-lib": "2.16.0",
+    "@modern-js/utils": "2.16.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -46,9 +50,9 @@
     "jest": "^29",
     "ts-jest": "^29.0.5",
     "typescript": "^4",
-    "@modern-js/server-core": "2.15.0",
-    "@scripts/build": "2.15.0",
-    "@scripts/jest-config": "2.15.0"
+    "@modern-js/server-core": "2.16.0",
+    "@scripts/build": "2.16.0",
+    "@scripts/jest-config": "2.16.0"
   },
   "sideEffects": false,
   "publishConfig": {