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

package/dist/js/modern/config/default.js

@@ -0,0 +1,206 @@
+export function createDefaultConfig(appContext) {
+  const defaultAlias = appContext ? {
+    [appContext.internalDirAlias]: appContext.internalDirectory,
+    [appContext.internalSrcAlias]: appContext.srcDirectory,
+    '@': appContext.srcDirectory,
+    '@shared': appContext.sharedDirectory
+  } : {};
+  const source = {
+    entries: undefined,
+    enableAsyncEntry: false,
+    disableDefaultEntries: false,
+    entriesDir: './src',
+    configDir: './config',
+    globalVars: undefined,
+    moduleScopes: undefined,
+    include: [],
+    alias: defaultAlias
+  };
+  const output = {
+    assetPrefix: '/',
+    distPath: {
+      html: 'html',
+      js: 'static/js',
+      css: 'static/css',
+      media: 'static/media',
+      root: 'dist'
+    },
+    copy: undefined,
+    disableCssModuleExtension: false,
+    enableCssModuleTSDeclaration: false,
+    disableMinimize: false,
+    enableInlineStyles: false,
+    enableInlineScripts: false,
+    disableSourceMap: false,
+    disableInlineRuntimeChunk: false,
+    disableFilenameHash: false,
+    enableLatestDecorators: false,
+    polyfill: 'entry',
+    cssModuleLocalIdentName: undefined
+  };
+  const html = {
+    title: '',
+    titleByEntries: undefined,
+    meta: {
+      charset: {
+        charset: 'utf-8'
+      },
+      viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
+      'http-equiv': {
+        'http-equiv': 'x-ua-compatible',
+        content: 'ie=edge'
+      },
+      renderer: 'webkit',
+      layoutmode: 'standard',
+      imagemode: 'force',
+      'wap-font-scale': 'no',
+      'format-detection': 'telephone=no'
+    },
+    metaByEntries: undefined,
+    inject: 'head',
+    injectByEntries: undefined,
+    mountId: 'root',
+    favicon: '',
+    faviconByEntries: undefined,
+    disableHtmlFolder: false,
+    templateParameters: {},
+    templateParametersByEntries: undefined
+  };
+  const server = {
+    routes: undefined,
+    publicRoutes: undefined,
+    ssr: undefined,
+    ssrByEntries: undefined,
+    baseUrl: '/',
+    port: 8080
+  };
+  const dev = {
+    assetPrefix: false,
+    https: false
+  };
+  const tools = {
+    webpack: undefined,
+    babel: undefined,
+    postcss: undefined,
+    autoprefixer: undefined,
+    devServer: undefined,
+    tsLoader: undefined,
+    terser: undefined,
+    minifyCss: undefined
+  };
+  return {
+    source,
+    output,
+    server,
+    dev,
+    html,
+    tools,
+    plugins: [],
+    runtime: {},
+    runtimeByEntries: {}
+  };
+}
+export function createLegacyDefaultConfig(appContext) {
+  const defaultAlias = appContext ? {
+    [appContext.internalDirAlias]: appContext.internalDirectory,
+    [appContext.internalSrcAlias]: appContext.srcDirectory,
+    '@': appContext.srcDirectory,
+    '@shared': appContext.sharedDirectory
+  } : {};
+  const sourceDefaults = {
+    entries: undefined,
+    enableAsyncEntry: false,
+    disableDefaultEntries: false,
+    entriesDir: './src',
+    configDir: './config',
+    apiDir: './api',
+    envVars: [],
+    globalVars: undefined,
+    alias: defaultAlias,
+    moduleScopes: undefined,
+    include: []
+  };
+  const outputDefaults = {
+    assetPrefix: '/',
+    htmlPath: 'html',
+    jsPath: 'static/js',
+    cssPath: 'static/css',
+    mediaPath: 'static/media',
+    path: 'dist',
+    title: '',
+    titleByEntries: undefined,
+    meta: {
+      charset: {
+        charset: 'utf-8'
+      },
+      viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
+      'http-equiv': {
+        'http-equiv': 'x-ua-compatible',
+        content: 'ie=edge'
+      },
+      renderer: 'webkit',
+      layoutmode: 'standard',
+      imagemode: 'force',
+      'wap-font-scale': 'no',
+      'format-detection': 'telephone=no'
+    },
+    metaByEntries: undefined,
+    inject: 'head',
+    injectByEntries: undefined,
+    mountId: 'root',
+    favicon: '',
+    faviconByEntries: undefined,
+    copy: undefined,
+    disableHtmlFolder: false,
+    disableCssModuleExtension: false,
+    disableCssExtract: false,
+    enableCssModuleTSDeclaration: false,
+    disableMinimize: false,
+    enableInlineStyles: false,
+    enableInlineScripts: false,
+    disableSourceMap: false,
+    disableInlineRuntimeChunk: false,
+    disableAssetsCache: false,
+    enableLatestDecorators: false,
+    polyfill: 'entry',
+    dataUriLimit: 10000,
+    templateParameters: {},
+    templateParametersByEntries: undefined,
+    cssModuleLocalIdentName: undefined,
+    enableModernMode: false,
+    disableNodePolyfill: false,
+    enableTsLoader: false
+  };
+  const serverDefaults = {
+    routes: undefined,
+    publicRoutes: undefined,
+    ssr: undefined,
+    ssrByEntries: undefined,
+    baseUrl: '/',
+    port: 8080
+  };
+  const devDefaults = {
+    assetPrefix: false,
+    https: false
+  };
+  const toolsDefaults = {
+    webpack: undefined,
+    babel: undefined,
+    postcss: undefined,
+    autoprefixer: undefined,
+    lodash: undefined,
+    devServer: undefined,
+    tsLoader: undefined,
+    terser: undefined,
+    minifyCss: undefined
+  };
+  return {
+    source: sourceDefaults,
+    output: outputDefaults,
+    server: serverDefaults,
+    dev: devDefaults,
+    tools: toolsDefaults,
+    runtime: {},
+    runtimeByEntries: {}
+  };
+}

