@modern-js/app-tools 1.4.4 → 1.4.7-canary.0

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @modern-js/app-tools
 
+## 1.4.6
+
+### Patch Changes
+
+- 8491b6dd: fix: optimise "types" exports from plugin
+- Updated dependencies [bebb39b6]
+- Updated dependencies [4b4e73b7]
+- Updated dependencies [da60172c]
+- Updated dependencies [ef28a4e6]
+- Updated dependencies [6cff93dc]
+- Updated dependencies [132f7b53]
+- Updated dependencies [ff73a5cc]
+- Updated dependencies [9d4a005b]
+  - @modern-js/plugin-analyze@1.3.5
+  - @modern-js/plugin-fast-refresh@1.2.3
+  - @modern-js/webpack@1.5.3
+  - @modern-js/prod-server@1.0.6
+  - @modern-js/server@1.4.9
+  - @modern-js/core@1.6.1
+  - @modern-js/types@1.3.6
+  - @modern-js/utils@1.3.7
+
+## 1.4.5
+
+### Patch Changes
+
+- 32c9772c: feat: convert to new plugin
+- Updated dependencies [05ce88a0]
+- Updated dependencies [a8df060e]
+- Updated dependencies [c2046f37]
+- Updated dependencies [dc88abf9]
+- Updated dependencies [d2d0fa11]
+- Updated dependencies [66cbef42]
+- Updated dependencies [0462ff77]
+- Updated dependencies [61e3f623]
+- Updated dependencies [6a7acb81]
+- Updated dependencies [681a1ff9]
+- Updated dependencies [4e2026e4]
+  - @modern-js/core@1.6.0
+  - @modern-js/server@1.4.8
+  - @modern-js/utils@1.3.6
+  - @modern-js/plugin@1.3.2
+  - @modern-js/prod-server@1.0.5
+  - @modern-js/webpack@1.5.0
+  - @modern-js/plugin-fast-refresh@1.2.2
+  - @modern-js/plugin-analyze@1.3.4
+
 ## 1.4.4
 
 ### Patch Changes

package/dist/js/modern/commands/build.js

@@ -6,32 +6,32 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { webpack } from 'webpack';
 import { WebpackConfigTarget, getWebpackConfig } from '@modern-js/webpack';
-import { useAppContext, useResolvedConfigContext, mountHook, ResolvedConfigContext, manager } from '@modern-js/core';
+import { manager, ResolvedConfigContext } from '@modern-js/core';
 import { formatWebpackMessages, measureFileSizesBeforeBuild, printFileSizesAfterBuild, printBuildError, logger, isUseSSRBundle, emptyDir } from '@modern-js/utils';
 import { generateRoutes } from "../utils/routes";
+import { buildServerConfig, emitResolvedConfig } from "../utils/config";
 // These sizes are pretty large. We'll warn for bundles exceeding them.
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
 const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024; // eslint-disable-next-line max-statements
 
-export const build = async options => {
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const resolvedConfig = useResolvedConfigContext();
-  const appContext = useAppContext();
+export const build = async (api, options) => {
+  const resolvedConfig = api.useResolvedConfigContext();
+  const appContext = api.useAppContext();
+  const hookRunners = api.useHookRunners();
   const {
     existSrc
   } = appContext;
-  /* eslint-enable react-hooks/rules-of-hooks */
 
   if (!existSrc) {
     const {
       distDirectory
     } = appContext;
     await emptyDir(distDirectory);
-    await mountHook().beforeBuild({
+    await hookRunners.beforeBuild({
       webpackConfigs: []
     });
     await generateRoutes(appContext);
-    await mountHook().afterBuild();
+    await hookRunners.afterBuild();
     return;
   }
 
@@ -92,10 +92,13 @@ export const build = async options => {
     }));
   });
   const {
-    distDirectory
+    distDirectory,
+    appDirectory,
+    serverConfigFile
   } = appContext;
   const previousFileSizes = await measureFileSizesBeforeBuild(distDirectory);
   await emptyDir(distDirectory);
+  await buildServerConfig(appDirectory, serverConfigFile);
   const buildConfigs = [];
   buildConfigs.push({
     type: 'legacy',
@@ -116,7 +119,7 @@ export const build = async options => {
     });
   }
 
