@modern-js/app-tools 1.4.4 → 1.4.5

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,30 @@
 # @modern-js/app-tools
 
+## 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,31 @@ 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";
 // 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;
   }
 
@@ -116,7 +115,7 @@ export const build = async options => {
     });
   }
 
-  await mountHook().beforeBuild({
+  await hookRunners.beforeBuild({
     webpackConfigs: buildConfigs.map(({
       config
     }) => config)
@@ -138,5 +137,5 @@ export const build = async options => {
   }
 
   await generateRoutes(appContext);
-  await mountHook().afterBuild();
+  await hookRunners.afterBuild();
 };

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,18 +5,15 @@ 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 */
-
+export const dev = async (api, options) => {
+  const appContext = api.useAppContext();
+  const userConfig = api.useResolvedConfigContext();
+  const hookRunners = api.useHookRunners();
   const {
     appDirectory,
     distDirectory,
@@ -25,12 +22,12 @@ export const dev = async options => {
     entrypoints
   } = 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 hookRunners.beforeDev();
   let compiler = null;
 
   if (existSrc) {
@@ -40,6 +37,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
@@ -50,7 +48,6 @@ export const dev = async options => {
   const app = await createServer({
     dev: _objectSpread(_objectSpread({}, {
       client: {
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         port: port.toString(),
         overlay: false,
         logging: 'none',
@@ -79,7 +76,7 @@ export const dev = async options => {
       clearConsole();
       logger.log(chalk.cyan(`Starting the development server...`));
     } else {
-      await printInstructions(appContext, userConfig);
+      await printInstructions(api, appContext, userConfig);
     }
   });
 };

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

@@ -1,13 +1,9 @@
 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 {
     appDirectory,
     port
@@ -23,6 +19,6 @@ export const start = async () => {
       throw err;
     }
 
-    await printInstructions(appContext, userConfig);
+    await printInstructions(api, appContext, userConfig);
   });
 };

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/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,7 +57,7 @@ export const createCompiler = async ({
           logger.log(chalk.green(`Compiled successfully in ${prettyTime(statsData)} ms.\n`));
         }
 
-        await printInstructions(appContext, userConfig);
+        await printInstructions(api, appContext, userConfig);
       } // eslint-disable-next-line require-atomic-updates
 
 

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 (api, appContext, config) => {
   let message = prettyInstructions(appContext, config);
   const {
     existSrc
@@ -11,9 +10,10 @@ export const printInstructions = async (appContext, config) => {
   } // call beforePrintInstructions hook.
 
 
+  const hookRunners = api.useHookRunners();
   const {
     instructions
-  } = await mountHook().beforePrintInstructions({
+  } = await hookRunners.beforePrintInstructions({
     instructions: message
   });
   logger.log(instructions);

package/dist/js/node/commands/build.js

@@ -25,25 +25,24 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
 const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024; // eslint-disable-next-line max-statements
 
-const build = async options => {
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const resolvedConfig = (0, _core.useResolvedConfigContext)();
-  const appContext = (0, _core.useAppContext)();
+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 (0, _utils.emptyDir)(distDirectory);
-    await (0, _core.mountHook)().beforeBuild({
+    await hookRunners.beforeBuild({
       webpackConfigs: []
     });
     await (0, _routes.generateRoutes)(appContext);
-    await (0, _core.mountHook)().afterBuild();
+    await hookRunners.afterBuild();
     return;
   }
 
@@ -132,7 +131,7 @@ const build = async options => {
     });
   }
 
-  await (0, _core.mountHook)().beforeBuild({
+  await hookRunners.beforeBuild({
     webpackConfigs: buildConfigs.map(({
       config
     }) => config)
@@ -154,7 +153,7 @@ const build = async options => {
   }
 
   await (0, _routes.generateRoutes)(appContext);
-  await (0, _core.mountHook)().afterBuild();
+  await hookRunners.afterBuild();
 };
 
 exports.build = build;

package/dist/js/node/commands/deploy.js

@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.deploy = void 0;
 
-var _core = require("@modern-js/core");
-
-const deploy = async options => {
-  await (0, _core.mountHook)().beforeDeploy(options);
-  await (0, _core.mountHook)().afterDeploy(options);
+const deploy = async (api, options) => {
+  const hookRunners = api.useHookRunners();
+  await hookRunners.beforeDeploy(options);
+  await hookRunners.afterDeploy(options);
 };
 
 exports.deploy = deploy;

package/dist/js/node/commands/dev.js

@@ -7,8 +7,6 @@ exports.dev = void 0;
 
 var _utils = require("@modern-js/utils");
 
-var _core = require("@modern-js/core");
-
 var _createCompiler = require("../utils/createCompiler");
 
 var _createServer = require("../utils/createServer");
@@ -29,12 +27,10 @@ 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; }
 
-const dev = async options => {
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const appContext = (0, _core.useAppContext)();
-  const userConfig = (0, _core.useResolvedConfigContext)();
-  /* eslint-enable react-hooks/rules-of-hooks */
-
+const dev = async (api, options) => {
+  const appContext = api.useAppContext();
+  const userConfig = api.useResolvedConfigContext();
+  const hookRunners = api.useHookRunners();
   const {
     appDirectory,
     distDirectory,
@@ -43,16 +39,14 @@ const dev = async options => {
     entrypoints
   } = appContext;
   const checkedEntries = await (0, _getSpecifiedEntries.getSpecifiedEntries)(options.entry || false, entrypoints);
-
-  _core.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
+  api.setAppContext(_objectSpread(_objectSpread({}, appContext), {}, {
     checkedEntries
   }));
-
   appContext.checkedEntries = checkedEntries;
 
   _utils.fs.emptyDirSync(distDirectory);
 
-  await (0, _core.mountHook)().beforeDev();
+  await hookRunners.beforeDev();
   let compiler = null;
 
   if (existSrc) {
@@ -62,6 +56,7 @@ const dev = async options => {
     } = await Promise.resolve().then(() => _interopRequireWildcard(require('@modern-js/webpack')));
     const webpackConfigs = [(0, _utils.isSSR)(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE), getWebpackConfig(WebpackConfigTarget.CLIENT)].filter(Boolean);
     compiler = await (0, _createCompiler.createCompiler)({
+      api,
       webpackConfigs,
       userConfig,
       appContext
@@ -72,7 +67,6 @@ const dev = async options => {
   const app = await (0, _createServer.createServer)({
     dev: _objectSpread(_objectSpread({}, {
       client: {
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         port: port.toString(),
         overlay: false,
         logging: 'none',
@@ -102,7 +96,7 @@ const dev = async options => {
 
       _utils.logger.log(_utils.chalk.cyan(`Starting the development server...`));
     } else {
-      await (0, _printInstructions.printInstructions)(appContext, userConfig);
+      await (0, _printInstructions.printInstructions)(api, appContext, userConfig);
     }
   });
 };

package/dist/js/node/commands/start.js

@@ -7,20 +7,15 @@ exports.start = void 0;
 
 var _utils = require("@modern-js/utils");
 
-var _core = require("@modern-js/core");
-
 var _prodServer = _interopRequireDefault(require("@modern-js/prod-server"));
 
 var _printInstructions = require("../utils/printInstructions");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const start = async () => {
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const appContext = (0, _core.useAppContext)();
-  const userConfig = (0, _core.useResolvedConfigContext)();
-  /* eslint-enable react-hooks/rules-of-hooks */
-
+const start = async api => {
+  const appContext = api.useAppContext();
+  const userConfig = api.useResolvedConfigContext();
   const {
     appDirectory,
     port
@@ -38,7 +33,7 @@ const start = async () => {
       throw err;
     }
 
-    await (0, _printInstructions.printInstructions)(appContext, userConfig);
+    await (0, _printInstructions.printInstructions)(api, appContext, userConfig);
   });
 };
 

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

@@ -3,12 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.lifecycle = exports.beforePrintInstructions = exports.beforeDev = exports.beforeDeploy = exports.beforeCreateCompiler = exports.beforeBuild = exports.afterDev = exports.afterDeploy = exports.afterCreateCompiler = exports.afterBuild = void 0;
+exports.hooks = exports.beforePrintInstructions = exports.beforeDev = exports.beforeDeploy = exports.beforeCreateCompiler = exports.beforeBuild = exports.afterDev = exports.afterDeploy = exports.afterCreateCompiler = exports.afterBuild = void 0;
 
 var _plugin = require("@modern-js/plugin");
 
-var _core = require("@modern-js/core");
-
 const beforeDev = (0, _plugin.createAsyncWorkflow)();
 exports.beforeDev = beforeDev;
 const afterDev = (0, _plugin.createAsyncWorkflow)();
@@ -27,19 +25,15 @@ const beforeDeploy = (0, _plugin.createAsyncWorkflow)();
 exports.beforeDeploy = beforeDeploy;
 const afterDeploy = (0, _plugin.createAsyncWorkflow)();
 exports.afterDeploy = afterDeploy;
-
-const lifecycle = () => {
-  (0, _core.registerHook)({
-    beforeDev,
-    afterDev,
-    beforeCreateCompiler,
-    afterCreateCompiler,
-    beforePrintInstructions,
-    beforeBuild,
-    afterBuild,
-    beforeDeploy,
-    afterDeploy
-  });
+const hooks = {
+  beforeDev,
+  afterDev,
+  beforeCreateCompiler,
+  afterCreateCompiler,
+  beforePrintInstructions,
+  beforeBuild,
+  afterBuild,
+  beforeDeploy,
+  afterDeploy
 };
-
-exports.lifecycle = lifecycle;
+exports.hooks = hooks;

package/dist/js/node/index.js

@@ -15,9 +15,13 @@ var path = _interopRequireWildcard(require("path"));
 
 var _core = require("@modern-js/core");
 
+var _pluginAnalyze = _interopRequireDefault(require("@modern-js/plugin-analyze"));
+
+var _cli = _interopRequireDefault(require("@modern-js/plugin-fast-refresh/cli"));
+
 var _utils = require("@modern-js/utils");
 
-var _lifecycle = require("./lifecycle");
+var _hooks = require("./hooks");
 
 var _locale = require("./locale");
 
@@ -29,6 +33,8 @@ var _dev = require("./commands/dev");
 
 var _createServer = require("./utils/createServer");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 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; }
@@ -39,86 +45,84 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-// eslint-disable-next-line react-hooks/rules-of-hooks
-(0, _core.usePlugins)([require.resolve('@modern-js/plugin-analyze/cli'), require.resolve('@modern-js/plugin-fast-refresh/cli')]);
-
-var _default = (0, _core.createPlugin)(() => {
-  const locale = (0, _language.getLocaleLanguage)();
-
-  _locale.i18n.changeLanguage({
-    locale
-  });
-
-  (0, _lifecycle.lifecycle)();
-  return {
-    commands({
-      program
-    }) {
-      program.command('dev').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.dev.describe)).option('-c --config <config>', _locale.i18n.t(_locale.localeKeys.command.dev.config)).option('-e --entry [entry...]', _locale.i18n.t(_locale.localeKeys.command.dev.entry)).action(async options => {
-        await (0, _dev.dev)(options);
-      });
-      program.command('build').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.build.describe)).option('--analyze', _locale.i18n.t(_locale.localeKeys.command.build.analyze)).action(async options => {
-        const {
-          build
-        } = await Promise.resolve().then(() => _interopRequireWildcard(require("./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(_locale.i18n.t(_locale.localeKeys.command.start.describe)).action(async () => {
-        await (0, _start.start)();
-      });
-      program.command('deploy').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.deploy.describe)).action(async options => {
-        const {
-          build
-        } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/build")));
-        await build();
+var _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.hooks,
+  usePlugins: [(0, _pluginAnalyze.default)(), (0, _cli.default)()],
+  setup: api => {
+    const locale = (0, _language.getLocaleLanguage)();
+
+    _locale.i18n.changeLanguage({
+      locale
+    });
+
+    return {
+      commands({
+        program
+      }) {
+        program.command('dev').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.dev.describe)).option('-c --config <config>', _locale.i18n.t(_locale.localeKeys.command.dev.config)).option('-e --entry [entry...]', _locale.i18n.t(_locale.localeKeys.command.dev.entry)).action(async options => {
+          await (0, _dev.dev)(api, options);
+        });
+        program.command('build').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.build.describe)).option('--analyze', _locale.i18n.t(_locale.localeKeys.command.build.analyze)).action(async options => {
+          const {
+            build
+          } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/build")));
+          await build(api, options); // force exit after build.
+          // eslint-disable-next-line no-process-exit
+
+          process.exit(0);
+        });
+        program.command('start').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.start.describe)).action(async () => {
+          await (0, _start.start)(api);
+        });
+        program.command('deploy').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.deploy.describe)).action(async options => {
+          const {
+            build
+          } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/build")));
+          await build(api);
+          const {
+            deploy
+          } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/deploy")));
+          await deploy(api, options); // eslint-disable-next-line no-process-exit
+
+          process.exit(0);
+        });
+        program.command('new').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.new.describe)).option('-d, --debug', _locale.i18n.t(_locale.localeKeys.command.new.debug), false).option('-c, --config <config>', _locale.i18n.t(_locale.localeKeys.command.new.config)).option('--dist-tag <tag>', _locale.i18n.t(_locale.localeKeys.command.new.distTag)).option('--registry', _locale.i18n.t(_locale.localeKeys.command.new.registry)).action(async options => {
+          const {
+            MWANewAction
+          } = await Promise.resolve().then(() => _interopRequireWildcard(require('@modern-js/new-action')));
+          await MWANewAction(_objectSpread(_objectSpread({}, options), {}, {
+            locale
+          }));
+        });
+      },
+
+      // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
+      async fileChange(e) {
         const {
-          deploy
-        } = await Promise.resolve().then(() => _interopRequireWildcard(require("./commands/deploy")));
-        await deploy(options); // eslint-disable-next-line no-process-exit
-
-        process.exit(0);
-      });
-      program.command('new').usage('[options]').description(_locale.i18n.t(_locale.localeKeys.command.new.describe)).option('-d, --debug', _locale.i18n.t(_locale.localeKeys.command.new.debug), false).option('-c, --config <config>', _locale.i18n.t(_locale.localeKeys.command.new.config)).option('--dist-tag <tag>', _locale.i18n.t(_locale.localeKeys.command.new.distTag)).option('--registry', _locale.i18n.t(_locale.localeKeys.command.new.registry)).action(async options => {
+          filename,
+          eventType
+        } = e;
+        const appContext = api.useAppContext();
         const {
-          MWANewAction
-        } = await Promise.resolve().then(() => _interopRequireWildcard(require('@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
-
-      const appContext = (0, _core.useAppContext)();
-      const {
-        appDirectory,
-        srcDirectory
-      } = appContext;
-      const absolutePath = path.resolve(appDirectory, filename);
-
-      if (!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink')) {
-        await (0, _createServer.closeServer)();
-        await _core.cli.restart();
+          appDirectory,
+          srcDirectory
+        } = appContext;
+        const absolutePath = path.resolve(appDirectory, filename);
+
+        if (!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink')) {
+          await (0, _createServer.closeServer)();
+          await _core.cli.restart();
+        }
+      },
+
+      async beforeRestart() {
+        (0, _utils.cleanRequireCache)([require.resolve('@modern-js/plugin-analyze/cli'), require.resolve('@modern-js/plugin-fast-refresh/cli')]);
       }
-    },
-
-    async beforeRestart() {
-      (0, _utils.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']
+    };
+  }
 });
 
 exports.default = _default;

package/dist/js/node/utils/createCompiler.js

@@ -7,8 +7,6 @@ exports.createCompiler = void 0;
 
 var _webpack = _interopRequireDefault(require("webpack"));
 
-var _core = require("@modern-js/core");
-
 var _utils = require("@modern-js/utils");
 
 var _printInstructions = require("./printInstructions");
@@ -22,17 +20,19 @@ const prettyTime = stats => {
 };
 
 const createCompiler = async ({
+  api,
   webpackConfigs,
   // TODO: params
   userConfig,
   appContext
 }) => {
   try {
-    await (0, _core.mountHook)().beforeCreateCompiler({
+    const hookRunners = api.useHookRunners();
+    await hookRunners.beforeCreateCompiler({
       webpackConfigs
     });
     const compiler = (0, _webpack.default)(webpackConfigs);
-    await (0, _core.mountHook)().afterCreateCompiler({
+    await hookRunners.afterCreateCompiler({
       compiler
     });
     let isFirstCompile = true;
@@ -61,7 +61,7 @@ const createCompiler = async ({
 
         _utils.logger.log();
       } else if (process.stdout.isTTY || isFirstCompile) {
-        await (0, _core.mountHook)().afterDev();
+        await hookRunners.afterDev();
 
         if (warnings.length) {
           _utils.logger.log(_utils.chalk.yellow(`Compiled with warnings.\n`));
@@ -73,7 +73,7 @@ const createCompiler = async ({
           _utils.logger.log(_utils.chalk.green(`Compiled successfully in ${prettyTime(statsData)} ms.\n`));
         }
 
-        await (0, _printInstructions.printInstructions)(appContext, userConfig);
+        await (0, _printInstructions.printInstructions)(api, appContext, userConfig);
       } // eslint-disable-next-line require-atomic-updates
 
 

package/dist/js/node/utils/printInstructions.js

@@ -7,9 +7,7 @@ exports.printInstructions = void 0;
 
 var _utils = require("@modern-js/utils");
 
-var _core = require("@modern-js/core");
-
-const printInstructions = async (appContext, config) => {
+const printInstructions = async (api, appContext, config) => {
   let message = (0, _utils.prettyInstructions)(appContext, config);
   const {
     existSrc
@@ -20,9 +18,10 @@ const printInstructions = async (appContext, config) => {
   } // call beforePrintInstructions hook.
 
 
+  const hookRunners = api.useHookRunners();
   const {
     instructions
-  } = await (0, _core.mountHook)().beforePrintInstructions({
+  } = await hookRunners.beforePrintInstructions({
     instructions: message
   });
 

package/dist/types/commands/build.d.ts

@@ -1,2 +1,3 @@
+import { PluginAPI } from '@modern-js/core';
 import type { BuildOptions } from '../utils/types';
-export declare const build: (options?: BuildOptions | undefined) => Promise<void>;
+export declare const build: (api: PluginAPI, options?: BuildOptions | undefined) => Promise<void>;

package/dist/types/commands/deploy.d.ts

@@ -1 +1,2 @@
-export declare const deploy: (options: any) => Promise<void>;
+import type { PluginAPI } from '@modern-js/core';
+export declare const deploy: (api: PluginAPI, options: any) => Promise<void>;

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

@@ -1,2 +1,3 @@
+import type { PluginAPI } from '@modern-js/core';
 import { DevOptions } from '../utils/types';
-export declare const dev: (options: DevOptions) => Promise<void>;
+export declare const dev: (api: PluginAPI, options: DevOptions) => Promise<void>;

package/dist/types/commands/start.d.ts

@@ -1 +1,2 @@
-export declare const start: () => Promise<void>;
+import type { PluginAPI } from '@modern-js/core';
+export declare const start: (api: PluginAPI) => Promise<void>;

package/dist/types/{lifecycle.d.ts → hooks.d.ts}

@@ -16,4 +16,22 @@ export declare const beforeBuild: import("@modern-js/plugin").AsyncWorkflow<{
 export declare const afterBuild: import("@modern-js/plugin").AsyncWorkflow<void, unknown>;
 export declare const beforeDeploy: import("@modern-js/plugin").AsyncWorkflow<Record<string, any>, unknown>;
 export declare const afterDeploy: import("@modern-js/plugin").AsyncWorkflow<Record<string, any>, unknown>;
-export declare const lifecycle: () => void;
+export declare const hooks: {
+  beforeDev: import("@modern-js/plugin").AsyncWorkflow<void, unknown>;
+  afterDev: import("@modern-js/plugin").AsyncWorkflow<void, unknown>;
+  beforeCreateCompiler: import("@modern-js/plugin").AsyncWorkflow<{
+    webpackConfigs: Configuration[];
+  }, unknown>;
+  afterCreateCompiler: import("@modern-js/plugin").AsyncWorkflow<{
+    compiler: Compiler | MultiCompiler | undefined;
+  }, unknown>;
+  beforePrintInstructions: import("@modern-js/plugin").AsyncWaterfall<{
+    instructions: string;
+  }>;
+  beforeBuild: import("@modern-js/plugin").AsyncWorkflow<{
+    webpackConfigs: Configuration[];
+  }, unknown>;
+  afterBuild: import("@modern-js/plugin").AsyncWorkflow<void, unknown>;
+  beforeDeploy: import("@modern-js/plugin").AsyncWorkflow<Record<string, any>, unknown>;
+  afterDeploy: import("@modern-js/plugin").AsyncWorkflow<Record<string, any>, unknown>;
+};

package/dist/types/index.d.ts

@@ -1,11 +1,6 @@
-import { defineConfig } from '@modern-js/core';
+import { defineConfig, CliPlugin } from '@modern-js/core';
 export { defineConfig };
 
-declare const _default: import("@modern-js/core").AsyncPlugin<import("@modern-js/core").CliHooks, {
-  setAppContext: (value: import("@modern-js/core").IAppContext) => void;
-  useAppContext: () => import("@modern-js/core").IAppContext;
-  useConfigContext: () => import("@modern-js/core/src/config").UserConfig;
-  useResolvedConfigContext: () => import("@modern-js/core").NormalizedConfig;
-}>;
+declare const _default: () => CliPlugin;
 
 export default _default;

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

@@ -1,10 +1,12 @@
 import webpack, { Configuration } from 'webpack';
-import { IAppContext, NormalizedConfig } from '@modern-js/core';
+import type { IAppContext, NormalizedConfig, PluginAPI } from '@modern-js/core';
 export declare const createCompiler: ({
+  api,
   webpackConfigs,
   userConfig,
   appContext
 }: {
+  api: PluginAPI;
   webpackConfigs: Configuration[];
   userConfig: NormalizedConfig;
   appContext: IAppContext;

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

@@ -1,2 +1,2 @@
-import { IAppContext, NormalizedConfig } from '@modern-js/core';
-export declare const printInstructions: (appContext: IAppContext, config: NormalizedConfig) => Promise<void>;
+import type { PluginAPI, IAppContext, NormalizedConfig } from '@modern-js/core';
+export declare const printInstructions: (api: PluginAPI, appContext: IAppContext, config: NormalizedConfig) => Promise<void>;

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

@@ -1,3 +1,3 @@
-import { IAppContext } from '@modern-js/core';
+import type { IAppContext } from '@modern-js/core';
 declare const generateRoutes: (appContext: IAppContext) => Promise<void>;
 export { generateRoutes };

package/modern.config.js

@@ -1,6 +1,7 @@
 /** @type {import('@modern-js/module-tools').UserConfig} */
 module.exports = {
   output: {
+    packageMode: 'node-js',
     disableSourceMap: true,
   },
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.4",
+  "version": "1.4.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -49,19 +49,19 @@
     "modern": "./bin/modern.js"
   },
   "dependencies": {
-    "@modern-js/core": "^1.5.0",
+    "@modern-js/core": "^1.6.0",
     "@babel/runtime": "^7",
     "@modern-js/types": "^1.3.5",
     "@modern-js/i18n-cli-language-detector": "^1.2.1",
     "@modern-js/new-action": "^1.3.3",
-    "@modern-js/plugin": "^1.3.0",
-    "@modern-js/plugin-analyze": "^1.3.3",
-    "@modern-js/plugin-fast-refresh": "^1.2.1",
+    "@modern-js/plugin": "^1.3.2",
+    "@modern-js/plugin-analyze": "^1.3.4",
+    "@modern-js/plugin-fast-refresh": "^1.2.2",
     "@modern-js/plugin-i18n": "^1.2.1",
-    "@modern-js/server": "^1.4.7",
-    "@modern-js/prod-server": "^1.0.4",
-    "@modern-js/utils": "^1.3.5",
-    "@modern-js/webpack": "^1.4.1",
+    "@modern-js/server": "^1.4.8",
+    "@modern-js/prod-server": "^1.0.5",
+    "@modern-js/utils": "^1.3.6",
+    "@modern-js/webpack": "^1.5.0",
     "inquirer": "^8.2.0",
     "webpack": "^5.54.0"
   },
@@ -77,17 +77,13 @@
     "@types/inquirer": "^8.2.0"
   },
   "sideEffects": false,
-  "modernConfig": {
-    "output": {
-      "packageMode": "node-js"
-    }
-  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "scripts": {
     "new": "modern new",
+    "dev": "modern build --watch",
     "build": "modern build",
     "test": "jest --passWithNoTests"
   },

package/tests/.eslintrc.js

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

package/tests/commands/build.test.ts

@@ -1,27 +1,8 @@
+import { manager } from '@modern-js/core';
 import { build } from '../../src/commands/build';
 
-const mockBeforeBuild = jest.fn();
-const mockAfterBuild = jest.fn();
 const mockGenerateRoutes = jest.fn();
 
-// eslint-disable-next-line arrow-body-style
-jest.mock('@modern-js/core', () => {
-  return {
-    __esModule: true,
-    mountHook() {
-      return {
-        beforeBuild: mockBeforeBuild,
-        afterBuild: mockAfterBuild,
-      };
-    },
-    useAppContext: jest.fn(() => ({
-      existSrc: false,
-      distDirectory: '',
-    })),
-    useResolvedConfigContext: jest.fn(),
-  };
-});
-
 jest.mock('../../src/utils/routes', () => ({
   __esModule: true,
   generateRoutes: () => mockGenerateRoutes(),
@@ -33,9 +14,29 @@ describe('command build', () => {
   });
 
   test('existSrc is false', async () => {
-    await build();
-    expect(mockBeforeBuild).toBeCalled();
-    expect(mockGenerateRoutes).toBeCalled();
-    expect(mockAfterBuild).toBeCalled();
+    const mockBeforeBuild = jest.fn();
+    const mockAfterBuild = jest.fn();
+    const mockAPI = {
+      useAppContext: jest.fn((): any => ({
+        existSrc: false,
+        distDirectory: '',
+      })),
+      useResolvedConfigContext: jest.fn(),
+      useHookRunners: (): any => ({
+        afterBuild: mockAfterBuild,
+        beforeBuild: mockBeforeBuild,
+      }),
+    };
+
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      async setup(api) {
+        await build(api);
+        expect(mockBeforeBuild).toBeCalled();
+        expect(mockGenerateRoutes).toBeCalled();
+        expect(mockAfterBuild).toBeCalled();
+      },
+    });
+    await cloned.init();
   });
 });