@modern-js/app-tools 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/js/treeshaking/builder/builderPlugins/compatModern.js

@@ -78,6 +78,11 @@ export var PluginCompatModern = function PluginCompatModern(appContext, modernCo
         chain.plugin('route-plugin').use(RouterPlugin, [{
           existNestedRoutes: existNestedRoutes
         }]);
+        if (target !== 'node') {
+          var bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
+          chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
+          chain.module.rule('bare-server-module').test(bareServerModuleReg).use('server-module-loader').loader(require.resolve("../loaders/serverModuleLoader"));
+        }
         function isHtmlEnabled(config, target) {
           var _config$tools;
           return ((_config$tools = config.tools) === null || _config$tools === void 0 ? void 0 : _config$tools.htmlPlugin) !== false && target !== 'node' && target !== 'web-worker';
@@ -109,7 +114,7 @@ function applyCallbacks(api, options) {
  */
 function applyNodeCompat(chain, modernConfig, isProd) {
   // apply node resolve extensions
-  for (var _i = 0, _arr = ['.node.js', '.node.jsx', '.node.ts', '.node.tsx']; _i < _arr.length; _i++) {
+  for (var _i = 0, _arr = ['.node.js', '.node.jsx', '.node.ts', '.node.tsx', '.server.js', '.server.ts', '.server.ts', '.server.tsx']; _i < _arr.length; _i++) {
     var ext = _arr[_i];
     chain.resolve.extensions.prepend(ext);
   }

package/dist/js/treeshaking/builder/index.js

@@ -54,6 +54,7 @@ function _createBuilderForEdenX() {
   return _createBuilderForEdenX.apply(this, arguments);
 }
 export function createBuilderProviderConfig(normalizedConfig, appContext) {
+  var _normalizedConfig$ser;
   var output = createOutputConfig(normalizedConfig, appContext);
   return _objectSpread(_objectSpread({}, normalizedConfig), {}, {
     source: _objectSpread(_objectSpread({}, normalizedConfig.source), {}, {
@@ -61,6 +62,7 @@ export function createBuilderProviderConfig(normalizedConfig, appContext) {
     }),
     output: output,
     dev: {
+      port: (_normalizedConfig$ser = normalizedConfig.server) === null || _normalizedConfig$ser === void 0 ? void 0 : _normalizedConfig$ser.port,
       https: normalizedConfig.dev.https,
       assetPrefix: normalizedConfig.dev.assetPrefix
     },
@@ -80,11 +82,7 @@ export function createBuilderProviderConfig(normalizedConfig, appContext) {
     return _objectSpread(_objectSpread({}, config.output), {}, {
       copy: builderCopy,
       // We need to do this in the app-tools prepare hook because some files will be generated into the dist directory in the analyze process
-      cleanDistPath: false,
-      // `@modern-js/webpack` used to generate asset manifest by default
-      enableAssetManifest: true,
-      // compatible the modern-js with fallback behavior
-      enableAssetFallback: true
+      cleanDistPath: false
     });
   }
 }

package/dist/js/treeshaking/builder/loaders/routerLoader.js

@@ -0,0 +1,14 @@
+function loader(source) {
+  // eslint-disable-next-line @babel/no-invalid-this
+  this.cacheable();
+  // eslint-disable-next-line @babel/no-invalid-this
+  var target = this._compiler.options.target;
+  if (target === 'node' || Array.isArray(target) && target.includes('node')) {
+    return source;
+  }
+  // eslint-disable-next-line @babel/no-invalid-this
+  var resourcePath = this.resourcePath;
+  var code = "\n    export { default } from \"".concat(resourcePath, "\";\n  ");
+  return code;
+}
+export default loader;

package/dist/js/treeshaking/builder/loaders/serverModuleLoader.js

@@ -0,0 +1,4 @@
+function loader() {
+  return "module.exports = {}";
+}
+export default loader;

package/dist/js/treeshaking/commands/dev.js

@@ -1,7 +1,6 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { logger } from '@modern-js/utils';
 import { ResolvedConfigContext } from '@modern-js/core';
 import { createFileWatcher } from "../utils/createFileWatcher";
 import { printInstructions } from "../utils/printInstructions";
@@ -12,7 +11,7 @@ import { buildServerConfig } from "../utils/config";
 export var dev = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(api, options) {
     var _normalizedConfig$too;
-    var normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, serverInternalPlugins, checkedEntries, compiler, app;
+    var normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, entrypoints, serverConfigFile, serverInternalPlugins, checkedEntries, compiler, serverOptions, app;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -52,48 +51,42 @@ export var dev = /*#__PURE__*/function () {
             _context2.next = 16;
             return hookRunners.beforeDev();
           case 16:
-            compiler = null;
-            if (apiOnly) {
-              _context2.next = 23;
+            if (!(!appContext.builder && !apiOnly)) {
+              _context2.next = 18;
               break;
             }
-            if (appContext.builder) {
-              _context2.next = 20;
+            throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
+          case 18:
+            if (apiOnly) {
+              _context2.next = 22;
               break;
             }
-            throw new Error('Expect the Builder to have been initialized, But the appContext.builder received `undefined`');
-          case 20:
-            _context2.next = 22;
+            _context2.next = 21;
             return appContext.builder.createCompiler();
-          case 22:
+          case 21:
             compiler = _context2.sent;
-          case 23:
-            _context2.next = 25;
+          case 22:
+            _context2.next = 24;
             return generateRoutes(appContext);
-          case 25:
-            _context2.next = 27;
-            return createServer({
-              dev: _objectSpread(_objectSpread({}, {
-                client: {
-                  port: port.toString()
-                },
-                devMiddleware: {
-                  writeToDisk: function writeToDisk(file) {
-                    return !file.includes('.hot-update.');
-                  }
-                },
-                hot: true,
-                liveReload: true,
+          case 24:
+            serverOptions = {
+              dev: _objectSpread({
                 port: port,
                 https: normalizedConfig.dev.https
-              }), (_normalizedConfig$too = normalizedConfig.tools) === null || _normalizedConfig$too === void 0 ? void 0 : _normalizedConfig$too.devServer),
-              compiler: compiler,
+              }, (_normalizedConfig$too = normalizedConfig.tools) === null || _normalizedConfig$too === void 0 ? void 0 : _normalizedConfig$too.devServer),
+              compiler: compiler || null,
               pwd: appDirectory,
               config: normalizedConfig,
               serverConfigFile: serverConfigFile,
               internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
-            });
-          case 27:
+            };
+            if (!apiOnly) {
+              _context2.next = 32;
+              break;
+            }
+            _context2.next = 28;
+            return createServer(serverOptions);
+          case 28:
             app = _context2.sent;
             app.listen(port, /*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(err) {
@@ -107,11 +100,7 @@ export var dev = /*#__PURE__*/function () {
                         }
                         throw err;
                       case 2:
-                        if (!apiOnly) {
-                          logger.info("Starting dev server...\n");
-                        } else {
-                          printInstructions(hookRunners, appContext, normalizedConfig);
-                        }
+                        printInstructions(hookRunners, appContext, normalizedConfig);
                       case 3:
                       case "end":
                         return _context.stop();
@@ -123,9 +112,19 @@ export var dev = /*#__PURE__*/function () {
                 return _ref2.apply(this, arguments);
               };
             }());
-            _context2.next = 31;
+            _context2.next = 34;
+            break;
+          case 32:
+            _context2.next = 34;
+            return appContext.builder.startDevServer({
+              compiler: compiler,
+              printURLs: false,
+              serverOptions: serverOptions
+            });
+          case 34:
+            _context2.next = 36;
             return createFileWatcher(appContext, normalizedConfig.source.configDir, hookRunners);
-          case 31:
+          case 36:
           case "end":
             return _context2.stop();
         }

package/dist/js/treeshaking/commands/start.js

@@ -24,7 +24,6 @@ export var start = /*#__PURE__*/function () {
             _context2.next = 10;
             return server({
               pwd: appDirectory,
-              // FIXME: remove the `any` type
               config: userConfig,
               serverConfigFile: serverConfigFile,
               internalPlugins: injectDataLoaderPlugin(appContext.serverInternalPlugins),

package/dist/js/treeshaking/config/default.js

@@ -33,7 +33,6 @@ export function createDefaultConfig(appContext) {
     disableFilenameHash: false,
     enableLatestDecorators: false,
     polyfill: 'entry',
-    dataUriLimit: 10000,
     cssModuleLocalIdentName: undefined
   };
   var html = {

package/dist/js/treeshaking/config/initial/createOutputConfig.js

@@ -61,6 +61,9 @@ export function createOutputConfig(config) {
       css: cssModuleLocalIdentName
     },
     ssg: ssg,
+    // set `true`, only in legacy config
+    enableAssetFallback: true,
+    enableAssetManifest: true,
     enableModernMode: enableModernMode,
     disableNodePolyfill: disableNodePolyfill
   };

package/dist/js/treeshaking/utils/createFileWatcher.js

@@ -16,7 +16,7 @@ var getPackageConfig = function getPackageConfig(appDirectory, packageJsonConfig
   var json = JSON.parse(fs.readFileSync(path.resolve(appDirectory, './package.json'), 'utf8'));
   return json[packageJsonConfig !== null && packageJsonConfig !== void 0 ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
 };
-var addServerConfigToDeps = /*#__PURE__*/function () {
+export var addServerConfigToDeps = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dependencies, appDirectory, serverConfigFile) {
     var serverConfig;
     return _regeneratorRuntime().wrap(function _callee$(_context) {

package/dist/js/treeshaking/utils/restart.js

@@ -19,7 +19,7 @@ function _restart() {
           case 4:
             _context.prev = 4;
             _context.next = 7;
-            return cli.init(cli.initOptions);
+            return cli.init(cli.getPrevInitOptions());
           case 7:
             _context.next = 13;
             break;

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

@@ -4,6 +4,8 @@ export declare const APP_FILE_NAME = "App";
 export declare const PAGES_DIR_NAME = "pages";
 export declare const NESTED_ROUTES_DIR = "routes";
 export declare const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+export declare const LOADER_EXPORT_NAME = "loader";
+export declare const TEMP_LOADERS_DIR = "__loaders__";
 export declare const ENTRY_POINT_FILE_NAME = "index.js";
 export declare const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
 export declare const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: RegExp;

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

@@ -27,22 +27,23 @@ export declare const html: (partials: {
 }) => string;
 export declare const routesForServer: ({
   routes,
-  alias
+  internalDirectory,
+  entryName
 }: {
   routes: (NestedRoute | PageRoute)[];
-  alias: {
-    name: string;
-    basename: string;
-  };
+  internalDirectory: string;
+  entryName: string;
 }) => string;
 export declare const fileSystemRoutes: ({
   routes,
   ssrMode,
   nestedRoutesEntry,
-  entryName
+  entryName,
+  internalDirectory
 }: {
   routes: RouteLegacy[] | (NestedRoute | PageRoute)[];
   ssrMode: 'string' | 'stream' | false;
   nestedRoutesEntry?: string | undefined;
   entryName: string;
-}) => string;
+  internalDirectory: string;
+}) => Promise<string>;

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

@@ -15,4 +15,12 @@ export declare const getDefaultImports: ({
   internalDirectory: string;
 }) => ImportStatement[];
 export declare const isRouteComponentFile: (filePath: string) => boolean;
-export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
+export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
+export declare const parseModule: ({
+  source,
+  filename
+}: {
+  source: string;
+  filename: string;
+}) => Promise<readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean]>;
+export declare const hasLoader: (filename: string) => Promise<boolean>;

package/dist/types/builder/loaders/routerLoader.d.ts

@@ -0,0 +1,3 @@
+import type { LoaderContext } from 'webpack';
+declare function loader(this: LoaderContext<void>, source: string): string;
+export default loader;

package/dist/types/builder/loaders/serverModuleLoader.d.ts

@@ -0,0 +1,3 @@
+import { LoaderContext } from 'webpack';
+declare function loader(this: LoaderContext<void>): string;
+export default loader;

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

@@ -1,5 +1,7 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 import type { JestConfig } from '@modern-js/core';
+import type { PluginSwcOptions } from '@modern-js/builder-plugin-swc';
+import type { PluginEsbuildOptions } from '@modern-js/builder-plugin-esbuild';
 export declare type BuilderToolsConfig = Required<BuilderConfig>['tools'];
 /**
  * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
@@ -10,6 +12,11 @@ export declare type Tailwindcss = Record<string, any> | ((options: Record<string
 export interface ToolsUserConfig extends BuilderToolsConfig {
   tailwindcss?: Tailwindcss;
   jest?: JestConfig | ((jestConfig: JestConfig) => JestConfig);
-  esbuild?: Record<string, unknown>;
+  esbuild?: PluginEsbuildOptions;
+  /**
+   * The configuration of `swc` is provided by `swc` plugin.
+   * @requires `swc` plugin
+   */
+  swc?: PluginSwcOptions;
 }
 export declare type ToolsNormalizedConfig = ToolsUserConfig;

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

@@ -1,6 +1,7 @@
 import type { webpack } from '@modern-js/builder-webpack-provider';
 import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow } from '@modern-js/plugin';
 import type { Entrypoint, HtmlPartials, NestedRoute, PageRoute, RouteLegacy, ServerRoute } from '@modern-js/types';
+import type { Stats, MultiStats } from '@modern-js/builder-shared';
 export interface ImportSpecifier {
   local?: string;
   imported?: string;
@@ -67,7 +68,7 @@ export declare type AppToolsHooks = {
     bundlerConfigs?: webpack.Configuration[];
   }, unknown>;
   afterBuild: AsyncWorkflow<{
-    stats?: webpack.Stats | webpack.MultiStats;
+    stats?: Stats | MultiStats;
   }, unknown>;
   beforeDeploy: AsyncWorkflow<Record<string, any>, unknown>;
   afterDeploy: AsyncWorkflow<Record<string, any>, unknown>;

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

@@ -1,3 +1,4 @@
-import { IAppContext, ToRunners } from '@modern-js/core';
+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/lib/types.d.ts

@@ -5,7 +5,7 @@
 
 declare namespace NodeJS {
   interface ProcessEnv {
-    readonly NODE_ENV: 'development' | 'production' | 'test';
+    NODE_ENV: 'development' | 'production' | 'test';
     readonly PUBLIC_URL: string;
   }
 }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -52,30 +52,32 @@
     }
   },
   "bin": {
-    "modern": "./bin/modern.js"
+    "modern": "./bin/modern.js",
+    "modern-app": "./bin/modern.js"
   },
   "dependencies": {
     "@babel/parser": "^7.18.0",
     "@babel/runtime": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
-    "@modern-js/builder": "2.0.0-beta.2",
-    "@modern-js/builder-plugin-esbuild": "2.0.0-beta.2",
-    "@modern-js/builder-plugin-node-polyfill": "2.0.0-beta.2",
-    "@modern-js/builder-shared": "2.0.0-beta.2",
-    "@modern-js/builder-webpack-provider": "2.0.0-beta.2",
-    "@modern-js/core": "2.0.0-beta.2",
-    "@modern-js/new-action": "2.0.0-beta.2",
-    "@modern-js/node-bundle-require": "2.0.0-beta.2",
-    "@modern-js/plugin": "2.0.0-beta.2",
-    "@modern-js/plugin-data-loader": "2.0.0-beta.2",
-    "@modern-js/plugin-i18n": "2.0.0-beta.2",
-    "@modern-js/plugin-lint": "2.0.0-beta.2",
-    "@modern-js/prod-server": "2.0.0-beta.2",
-    "@modern-js/server": "2.0.0-beta.2",
-    "@modern-js/types": "2.0.0-beta.2",
-    "@modern-js/upgrade": "2.0.0-beta.2",
-    "@modern-js/utils": "2.0.0-beta.2"
+    "es-module-lexer": "^1.1.0",
+    "@modern-js/builder": "2.0.0-beta.3",
+    "@modern-js/builder-plugin-esbuild": "2.0.0-beta.3",
+    "@modern-js/builder-plugin-node-polyfill": "2.0.0-beta.3",
+    "@modern-js/builder-shared": "2.0.0-beta.3",
+    "@modern-js/builder-webpack-provider": "2.0.0-beta.3",
+    "@modern-js/core": "2.0.0-beta.3",
+    "@modern-js/new-action": "2.0.0-beta.3",
+    "@modern-js/node-bundle-require": "2.0.0-beta.3",
+    "@modern-js/plugin": "2.0.0-beta.3",
+    "@modern-js/plugin-data-loader": "2.0.0-beta.3",
+    "@modern-js/plugin-i18n": "2.0.0-beta.3",
+    "@modern-js/plugin-lint": "2.0.0-beta.3",
+    "@modern-js/prod-server": "2.0.0-beta.3",
+    "@modern-js/server": "2.0.0-beta.3",
+    "@modern-js/types": "2.0.0-beta.3",
+    "@modern-js/upgrade": "2.0.0-beta.3",
+    "@modern-js/utils": "2.0.0-beta.3"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -84,9 +86,10 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/server-core": "2.0.0-beta.2",
-    "@scripts/build": "2.0.0-beta.2",
-    "@scripts/jest-config": "2.0.0-beta.2"
+    "@modern-js/builder-plugin-swc": "2.0.0-beta.3",
+    "@modern-js/server-core": "2.0.0-beta.3",
+    "@scripts/build": "2.0.0-beta.3",
+    "@scripts/jest-config": "2.0.0-beta.3"
   },
   "sideEffects": false,
   "publishConfig": {