-  await mountHook().beforeBuild({
+  await hookRunners.beforeBuild({
     webpackConfigs: buildConfigs.map(({
       config
     }) => config)
@@ -138,5 +141,6 @@ export const build = async options => {
   }
 
   await generateRoutes(appContext);
-  await mountHook().afterBuild();
+  await hookRunners.afterBuild();
+  await emitResolvedConfig(appDirectory, resolvedConfig);
 };

package/dist/js/modern/commands/deploy.js

@@ -1,5 +1,5 @@
-import { mountHook } from '@modern-js/core';
-export const deploy = async options => {
-  await mountHook().beforeDeploy(options);
-  await mountHook().afterDeploy(options);
+export const deploy = async (api, options) => {
+  const hookRunners = api.useHookRunners();
+  await hookRunners.beforeDeploy(options);
+  await hookRunners.afterDeploy(options);
 };

package/dist/js/modern/commands/dev.js

@@ -5,32 +5,36 @@ 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 { fs, logger, HMR_SOCK_PATH, clearConsole, chalk, isSSR } from '@modern-js/utils';
-import { useAppContext, useResolvedConfigContext, mountHook, AppContext } from '@modern-js/core';
 import { createCompiler } from "../utils/createCompiler";
 import { createServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { printInstructions } from "../utils/printInstructions";
 import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
-export const dev = async options => {
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const appContext = useAppContext();
-  const userConfig = useResolvedConfigContext();
-  /* eslint-enable react-hooks/rules-of-hooks */
-
+import { buildServerConfig } from "../utils/config";
+export const dev = async (api, options) => {
+  const appContext = api.useAppContext();
+  const userConfig = api.useResolvedConfigContext();
+  const hookRunners = api.useHookRunners();
   const {
     appDirectory,
     distDirectory,
     port,
     existSrc,
-    entrypoints
+    entrypoints,
+    serverConfigFile
   } = appContext;
   const checkedEntries = await getSpecifiedEntries(options.entry || false, entrypoints);
-  AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
+  api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
     checkedEntries
   }));
   appContext.checkedEntries = checkedEntries;
   fs.emptyDirSync(distDirectory);
-  await mountHook().beforeDev();
+  await buildServerConfig(appDirectory, serverConfigFile, {
+    esbuildOptions: {
+      watch: true
+    }
+  });
+  await hookRunners.beforeDev();
   let compiler = null;
 
   if (existSrc) {
@@ -40,6 +44,7 @@ export const dev = async options => {
     } = await import('@modern-js/webpack');
     const webpackConfigs = [isSSR(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE), getWebpackConfig(WebpackConfigTarget.CLIENT)].filter(Boolean);
     compiler = await createCompiler({
+      api,
       webpackConfigs,
       userConfig,
       appContext
@@ -68,6 +73,7 @@ export const dev = async options => {
     compiler,
     pwd: appDirectory,
     config: userConfig,
+    serverConfigFile,
     plugins: appContext.plugins.filter(p => p.server).map(p => p.server)
   });
   app.listen(port, async err => {
@@ -79,7 +85,7 @@ export const dev = async options => {
       clearConsole();
       logger.log(chalk.cyan(`Starting the development server...`));
     } else {
-      await printInstructions(appContext, userConfig);
+      await printInstructions(hookRunners, appContext, userConfig);
     }
   });
 };

package/dist/js/modern/commands/start.js

@@ -1,28 +1,27 @@
 import { logger, chalk } from '@modern-js/utils';
-import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
 import server from '@modern-js/prod-server';
 import { printInstructions } from "../utils/printInstructions";
-export const start = async () => {
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const appContext = useAppContext();
-  const userConfig = useResolvedConfigContext();
-  /* eslint-enable react-hooks/rules-of-hooks */
-
+export const start = async api => {
+  const appContext = api.useAppContext();
+  const userConfig = api.useResolvedConfigContext();
+  const hookRunners = api.useHookRunners();
   const {
     appDirectory,
-    port
+    port,
+    serverConfigFile
   } = appContext;
   logger.log(chalk.cyan(`Starting the modern server...`));
   const app = await server({
     pwd: appDirectory,
     config: userConfig,
-    plugins: appContext.plugins.filter(p => p.server).map(p => p.server)
+    plugins: appContext.plugins.filter(p => p.server).map(p => p.server),
+    serverConfigFile
   });
   app.listen(port, async err => {
     if (err) {
       throw err;
     }
 
-    await printInstructions(appContext, userConfig);
+    await printInstructions(hookRunners, appContext, userConfig);
   });
 };

package/dist/js/modern/exports/server.js

@@ -0,0 +1 @@
+export { defineServerConfig as defineConfig } from "../utils/config";

package/dist/js/modern/{lifecycle.js → hooks.js}

@@ -1,5 +1,4 @@
 import { createAsyncWaterfall, createAsyncWorkflow } from '@modern-js/plugin';
-import { registerHook } from '@modern-js/core';
 export const beforeDev = createAsyncWorkflow();
 export const afterDev = createAsyncWorkflow();
 export const beforeCreateCompiler = createAsyncWorkflow();
@@ -9,16 +8,14 @@ export const beforeBuild = createAsyncWorkflow();
 export const afterBuild = createAsyncWorkflow();
 export const beforeDeploy = createAsyncWorkflow();
 export const afterDeploy = createAsyncWorkflow();
-export const lifecycle = () => {
-  registerHook({
-    beforeDev,
-    afterDev,
-    beforeCreateCompiler,
-    afterCreateCompiler,
-    beforePrintInstructions,
-    beforeBuild,
-    afterBuild,
-    beforeDeploy,
-    afterDeploy
-  });
+export const hooks = {
+  beforeDev,
+  afterDev,
+  beforeCreateCompiler,
+  afterCreateCompiler,
+  beforePrintInstructions,
+  beforeBuild,
+  afterBuild,
+  beforeDeploy,
+  afterDeploy
 };

package/dist/js/modern/index.js

@@ -5,90 +5,91 @@ 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 * as path from 'path';
-import { createPlugin, defineConfig, usePlugins, cli, useAppContext } from '@modern-js/core';
+import { defineConfig, cli } from '@modern-js/core';
+import AnalyzePlugin from '@modern-js/plugin-analyze';
+import FastRefreshPlugin from '@modern-js/plugin-fast-refresh/cli';
 import { cleanRequireCache } from '@modern-js/utils';
-import { lifecycle } from "./lifecycle";
+import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
 import { start } from "./commands/start";
 import { dev } from "./commands/dev";
 import { closeServer } from "./utils/createServer";
-export { defineConfig }; // eslint-disable-next-line react-hooks/rules-of-hooks
+export { defineConfig };
+export default (() => ({
+  name: '@modern-js/app-tools',
+  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-fast-refresh', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-polyfill'],
+  registerHook: hooks,
+  usePlugins: [AnalyzePlugin(), FastRefreshPlugin()],
+  setup: api => {
+    const locale = getLocaleLanguage();
+    i18n.changeLanguage({
+      locale
+    });
+    return {
+      commands({
+        program
+      }) {
+        program.command('dev').usage('[options]').description(i18n.t(localeKeys.command.dev.describe)).option('-c --config <config>', i18n.t(localeKeys.command.dev.config)).option('-e --entry [entry...]', i18n.t(localeKeys.command.dev.entry)).action(async options => {
+          await dev(api, options);
+        });
+        program.command('build').usage('[options]').description(i18n.t(localeKeys.command.build.describe)).option('--analyze', i18n.t(localeKeys.command.build.analyze)).action(async options => {
+          const {
+            build
+          } = await import("./commands/build");
+          await build(api, options); // force exit after build.
+          // eslint-disable-next-line no-process-exit
 
-usePlugins([require.resolve('@modern-js/plugin-analyze/cli'), require.resolve('@modern-js/plugin-fast-refresh/cli')]);
-export default createPlugin(() => {
-  const locale = getLocaleLanguage();
-  i18n.changeLanguage({
-    locale
-  });
-  lifecycle();
-  return {
-    commands({
-      program
-    }) {
-      program.command('dev').usage('[options]').description(i18n.t(localeKeys.command.dev.describe)).option('-c --config <config>', i18n.t(localeKeys.command.dev.config)).option('-e --entry [entry...]', i18n.t(localeKeys.command.dev.entry)).action(async options => {
-        await dev(options);
-      });
-      program.command('build').usage('[options]').description(i18n.t(localeKeys.command.build.describe)).option('--analyze', i18n.t(localeKeys.command.build.analyze)).action(async options => {
-        const {
-          build
-        } = await import("./commands/build");
-        await build(options); // force exit after build.
-        // eslint-disable-next-line no-process-exit
+          process.exit(0);
+        });
+        program.command('start').usage('[options]').description(i18n.t(localeKeys.command.start.describe)).action(async () => {
+          await start(api);
+        });
+        program.command('deploy').usage('[options]').description(i18n.t(localeKeys.command.deploy.describe)).action(async options => {
+          const {
+            build
+          } = await import("./commands/build");
+          await build(api);
+          const {
+            deploy
+          } = await import("./commands/deploy");
+          await deploy(api, options); // eslint-disable-next-line no-process-exit
 
-        process.exit(0);
-      });
-      program.command('start').usage('[options]').description(i18n.t(localeKeys.command.start.describe)).action(async () => {
-        await start();
-      });
-      program.command('deploy').usage('[options]').description(i18n.t(localeKeys.command.deploy.describe)).action(async options => {
-        const {
-          build
-        } = await import("./commands/build");
-        await build();
-        const {
-          deploy
-        } = await import("./commands/deploy");
-        await deploy(options); // eslint-disable-next-line no-process-exit
+          process.exit(0);
+        });
+        program.command('new').usage('[options]').description(i18n.t(localeKeys.command.new.describe)).option('-d, --debug', i18n.t(localeKeys.command.new.debug), false).option('-c, --config <config>', i18n.t(localeKeys.command.new.config)).option('--dist-tag <tag>', i18n.t(localeKeys.command.new.distTag)).option('--registry', i18n.t(localeKeys.command.new.registry)).action(async options => {
+          const {
+            MWANewAction
+          } = await import('@modern-js/new-action');
+          await MWANewAction(_objectSpread(_objectSpread({}, options), {}, {
+            locale
+          }));
+        });
+      },
 
-        process.exit(0);
-      });
-      program.command('new').usage('[options]').description(i18n.t(localeKeys.command.new.describe)).option('-d, --debug', i18n.t(localeKeys.command.new.debug), false).option('-c, --config <config>', i18n.t(localeKeys.command.new.config)).option('--dist-tag <tag>', i18n.t(localeKeys.command.new.distTag)).option('--registry', i18n.t(localeKeys.command.new.registry)).action(async options => {
+      // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
+      async fileChange(e) {
         const {
-          MWANewAction
-        } = await import('@modern-js/new-action');
-        await MWANewAction(_objectSpread(_objectSpread({}, options), {}, {
-          locale
-        }));
-      });
-    },
-
-    // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
-    async fileChange(e) {
-      const {
-        filename,
-        eventType
-      } = e; // eslint-disable-next-line react-hooks/rules-of-hooks
+          filename,
+          eventType
+        } = e;
+        const appContext = api.useAppContext();
+        const {
+          appDirectory,
+          srcDirectory
+        } = appContext;
+        const absolutePath = path.resolve(appDirectory, filename);
 
-      const appContext = useAppContext();
-      const {
-        appDirectory,
-        srcDirectory
-      } = appContext;
-      const absolutePath = path.resolve(appDirectory, filename);
+        if (!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink')) {
+          await closeServer();
+          await cli.restart();
+        }
+      },
 
-      if (!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink')) {
-        await closeServer();
-        await cli.restart();
+      async beforeRestart() {
+        cleanRequireCache([require.resolve('@modern-js/plugin-analyze/cli'), require.resolve('@modern-js/plugin-fast-refresh/cli')]);
       }
-    },
 
-    async beforeRestart() {
-      cleanRequireCache([require.resolve('@modern-js/plugin-analyze/cli'), require.resolve('@modern-js/plugin-fast-refresh/cli')]);
-    }
-
-  };
-}, {
-  name: '@modern-js/app-tools',
-  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-fast-refresh', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-polyfill']
-});
+    };
+  }
+}));

package/dist/js/modern/utils/config.js

@@ -0,0 +1,53 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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 * as path from 'path';
+import { bundle } from '@modern-js/node-bundle-require';
+import { CONFIG_CACHE_DIR, CONFIG_FILE_EXTENSIONS, fs, getServerConfig, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
+export const defineServerConfig = config => config;
+export const buildServerConfig = async (appDirectory, configFile, options) => {
+  const configFilePath = await getServerConfig(appDirectory, configFile);
+
+  const getOutputFile = filepath => path.resolve(CONFIG_CACHE_DIR, `${filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
+
+  if (configFilePath) {
+    await bundle(configFilePath, _objectSpread(_objectSpread({}, options), {}, {
+      getOutputFile
+    }));
+  }
+};
+/**
+ *
+ * 处理循环引用的 replacer
+ */
+
+export const safeReplacer = () => {
+  const cache = [];
+  const keyCache = [];
+  return function (key, value) {
+    if (typeof value === 'object' && value !== null) {
+      const index = cache.indexOf(value);
+
+      if (index !== -1) {
+        return `[Circular ${keyCache[index]}]`;
+      }
+
+      cache.push(value);
+      keyCache.push(key || 'root');
+    }
+
+    return value;
+  };
+};
+export const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
+  var _resolvedConfig$outpu;
+
+  const outputPath = path.join(appDirectory, (resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$outpu = resolvedConfig.output) === null || _resolvedConfig$outpu === void 0 ? void 0 : _resolvedConfig$outpu.path) || './dist', OUTPUT_CONFIG_FILE);
+  await fs.writeJSON(outputPath, resolvedConfig, {
+    spaces: 2,
+    replacer: safeReplacer()
+  });
+};

package/dist/js/modern/utils/createCompiler.js

@@ -1,5 +1,4 @@
 import webpack from 'webpack';
-import { mountHook } from '@modern-js/core';
 import { chalk, logger, formatWebpackMessages, clearConsole } from '@modern-js/utils';
 import { printInstructions } from "./printInstructions";
 
@@ -10,17 +9,19 @@ const prettyTime = stats => {
 };
 
 export const createCompiler = async ({
+  api,
   webpackConfigs,
   // TODO: params
   userConfig,
   appContext
 }) => {
   try {
-    await mountHook().beforeCreateCompiler({
+    const hookRunners = api.useHookRunners();
+    await hookRunners.beforeCreateCompiler({
       webpackConfigs
     });
     const compiler = webpack(webpackConfigs);
-    await mountHook().afterCreateCompiler({
+    await hookRunners.afterCreateCompiler({
       compiler
     });
     let isFirstCompile = true;
@@ -46,7 +47,7 @@ export const createCompiler = async ({
         logger.log(errors.join('\n\n'));
         logger.log();
       } else if (process.stdout.isTTY || isFirstCompile) {
-        await mountHook().afterDev();
+        await hookRunners.afterDev();
 
         if (warnings.length) {
           logger.log(chalk.yellow(`Compiled with warnings.\n`));
@@ -56,9 +57,8 @@ export const createCompiler = async ({
           logger.log(chalk.green(`Compiled successfully in ${prettyTime(statsData)} ms.\n`));
         }
 
-        await printInstructions(appContext, userConfig);
-      } // eslint-disable-next-line require-atomic-updates
-
+        await printInstructions(hookRunners, appContext, userConfig);
+      }
 
       isFirstCompile = false;
     });

package/dist/js/modern/utils/createServer.js

@@ -10,8 +10,7 @@ export const closeServer = async () => {
 export const createServer = async options => {
   if (server) {
     await server.close();
-  } // eslint-disable-next-line require-atomic-updates
-
+  }
 
   server = new Server(options);
   const app = await server.init();

package/dist/js/modern/utils/printInstructions.js

@@ -1,6 +1,5 @@
 import { prettyInstructions, logger, isDev, chalk } from '@modern-js/utils';
-import { mountHook } from '@modern-js/core';
-export const printInstructions = async (appContext, config) => {
+export const printInstructions = async (hookRunners, appContext, config) => {
   let message = prettyInstructions(appContext, config);
   const {
     existSrc
@@ -13,7 +12,7 @@ export const printInstructions = async (appContext, config) => {
 
   const {
     instructions
-  } = await mountHook().beforePrintInstructions({
+  } = await hookRunners.beforePrintInstructions({
     instructions: message
   });
   logger.log(instructions);