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

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/exports/server.d.ts

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

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/config.d.ts

@@ -0,0 +1,12 @@
+import { bundle } from '@modern-js/node-bundle-require';
+import type { NormalizedConfig } from '@modern-js/core';
+import type { ServerConfig } from '@modern-js/server-core';
+export declare const defineServerConfig: (config: ServerConfig) => ServerConfig;
+export declare const buildServerConfig: (appDirectory: string, configFile: string, options?: Parameters<typeof bundle>[1]) => Promise<void>;
+/**
+ *
+ * 处理循环引用的 replacer
+ */
+
+export declare const safeReplacer: () => (key: string, value: unknown) => unknown;
+export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: NormalizedConfig) => Promise<void>;

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 { IAppContext, NormalizedConfig, ToRunners, CliHooks } from '@modern-js/core';
+export declare const printInstructions: (hookRunners: ToRunners<CliHooks>, 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/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
 };

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.7-canary.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,9 +30,13 @@
       "jsnext:source": "./src/index.ts",
       "default": "./dist/js/node/index.js"
     },
-    "./type": {
+    "./types": {
       "jsnext:source": "./lib/types.d.ts",
       "default": "./lib/types.d.ts"
+    },
+    "./server": {
+      "jsnext:source": "./src/exports/server.ts",
+      "default": "./dist/js/node/exports/server.js"
     }
   },
   "typesVersions": {
@@ -42,6 +46,9 @@
       ],
       "types": [
         "./lib/types.d.ts"
+      ],
+      "server": [
+        "./dist/types/exports/server.d.ts"
       ]
     }
   },
@@ -49,45 +56,44 @@
     "modern": "./bin/modern.js"
   },
   "dependencies": {
-    "@modern-js/core": "^1.5.0",
     "@babel/runtime": "^7",
-    "@modern-js/types": "^1.3.5",
+    "@modern-js/core": "^1.6.1",
     "@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/node-bundle-require": "^1.2.3",
+    "@modern-js/plugin": "^1.3.2",
+    "@modern-js/plugin-analyze": "^1.3.5",
+    "@modern-js/plugin-fast-refresh": "^1.2.3",
     "@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/prod-server": "^1.0.6",
+    "@modern-js/server": "^1.4.9",
+    "@modern-js/types": "^1.3.6",
+    "@modern-js/utils": "^1.3.7",
+    "@modern-js/webpack": "^1.5.3",
     "inquirer": "^8.2.0",
-    "webpack": "^5.54.0"
+    "webpack": "^5.71.0"
   },
   "devDependencies": {
+    "@modern-js/server-core": "^1.2.4",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
+    "@types/inquirer": "^8.2.0",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "typescript": "^4",
-    "@scripts/build": "0.0.0",
     "jest": "^27",
-    "@scripts/jest-config": "0.0.0",
-    "@types/inquirer": "^8.2.0"
+    "typescript": "^4"
   },
   "sideEffects": false,
-  "modernConfig": {
-    "output": {
-      "packageMode": "node-js"
-    }
-  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "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/__snapshots__/utils.test.ts.snap

@@ -0,0 +1,5 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`test app-tools utils safeReplacer should handle circular object 1`] = `"{\\"name\\":\\"a\\",\\"b\\":{\\"name\\":\\"b\\",\\"a\\":\\"[Circular root]\\"}}"`;
+
+exports[`test app-tools utils safeReplacer should handle circular object 2`] = `"{\\"name\\":\\"c\\",\\"d\\":{\\"name\\":\\"d\\",\\"e\\":{\\"name\\":\\"e\\",\\"c\\":\\"[Circular root]\\"}}}"`;

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();
   });
 });

package/tests/utils.test.ts

@@ -6,6 +6,7 @@ import {
   getServer,
 } from '../src/utils/createServer';
 import { getSpecifiedEntries } from '../src/utils/getSpecifiedEntries';
+import { safeReplacer } from '../src/utils/config';
 
 describe('test app-tools utils', () => {
   it('should return all entryNames correctly', async () => {
@@ -40,7 +41,6 @@ describe('test app-tools utils', () => {
     getSpecifiedEntries(['c'], [
       { entryName: 'a' },
       { entryName: 'b' },
-      // eslint-disable-next-line promise/prefer-await-to-then
     ] as any).catch(e => {
       expect((e as Error).message).toMatch('can not found entry c');
       resolve();
@@ -64,4 +64,49 @@ describe('test app-tools utils', () => {
     await closeServer();
     expect(getServer()).toBeNull();
   });
+
+  it('safeReplacer should handle circular object', () => {
+    const a: {
+      [key: string]: unknown;
+    } = {
+      name: 'a',
+    };
+
+    const b: {
+      [key: string]: unknown;
+    } = {
+      name: 'b',
+    };
+
+    a.b = b;
+    b.a = a;
+
+    const res1 = JSON.stringify(a, safeReplacer());
+    expect(res1).toMatchSnapshot();
+
+    const c: {
+      [key: string]: unknown;
+    } = {
+      name: 'c',
+    };
+
+    const d: {
+      [key: string]: unknown;
+    } = {
+      name: 'd',
+    };
+
+    const e: {
+      [key: string]: unknown;
+    } = {
+      name: 'e',
+    };
+
+    c.d = d;
+    d.e = e;
+    e.c = c;
+
+    const res2 = JSON.stringify(c, safeReplacer());
+    expect(res2).toMatchSnapshot();
+  });
 });