@modern-js/app-tools 2.0.3-alpha.0 → 2.2.0

package/dist/js/treeshaking/utils/{createFileWatcher.js → generateWatchFiles.js}

@@ -147,10 +147,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import crypto from "crypto";
-import fs from "fs";
 import path from "path";
-import { isDev, chokidar, createDebugger, isTest, getServerConfig } from "@modern-js/utils";
+import { fs, getServerConfig } from "@modern-js/utils";
 var getPackageConfig = function(appDirectory, packageJsonConfig) {
     var PACKAGE_JSON_CONFIG_NAME = "modernConfig";
     var json = JSON.parse(fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8"));
@@ -181,29 +179,17 @@ var addServerConfigToDeps = function() {
         return _ref.apply(this, arguments);
     };
 }();
-var debug = createDebugger("watch-files");
-var md5 = function(data) {
-    return crypto.createHash("md5").update(data).digest("hex");
-};
-var hashMap = /* @__PURE__ */ new Map();
-var createFileWatcher = function() {
-    var _ref = _asyncToGenerator(function(appContext, configDir, hooksRunner) {
-        var appDirectory, configFile, extraFiles, configPath, dependencies, watched, watcher;
+function generateWatchFiles(appContext, configDir) {
+    return _generateWatchFiles.apply(this, arguments);
+}
+function _generateWatchFiles() {
+    _generateWatchFiles = _asyncToGenerator(function(appContext, configDir) {
+        var appDirectory, configFile, configPath, dependencies;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    if (!(isDev() || isTest())) return [
-                        3,
-                        3
-                    ];
                     appDirectory = appContext.appDirectory, configFile = appContext.configFile;
-                    return [
-                        4,
-                        hooksRunner.watchFiles()
-                    ];
-                case 1:
-                    extraFiles = _state.sent();
-                    configPath = path.join(appDirectory, configDir);
+                    configPath = path.join(appDirectory, configDir || "");
                     dependencies = getPackageConfig(appContext.appDirectory, appContext.packageName) ? [
                         path.resolve(appDirectory, "./package.json")
                     ] : [];
@@ -211,73 +197,18 @@ var createFileWatcher = function() {
                         4,
                         addServerConfigToDeps(dependencies, appContext.appDirectory, appContext.serverConfigFile)
                     ];
-                case 2:
+                case 1:
                     _state.sent();
-                    watched = [
-                        "".concat(configPath, "/html")
-                    ].concat(_toConsumableArray(extraFiles), _toConsumableArray(dependencies), [
-                        configFile
-                    ]).filter(Boolean);
-                    debug("watched: %o", watched);
-                    watcher = chokidar.watch(watched, {
-                        cwd: appDirectory,
-                        ignoreInitial: true,
-                        ignorePermissionErrors: true,
-                        ignored: [
-                            /node_modules/,
-                            "**/__test__/**",
-                            "**/*.test.(js|jsx|ts|tsx)",
-                            "**/*.spec.(js|jsx|ts|tsx)",
-                            "**/*.stories.(js|jsx|ts|tsx)"
-                        ]
-                    });
-                    watcher.on("change", function(changed) {
-                        var lastHash = hashMap.get(changed);
-                        var currentHash = md5(fs.readFileSync(path.join(appDirectory, changed), "utf8"));
-                        if (currentHash !== lastHash) {
-                            debug("file change: %s", changed);
-                            hashMap.set(changed, currentHash);
-                            hooksRunner.fileChange({
-                                filename: changed,
-                                eventType: "change"
-                            });
-                        }
-                    });
-                    watcher.on("add", function(name) {
-                        debug("add file: %s", name);
-                        var currentHash = md5(fs.readFileSync(path.join(appDirectory, name), "utf8"));
-                        hashMap.set(name, currentHash);
-                        hooksRunner.fileChange({
-                            filename: name,
-                            eventType: "add"
-                        });
-                    });
-                    watcher.on("unlink", function(name) {
-                        debug("remove file: %s", name);
-                        if (hashMap.has(name)) {
-                            hashMap.delete(name);
-                        }
-                        hooksRunner.fileChange({
-                            filename: name,
-                            eventType: "unlink"
-                        });
-                    });
-                    watcher.on("error", function(err) {
-                        throw err;
-                    });
                     return [
                         2,
-                        watcher
-                    ];
-                case 3:
-                    return [
-                        2
+                        [
+                            "".concat(configPath, "/html"),
+                            configFile || "./config"
+                        ].concat(_toConsumableArray(dependencies))
                     ];
             }
         });
     });
-    return function createFileWatcher(appContext, configDir, hooksRunner) {
-        return _ref.apply(this, arguments);
-    };
-}();
-export { addServerConfigToDeps, createFileWatcher };
+    return _generateWatchFiles.apply(this, arguments);
+}
+export { addServerConfigToDeps, generateWatchFiles };