package/dist/js/modern/config/index.js

@@ -0,0 +1,2 @@
+export { createDefaultConfig, createLegacyDefaultConfig } from "./default";
+export { initialNormalizedConfig, checkIsLegacyConfig } from "./initial";

package/dist/js/modern/config/initial/createHtmlConfig.js

@@ -0,0 +1,32 @@
+export function createHtmlConfig(config) {
+  const {
+    disableHtmlFolder,
+    favicon,
+    faviconByEntries,
+    inject,
+    injectByEntries,
+    meta,
+    metaByEntries,
+    mountId,
+    title,
+    titleByEntries,
+    templateParameters,
+    templateParametersByEntries,
+    crossorigin
+  } = config.output;
+  return {
+    disableHtmlFolder,
+    favicon,
+    faviconByEntries,
+    inject,
+    injectByEntries,
+    meta,
+    metaByEntries,
+    mountId,
+    title,
+    titleByEntries,
+    crossorigin,
+    templateParameters,
+    templateParametersByEntries
+  };
+}

package/dist/js/modern/{builder → config/initial}/createOutputConfig.js

@@ -1,7 +1,4 @@
-import { createCopyPattern } from "./share";
-export function createOutputConfig(normalizedConfig, appContext) {
-  // TODO: add `externals` options in Modern.
-
+export function createOutputConfig(config) {
   const {
     assetPrefix,
     copy,
@@ -10,8 +7,10 @@ export function createOutputConfig(normalizedConfig, appContext) {
     jsPath,
     htmlPath,
     mediaPath,
+    enableTsLoader,
     path,
     disableInlineRuntimeChunk,
+    disableCssExtract,
     disableMinimize,
     disableSourceMap,
     disableTsChecker,
@@ -22,13 +21,14 @@ export function createOutputConfig(normalizedConfig, appContext) {
     dataUriLimit,
     disableAssetsCache,
     enableLatestDecorators,
-    disableCssModuleExtension
-  } = normalizedConfig.output;
-  const defaultCopyPattern = createCopyPattern(appContext, normalizedConfig, 'upload');
-  const builderCopy = copy ? [...copy, defaultCopyPattern] : [defaultCopyPattern];
+    disableCssModuleExtension,
+    ssg,
+    enableModernMode,
+    disableNodePolyfill
+  } = config.output;
   return {
     assetPrefix,
-    copy: builderCopy,
+    copy,
     distPath: {
       root: path,
       css: cssPath,
@@ -46,25 +46,26 @@ export function createOutputConfig(normalizedConfig, appContext) {
       font: dataUriLimit,
       media: dataUriLimit
     },
+    disableCssExtract,
     disableCssModuleExtension,
     disableInlineRuntimeChunk,
     disableMinimize,
     disableSourceMap,
-    disableTsChecker,
+    disableTsChecker: disableTsChecker || enableTsLoader,
     enableCssModuleTSDeclaration,
     enableInlineScripts,
     enableInlineStyles,
     polyfill,
-    // 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,
     disableFilenameHash: disableAssetsCache,
     enableLatestDecorators,
     filename: {
       css: cssModuleLocalIdentName
     },
-    // `@modern-js/webpack` used to generate asset manifest by default
+    ssg,
+    // set `true`, only in legacy config
+    enableAssetFallback: true,
     enableAssetManifest: true,
-    // compatible the modern-js with fallback behavior
-    enableAssetFallback: true
+    enableModernMode,
+    disableNodePolyfill
   };
 }

package/dist/js/modern/config/initial/createSourceConfig.js

@@ -0,0 +1,32 @@
+export function createSourceConfig(config) {
+  const {
+    alias,
+    envVars,
+    globalVars,
+    include,
+    moduleScopes,
+    preEntry,
+    entries,
+    enableAsyncEntry,
+    disableDefaultEntries,
+    entriesDir,
+    configDir
+  } = config.source;
+  const builderGlobalVars = globalVars || {};
+  for (const envVar of envVars || []) {
+    const envVarValue = process.env[envVar];
+    envVarValue && (builderGlobalVars[`process.env.${envVar}`] = envVarValue);
+  }
+  return {
+    alias,
+    moduleScopes,
+    globalVars: builderGlobalVars,
+    include,
+    preEntry,
+    entries,
+    enableAsyncEntry,
+    disableDefaultEntries,
+    entriesDir,
+    configDir
+  };
+}

package/dist/js/modern/config/initial/createToolsConfig.js

@@ -0,0 +1,41 @@
+export function createToolsConfig(config) {
+  const {
+    autoprefixer,
+    babel,
+    minifyCss,
+    terser,
+    webpack,
+    webpackChain,
+    tsLoader,
+    styledComponents,
+    sass,
+    postcss,
+    less,
+    htmlPlugin,
+    devServer,
+    tailwindcss,
+    jest,
+    esbuild
+  } = config.tools;
+  const {
+    enableTsLoader
+  } = config.output;
+  return {
+    tsLoader: enableTsLoader ? tsLoader : undefined,
+    autoprefixer,
+    babel,
+    minifyCss,
+    terser,
+    webpack,
+    webpackChain,
+    styledComponents,
+    sass,
+    postcss,
+    less,
+    htmlPlugin,
+    devServer,
+    tailwindcss,
+    jest,
+    esbuild
+  };
+}

package/dist/js/modern/config/initial/index.js

@@ -0,0 +1,11 @@
+import { initHtmlConfig, initSourceConfig, initToolsConfig } from "./inits";
+export { transformNormalizedConfig } from "./transformNormalizedConfig";
+export function checkIsLegacyConfig(config) {
+  return Boolean(config.legacy);
+}
+export function initialNormalizedConfig(config, appContext) {
+  initHtmlConfig(config, appContext);
+  initSourceConfig(config, appContext);
+  initToolsConfig(config);
+  return config;
+}

package/dist/js/modern/config/initial/inits.js

@@ -0,0 +1,117 @@
+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 path, { dirname, isAbsolute, posix, sep } from 'path';
+import { applyOptionsChain, findExists, findMonorepoRoot, globby, isModernjsMonorepo } from '@modern-js/utils';
+export function initHtmlConfig(config, appContext) {
+  const ICON_EXTENSIONS = ['png', 'jpg', 'jpeg', 'svg', 'ico'];
+  config.html.appIcon = createBuilderAppIcon(config, appContext);
+  config.html.favicon = createBuilderFavicon(config, appContext);
+  return config.html;
+  function createBuilderAppIcon(config, appContext) {
+    const {
+      configDir
+    } = config.source;
+    const appIcon = findExists(ICON_EXTENSIONS.map(ext => path.resolve(appContext.appDirectory, configDir || './config', `icon.${ext}`)));
+    return typeof appIcon === 'string' ? appIcon : undefined;
+  }
+  function createBuilderFavicon(config, appContext) {
+    const {
+      configDir
+    } = config.source;
+    const {
+      favicon
+    } = config.html;
+    const defaultFavicon = findExists(ICON_EXTENSIONS.map(ext => path.resolve(appContext.appDirectory, configDir || './config', `favicon.${ext}`)));
+    return favicon || defaultFavicon || undefined;
+  }
+}
+export function initSourceConfig(config, appContext) {
+  config.source.include = createBuilderInclude(config, appContext);
+  config.source.moduleScopes = createBuilderModuleScope(config);
+  function createBuilderInclude(config, appContext) {
+    const {
+      include
+    } = config.source;
+    const defaultInclude = [appContext.internalDirectory];
+    const transformInclude = (include || []).map(include => {
+      if (typeof include === 'string') {
+        if (isAbsolute(include)) {
+          return include;
+        }
+        return new RegExp(include);
+      }
+      return include;
+    }).concat(defaultInclude); // concat default Include
+
+    const root = findMonorepoRoot(appContext.appDirectory);
+    if (!root) {
+      return transformInclude;
+    }
+    const modernjsMonorepo = isModernjsMonorepo(root);
+    if (modernjsMonorepo) {
+      const paths = globby.sync(posix.join(root, 'features', '**', 'package.json'), {
+        ignore: ['**/node_modules/**/*']
+      }).map(pathname => dirname(pathname) + sep);
+      return [...paths, ...transformInclude];
+    }
+    return transformInclude;
+  }
+  function createBuilderModuleScope(config) {
+    const {
+      moduleScopes
+    } = config.source;
+    if (moduleScopes) {
+      let builderModuleScope = [];
+      const DEFAULT_SCOPES = ['./src', './shared', /node_modules/];
+      if (Array.isArray(moduleScopes)) {
+        if (isPrimitiveScope(moduleScopes)) {
+          builderModuleScope = DEFAULT_SCOPES.concat(moduleScopes);
+        } else {
+          builderModuleScope = [DEFAULT_SCOPES, ...moduleScopes];
+        }
+      } else {
+        builderModuleScope = [DEFAULT_SCOPES, moduleScopes];
+      }
+      return builderModuleScope;
+    } else {
+      return undefined;
+    }
+    function isPrimitiveScope(items) {
+      return items.every(item => typeof item === 'string' || Object.prototype.toString.call(item) === '[object RegExp]');
+    }
+  }
+}
+export function initToolsConfig(config) {
+  const defaultTsChecker = {
+    issue: {
+      include: [{
+        file: '**/src/**/*'
+      }],
+      exclude: [{
+        file: '**/*.(spec|test).ts'
+      }, {
+        file: '**/node_modules/**/*'
+      }]
+    }
+  };
+  const {
+    tsChecker,
+    tsLoader,
+    htmlPlugin
+  } = config.tools;
+  config.tools.tsChecker = applyOptionsChain(defaultTsChecker, tsChecker);
+  tsLoader && (config.tools.tsLoader = (tsLoaderConfig, utils) => {
+    applyOptionsChain(_objectSpread(_objectSpread({}, tsLoaderConfig), {}, {
+      transpileOnly: false,
+      allowTsInNodeModules: true
+    }), tsLoader || {}, utils);
+  });
+  config.tools.htmlPlugin = [config => _objectSpread(_objectSpread({}, config), {}, {
+    minify: typeof config.minify === 'object' ? _objectSpread(_objectSpread({}, config.minify), {}, {
+      removeComments: false
+    }) : config.minify
+  }),
+  // eslint-disable-next-line no-nested-ternary
+  ...(Array.isArray(htmlPlugin) ? htmlPlugin : htmlPlugin ? [htmlPlugin] : [])];
+}

package/dist/js/modern/config/initial/transformNormalizedConfig.js

@@ -0,0 +1,40 @@
+import { createToolsConfig } from "./createToolsConfig";
+import { createSourceConfig } from "./createSourceConfig";
+import { createOutputConfig } from "./createOutputConfig";
+import { createHtmlConfig } from "./createHtmlConfig";
+export function transformNormalizedConfig(config) {
+  const html = createHtmlConfig(config);
+  const output = createOutputConfig(config);
+  const source = createSourceConfig(config);
+  const tools = createToolsConfig(config);
+  const {
+    bff,
+    dev,
+    deploy,
+    runtime,
+    runtimeByEntries,
+    server,
+    cliOptions,
+    plugins,
+    testing
+  } = config;
+  return {
+    source,
+    html,
+    output,
+    tools,
+    bff,
+    dev,
+    deploy,
+    runtime,
+    runtimeByEntries,
+    server,
+    cliOptions,
+    testing,
+    plugins: plugins,
+    security: {},
+    _raw: {},
+    experiments: {},
+    performance: {}
+  };
+}

package/dist/js/modern/defineConfig.js

@@ -0,0 +1,12 @@
+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; }
+export const defineConfig = config => config;
+
+/**
+ * @deprecated
+ * Using defineConfig first.
+ */
+export const defineLegacyConfig = config => _objectSpread(_objectSpread({}, config), {}, {
+  legacy: true
+});

package/dist/js/modern/hooks.js

@@ -1,21 +1,25 @@
-import { createAsyncWaterfall, createAsyncWorkflow } from '@modern-js/plugin';
-export const beforeDev = createAsyncWorkflow();
-export const afterDev = createAsyncWorkflow();
-export const beforeCreateCompiler = createAsyncWorkflow();
-export const afterCreateCompiler = createAsyncWorkflow();
-export const beforePrintInstructions = createAsyncWaterfall();
-export const beforeBuild = createAsyncWorkflow();
-export const afterBuild = createAsyncWorkflow();
-export const beforeDeploy = createAsyncWorkflow();
-export const afterDeploy = createAsyncWorkflow();
+import { createAsyncWaterfall, createAsyncWorkflow, createParallelWorkflow } from '@modern-js/plugin';
 export const hooks = {
-  beforeDev,
-  afterDev,
-  beforeCreateCompiler,
-  afterCreateCompiler,
-  beforePrintInstructions,
-  beforeBuild,
-  afterBuild,
-  beforeDeploy,
-  afterDeploy
+  modifyEntryExport: createAsyncWaterfall(),
+  modifyEntryImports: createAsyncWaterfall(),
+  modifyEntryRuntimePlugins: createAsyncWaterfall(),
+  modifyEntryRenderFunction: createAsyncWaterfall(),
+  modifyAsyncEntry: createAsyncWaterfall(),
+  modifyFileSystemRoutes: createAsyncWaterfall(),
+  modifyServerRoutes: createAsyncWaterfall(),
+  htmlPartials: createAsyncWaterfall(),
+  beforeGenerateRoutes: createAsyncWaterfall(),
+  addDefineTypes: createAsyncWaterfall(),
+  beforeDev: createAsyncWorkflow(),
+  afterDev: createAsyncWorkflow(),
+  beforeCreateCompiler: createAsyncWorkflow(),
+  afterCreateCompiler: createAsyncWorkflow(),
+  beforePrintInstructions: createAsyncWaterfall(),
+  beforeBuild: createAsyncWorkflow(),
+  afterBuild: createAsyncWorkflow(),
+  beforeDeploy: createAsyncWorkflow(),
+  afterDeploy: createAsyncWorkflow(),
+  watchFiles: createParallelWorkflow(),
+  fileChange: createAsyncWorkflow(),
+  beforeRestart: createAsyncWorkflow()
 };

package/dist/js/modern/index.js

@@ -2,21 +2,23 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 path from 'path';
-import { defineConfig, cli } from '@modern-js/core';
 import LintPlugin from '@modern-js/plugin-lint';
 import { cleanRequireCache, emptyDir, Import } from '@modern-js/utils';
 import AnalyzePlugin from "./analyze";
+import InitializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import { getLocaleLanguage } from "./utils/language";
 import { getCommand } from "./utils/commands";
-export { defineConfig, hooks };
+import { restart } from "./utils/restart";
+export * from "./defineConfig";
+export * from "./types";
 const upgradeModel = Import.lazy('@modern-js/upgrade', require);
 export default (() => ({
   name: '@modern-js/app-tools',
-  post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-document', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-router-legacy', '@modern-js/plugin-polyfill'],
+  post: ['@modern-js/plugin-initialize', '@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-document', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-router-legacy', '@modern-js/plugin-polyfill'],
   registerHook: hooks,
-  usePlugins: [AnalyzePlugin(), LintPlugin()],
+  usePlugins: [InitializePlugin(), AnalyzePlugin(), LintPlugin()],
   setup: api => {
     const locale = getLocaleLanguage();
     i18n.changeLanguage({
@@ -99,7 +101,7 @@ export default (() => ({
             closeServer
           } = await import("./utils/createServer");
           await closeServer();
-          await cli.restart();
+          await restart(api.useHookRunners());
         }
       },
       async beforeRestart() {