package/dist/js/treeshaking/utils/{getSpecifiedEntries.js → getSelectedEntries.js}

@@ -122,8 +122,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { inquirer } from "@modern-js/utils";
-var getSpecifiedEntries = function() {
+import { chalk, inquirer } from "@modern-js/utils";
+import { i18n, localeKeys } from "../locale";
+var getSelectedEntries = function() {
     var _ref = _asyncToGenerator(function(entry, entrypoints) {
         var entryNames, selected;
         return __generator(this, function(_state) {
@@ -149,10 +150,10 @@ var getSpecifiedEntries = function() {
                                 type: "checkbox",
                                 name: "selected",
                                 choices: entryNames,
-                                message: "请选择需要构建的入口",
+                                message: i18n.t(localeKeys.command.dev.selectEntry),
                                 validate: function validate(answer) {
                                     if (answer.length < 1) {
-                                        return "You must choose at least one topping.";
+                                        return i18n.t(localeKeys.command.dev.requireEntry);
                                     }
                                     return true;
                                 }
@@ -168,7 +169,7 @@ var getSpecifiedEntries = function() {
                 case 2:
                     entry.forEach(function(name) {
                         if (!entryNames.includes(name)) {
-                            throw new Error("can not found entry ".concat(name, ", compiler entry should in ").concat(entryNames.join(", ")));
+                            throw new Error("Can not found entry ".concat(chalk.yellow(name), ", the entry should be one of ").concat(chalk.yellow(entryNames.join(", "))));
                         }
                     });
                     return [
@@ -178,8 +179,8 @@ var getSpecifiedEntries = function() {
             }
         });
     });
-    return function getSpecifiedEntries(entry, entrypoints) {
+    return function getSelectedEntries(entry, entrypoints) {
         return _ref.apply(this, arguments);
     };
 }();
-export { getSpecifiedEntries };
+export { getSelectedEntries };

package/dist/types/analyze/constants.d.ts

@@ -25,6 +25,6 @@ export declare const NESTED_ROUTE: {
   ERROR_FILE: string;
   LOADER_FILE: string;
 };
-export declare const APP_CONFIG_NAME = "appConfig";
+export declare const APP_CONFIG_NAME = "config";
 export declare const APP_INIT_EXPORTED = "init";
 export declare const APP_INIT_IMPORTED = "appInit";

package/dist/types/analyze/templates.d.ts

@@ -26,26 +26,20 @@ export declare const html: (partials: {
   body: string[];
 }) => string;
 export declare const routesForServer: ({
-  routes,
-  internalDirectory,
-  entryName
+  routes
 }: {
   routes: (NestedRoute | PageRoute)[];
-  internalDirectory: string;
-  entryName: string;
 }) => string;
 export declare const fileSystemRoutes: ({
   routes,
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory,
-  internalDirAlias
+  internalDirectory
 }: {
   routes: RouteLegacy[] | (NestedRoute | PageRoute)[];
   ssrMode: 'string' | 'stream' | false;
   nestedRoutesEntry?: string | undefined;
   entryName: string;
   internalDirectory: string;
-  internalDirAlias: string;
 }) => Promise<string>;

package/dist/types/analyze/utils.d.ts

@@ -15,7 +15,6 @@ export declare const getDefaultImports: ({
   internalDirectory: string;
 }) => ImportStatement[];
 export declare const isPageComponentFile: (filePath: string) => boolean;
-export declare const isNestedRouteComponent: (nestedRouteEntries: string[], absoluteFilePath: string) => boolean;
 export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
 export declare const parseModule: ({
   source,

package/dist/types/locale/en.d.ts

@@ -8,6 +8,8 @@ export declare const EN_LOCALE: {
       describe: string;
       entry: string;
       apiOnly: string;
+      selectEntry: string;
+      requireEntry: string;
     };
     build: {
       describe: string;

package/dist/types/locale/index.d.ts

@@ -10,6 +10,8 @@ declare const localeKeys: {
       describe: string;
       entry: string;
       apiOnly: string;
+      selectEntry: string;
+      requireEntry: string;
     };
     build: {
       describe: string;
@@ -44,6 +46,8 @@ declare const localeKeys: {
       describe: string;
       entry: string;
       apiOnly: string;
+      selectEntry: string;
+      requireEntry: string;
     };
     build: {
       describe: string;

package/dist/types/locale/zh.d.ts

@@ -8,6 +8,8 @@ export declare const ZH_LOCALE: {
       describe: string;
       entry: string;
       apiOnly: string;
+      selectEntry: string;
+      requireEntry: string;
     };
     build: {
       describe: string;

package/dist/types/types/config/dev.d.ts

@@ -1,7 +1,7 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 type BuilderDevConfig = Required<BuilderConfig>['dev'];
 export type DevProxyOptions = string | Record<string, string>;
-export interface DevUserConfig extends Omit<BuilderDevConfig, 'port'> {
+export interface DevUserConfig extends BuilderDevConfig {
   /**
    * The configuration of `dev.proxy` is provided by `proxy` plugin.
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.

package/dist/types/types/hooks.d.ts

@@ -76,11 +76,6 @@ export type AppToolsHooks = {
   }, unknown>;
   beforeDeploy: AsyncWorkflow<Record<string, any>, unknown>;
   afterDeploy: AsyncWorkflow<Record<string, any>, unknown>;
-  watchFiles: ParallelWorkflow<void>;
-  fileChange: AsyncWorkflow<{
-    filename: string;
-    eventType: 'add' | 'change' | 'unlink';
-  }, void>;
   beforeRestart: AsyncWorkflow<void, void>;
   registerDev: ParallelWorkflow<void, DevToolData>;
   beforeDevTask: ParallelWorkflow<DevToolData, void>;

package/dist/types/utils/generateWatchFiles.d.ts

@@ -0,0 +1,3 @@
+import { IAppContext } from '../types';
+export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
+export declare function generateWatchFiles(appContext: IAppContext, configDir?: string): Promise<string[]>;

package/dist/types/utils/getSelectedEntries.d.ts

@@ -0,0 +1,6 @@
+import { Entrypoint } from '@modern-js/types';
+/**
+ * Allow user to select entrypoints to build.
+ */
+
+export declare const getSelectedEntries: (entry: string[] | boolean, entrypoints: Entrypoint[]) => Promise<string[]>;

package/lib/types.d.ts

@@ -98,8 +98,12 @@ declare module '*.svg?inline' {
     React.SVGProps<SVGSVGElement>
   >;
 
-  const src: string;
-  export default src;
+  /**
+   * The default export type depends on the svgDefaultExport config,
+   * it can be a string or a ReactComponent
+   * */
+  const content: any;
+  export default content;
 }
 
 declare module '*.bmp?url' {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.3-alpha.0",
+  "version": "2.2.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -63,37 +63,37 @@
     "@babel/runtime": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
-    "@modern-js/builder": "2.0.2",
-    "@modern-js/builder-plugin-esbuild": "2.0.2",
-    "@modern-js/builder-plugin-node-polyfill": "2.0.2",
-    "@modern-js/builder-shared": "2.0.2",
-    "@modern-js/builder-webpack-provider": "2.0.2",
-    "@modern-js/core": "2.0.2",
-    "@modern-js/new-action": "2.0.2",
-    "@modern-js/node-bundle-require": "2.0.2",
-    "@modern-js/plugin": "2.0.2",
-    "@modern-js/plugin-data-loader": "2.0.3-alpha.0",
-    "@modern-js/plugin-i18n": "2.0.2",
-    "@modern-js/plugin-lint": "2.0.2",
-    "@modern-js/prod-server": "2.0.2",
-    "@modern-js/server": "2.0.2",
-    "@modern-js/types": "2.0.2",
-    "@modern-js/upgrade": "2.0.2",
-    "@modern-js/utils": "2.0.2",
     "es-module-lexer": "^1.1.0",
-    "esbuild": "0.15.7"
+    "esbuild": "0.15.7",
+    "@modern-js/builder": "2.2.0",
+    "@modern-js/builder-plugin-esbuild": "2.2.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.2.0",
+    "@modern-js/builder-shared": "2.2.0",
+    "@modern-js/builder-webpack-provider": "2.2.0",
+    "@modern-js/core": "2.2.0",
+    "@modern-js/new-action": "2.2.0",
+    "@modern-js/node-bundle-require": "2.2.0",
+    "@modern-js/plugin": "2.2.0",
+    "@modern-js/plugin-data-loader": "2.2.0",
+    "@modern-js/plugin-i18n": "2.2.0",
+    "@modern-js/plugin-lint": "2.2.0",
+    "@modern-js/prod-server": "2.2.0",
+    "@modern-js/server": "2.2.0",
+    "@modern-js/types": "2.2.0",
+    "@modern-js/upgrade": "2.2.0",
+    "@modern-js/utils": "2.2.0"
   },
   "devDependencies": {
-    "@modern-js/builder-plugin-swc": "2.0.2",
-    "@modern-js/server-core": "2.0.2",
-    "@scripts/build": "2.0.2",
-    "@scripts/jest-config": "2.0.2",
     "@types/babel__traverse": "^7.14.2",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "webpack": "^5.75.0"
+    "webpack": "^5.75.0",
+    "@modern-js/builder-plugin-swc": "2.2.0",
+    "@modern-js/server-core": "2.2.0",
+    "@scripts/jest-config": "2.2.0",
+    "@scripts/build": "2.2.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/js/modern/utils/createFileWatcher.js

@@ -1,115 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import crypto from "crypto";
-import fs from "fs";
-import path from "path";
-import {
-  isDev,
-  chokidar,
-  createDebugger,
-  isTest,
-  getServerConfig
-} from "@modern-js/utils";
-const getPackageConfig = (appDirectory, packageJsonConfig) => {
-  const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
-  const json = JSON.parse(
-    fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8")
-  );
-  return json[packageJsonConfig != null ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
-};
-const addServerConfigToDeps = (dependencies, appDirectory, serverConfigFile) => __async(void 0, null, function* () {
-  const serverConfig = yield getServerConfig(appDirectory, serverConfigFile);
-  if (serverConfig) {
-    dependencies.push(serverConfig);
-  }
-});
-const debug = createDebugger("watch-files");
-const md5 = (data) => crypto.createHash("md5").update(data).digest("hex");
-const hashMap = /* @__PURE__ */ new Map();
-const createFileWatcher = (appContext, configDir, hooksRunner) => __async(void 0, null, function* () {
-  if (isDev() || isTest()) {
-    const { appDirectory, configFile } = appContext;
-    const extraFiles = yield hooksRunner.watchFiles();
-    const configPath = path.join(appDirectory, configDir);
-    const dependencies = getPackageConfig(
-      appContext.appDirectory,
-      appContext.packageName
-    ) ? [path.resolve(appDirectory, "./package.json")] : [];
-    yield addServerConfigToDeps(
-      dependencies,
-      appContext.appDirectory,
-      appContext.serverConfigFile
-    );
-    const watched = [
-      `${configPath}/html`,
-      ...extraFiles,
-      ...dependencies,
-      configFile
-    ].filter(Boolean);
-    debug(`watched: %o`, watched);
-    const watcher = chokidar.watch(watched, {
-      cwd: appDirectory,
-      ignoreInitial: true,
-      ignorePermissionErrors: true,
-      ignored: [
-        /node_modules/,
-        "**/__test__/**",
-        "**/*.test.(js|jsx|ts|tsx)",
-        "**/*.spec.(js|jsx|ts|tsx)",
-        "**/*.stories.(js|jsx|ts|tsx)"
-      ]
-    });
-    watcher.on("change", (changed) => {
-      const lastHash = hashMap.get(changed);
-      const currentHash = md5(
-        fs.readFileSync(path.join(appDirectory, changed), "utf8")
-      );
-      if (currentHash !== lastHash) {
-        debug(`file change: %s`, changed);
-        hashMap.set(changed, currentHash);
-        hooksRunner.fileChange({ filename: changed, eventType: "change" });
-      }
-    });
-    watcher.on("add", (name) => {
-      debug(`add file: %s`, name);
-      const currentHash = md5(
-        fs.readFileSync(path.join(appDirectory, name), "utf8")
-      );
-      hashMap.set(name, currentHash);
-      hooksRunner.fileChange({ filename: name, eventType: "add" });
-    });
-    watcher.on("unlink", (name) => {
-      debug(`remove file: %s`, name);
-      if (hashMap.has(name)) {
-        hashMap.delete(name);
-      }
-      hooksRunner.fileChange({ filename: name, eventType: "unlink" });
-    });
-    watcher.on("error", (err) => {
-      throw err;
-    });
-    return watcher;
-  }
-});
-export {
-  addServerConfigToDeps,
-  createFileWatcher
-};

package/dist/types/utils/createFileWatcher.d.ts

@@ -1,4 +0,0 @@
-import type { IAppContext, ToRunners } from '@modern-js/core';
-import { AppToolsHooks } from '../types/hooks';
-export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
-export declare const createFileWatcher: (appContext: IAppContext, configDir: string | undefined, hooksRunner: ToRunners<AppToolsHooks>) => Promise<import("@modern-js/utils").FSWatcher | undefined>;

package/dist/types/utils/getSpecifiedEntries.d.ts

@@ -1,2 +0,0 @@
-import { Entrypoint } from '@modern-js/types';
-export declare const getSpecifiedEntries: (entry: string[] | boolean, entrypoints: Entrypoint[]) => Promise<string[]>;