@modern-js/core 1.6.0 → 1.7.1-beta.peer.1

package/dist/types/loadPlugins.d.ts

@@ -7,6 +7,7 @@ export declare type LoadedPlugin = {
   server?: string;
   serverPkg?: string;
 };
+export declare type TransformPlugin = (plugin: PluginConfig, resolvedConfig: UserConfig, pluginOptions?: any) => PluginConfig;
 /**
  * @deprecated
  * Using NewPluginConfig insteand.
@@ -32,10 +33,12 @@ export declare function getAppPlugins(appDirectory: string, oldPluginConfig: Old
  * @param appDirectory - Application root directory.
  * @param userConfig - Resolved user config.
  * @param options.internalPlugins - Internal plugins.
+ * @param options.transformPlugin - transform plugin before using it. Used for compatible with legacy jupiter plugins.
  * @returns Plugin Objects has been required.
  */
 
 export declare const loadPlugins: (appDirectory: string, userConfig: UserConfig, options?: {
   internalPlugins?: typeof INTERNAL_PLUGINS;
+  transformPlugin?: TransformPlugin;
 }) => LoadedPlugin[];
 export {};

package/dist/types/manager.d.ts

@@ -2,9 +2,10 @@ import { ToThreads, ToRunners, AsyncSetup, PluginOptions, AsyncWorkflow, AsyncWa
 import type { Hooks } from '@modern-js/types';
 import type { Command } from './utils/commander';
 import type { NormalizedConfig } from './config/mergeConfig';
+import type { UserConfig } from './config';
 import { pluginAPI } from './pluginAPI';
 export declare type HooksRunner = ToRunners<{
-  config: ParallelWorkflow<void>;
+  config: ParallelWorkflow<void, UserConfig>;
   resolvedConfig: AsyncWaterfall<{
     resolved: NormalizedConfig;
   }>;
@@ -22,7 +23,7 @@ export declare type HooksRunner = ToRunners<{
   beforeRestart: AsyncWorkflow<void, void>;
 }>;
 declare const baseHooks: {
-  config: ParallelWorkflow<void, unknown>;
+  config: ParallelWorkflow<void, UserConfig>;
   resolvedConfig: AsyncWaterfall<{
     resolved: NormalizedConfig;
   }>;
@@ -48,7 +49,7 @@ export declare type CliHookCallbacks = ToThreads<CliHooks>;
 export declare const manager: import("@modern-js/plugin").AsyncManager<CliHooks, {
   setAppContext: (value: import("@modern-js/types").IAppContext) => void;
   useAppContext: () => import("@modern-js/types").IAppContext;
-  useConfigContext: () => import("./config").UserConfig;
+  useConfigContext: () => UserConfig;
   useResolvedConfigContext: () => NormalizedConfig;
 }>;
 /** Plugin options of a cli plugin. */
@@ -57,17 +58,17 @@ export declare type CliPlugin = PluginOptions<CliHooks, AsyncSetup<CliHooks, typ
 export declare const createPlugin: (setup?: AsyncSetup<CliHooks, {
   setAppContext: (value: import("@modern-js/types").IAppContext) => void;
   useAppContext: () => import("@modern-js/types").IAppContext;
-  useConfigContext: () => import("./config").UserConfig;
+  useConfigContext: () => UserConfig;
   useResolvedConfigContext: () => NormalizedConfig;
 }> | undefined, options?: PluginOptions<CliHooks, AsyncSetup<CliHooks, {
   setAppContext: (value: import("@modern-js/types").IAppContext) => void;
   useAppContext: () => import("@modern-js/types").IAppContext;
-  useConfigContext: () => import("./config").UserConfig;
+  useConfigContext: () => UserConfig;
   useResolvedConfigContext: () => NormalizedConfig;
 }>> | undefined) => import("@modern-js/plugin").AsyncPlugin<CliHooks, {
   setAppContext: (value: import("@modern-js/types").IAppContext) => void;
   useAppContext: () => import("@modern-js/types").IAppContext;
-  useConfigContext: () => import("./config").UserConfig;
+  useConfigContext: () => UserConfig;
   useResolvedConfigContext: () => NormalizedConfig;
 }>, registerHook: (newHooks: Partial<CliHooks>) => void, mountHook: () => ToRunners<CliHooks>;
 export declare const usePlugins: (plugins: string[]) => void;

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

@@ -1,7 +1,4 @@
-import { program, Command } from 'commander';
-declare module 'commander' {
-  interface Command {
-    commandsMap: Map<string, Command>;
-  }
-}
-export { program, Command };
+import { program, Command } from '@modern-js/utils';
+export declare function initCommandsMap(): void;
+export type { Command };
+export { program };

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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.6.0",
+  "version": "1.7.1-beta.peer.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -42,37 +42,38 @@
   "dependencies": {
     "@babel/code-frame": "^7.14.5",
     "@babel/runtime": "^7",
-    "@modern-js/load-config": "^1.2.2",
+    "@modern-js/load-config": "^1.3.0",
     "@modern-js/plugin": "^1.3.2",
-    "@modern-js/utils": "^1.3.6",
+    "@modern-js/utils": "^1.4.1",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
-    "better-ajv-errors": "^0.7.0",
-    "chokidar": "^3.5.2",
-    "commander": "^8.1.0",
+    "better-ajv-errors": "1.2.0",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.mergewith": "^4.6.2",
-    "signale": "^1.4.0",
     "v8-compile-cache": "^2.3.0"
   },
   "devDependencies": {
-    "btsm": "2.2.2",
+    "@jest/types": "^27.0.6",
+    "@modern-js/types": "^1.4.0",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.3.5",
+    "@types/babel__core": "^7.1.16",
     "@types/jest": "^26",
-    "@types/lodash.clonedeep": "^4.5.6",
-    "@types/lodash.mergewith": "^4.6.6",
+    "@types/less": "^3.0.3",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
-    "@types/signale": "^1.4.2",
-    "typescript": "^4",
+    "autoprefixer": "^10.3.1",
+    "btsm": "2.2.2",
     "jest": "^27",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0"
+    "sass": "^1.45.0",
+    "electron-builder": "22.7.0",
+    "terser-webpack-plugin": "^5.1.4",
+    "typescript": "^4",
+    "webpack": "^5.71.0",
+    "webpack-chain": "^6.5.1"
   },
   "sideEffects": false,
   "modernConfig": {

package/tests/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  extends: ['@modern-js'],
-  parserOptions: {
-    project: require.resolve('./tsconfig.json'),
-  },
-};

package/tests/btsm.test.ts

@@ -1,20 +0,0 @@
-import path from 'path';
-import { spawnSync } from 'child_process';
-
-const kPackageDir = path.resolve(__dirname, '..');
-
-describe('jsnext:source', () => {
-  test('process exit status is 0', () => {
-    const { status, stdout, stderr } = spawnSync(
-      process.execPath,
-      ['--conditions=jsnext:source', '-r', 'btsm', 'src/cli.ts'],
-      {
-        cwd: kPackageDir,
-        encoding: 'utf-8',
-      },
-    );
-    expect(stdout).toBe('');
-    expect(stderr.startsWith('Usage: modern <command> [options]')).toBe(true);
-    expect(status).toBe(1);
-  });
-});

package/tests/config.test.ts

@@ -1,137 +0,0 @@
-import path from 'path';
-// import os from 'os';
-import { isDev, getPort } from '@modern-js/utils';
-import { resolveConfig } from '../src/config';
-import {
-  cli,
-  loadUserConfig,
-  initAppContext,
-  initAppDir,
-  manager,
-  createPlugin,
-  registerHook,
-  useRunner,
-} from '../src';
-import { defaults } from '../src/config/defaults';
-
-jest.mock('@modern-js/utils', () => ({
-  __esModule: true,
-  ...jest.requireActual('@modern-js/utils'),
-  isDev: jest.fn(),
-  getPort: jest.fn(),
-}));
-
-// const kOSRootDir =
-//   os.platform() === 'win32' ? process.cwd().split(path.sep)[0] : '/';
-
-describe('config', () => {
-  /**
-   * Typescript Type annotations cannot be used for esbuild-jest
-   * test files that use jest.mock('@some/module')
-   * refer to this esbuild-jest issue:
-   * https://github.com/aelbore/esbuild-jest/issues/57
-   * TODO: find a better solution to solve this problem while allowing us
-   * to use esbuild, and have good TypeScript support
-   */
-  let loaded = {
-    config: {},
-    filePath: '',
-    dependencies: [],
-    pkgConfig: {},
-    jsConfig: {},
-  };
-  let schemas: any[] = [];
-  let restartWithExistingPort = 0;
-  let argv: string[] = ['dev'];
-  let configs: any[] = [];
-
-  const getResolvedConfig = async () =>
-    resolveConfig(loaded, configs, schemas, restartWithExistingPort, argv);
-
-  const resetParams = () => {
-    loaded = {
-      config: {},
-      filePath: '',
-      dependencies: [],
-      pkgConfig: {},
-      jsConfig: {},
-    };
-    schemas = [];
-    restartWithExistingPort = 0;
-    argv = ['dev'];
-    configs = [];
-  };
-  const resetMock = () => {
-    jest.resetAllMocks();
-    (isDev as jest.Mock).mockReturnValue(true);
-    (getPort as jest.Mock).mockReturnValue(
-      Promise.resolve(defaults.server.port),
-    );
-  };
-  beforeEach(() => {
-    resetParams();
-    resetMock();
-  });
-
-  it('default', () => {
-    expect(resolveConfig).toBeDefined();
-    expect(cli).toBeDefined();
-    expect(loadUserConfig).toBeDefined();
-    expect(initAppContext).toBeDefined();
-    expect(initAppDir).toBeDefined();
-    expect(manager).toBeDefined();
-    expect(createPlugin).toBeDefined();
-    expect(registerHook).toBeDefined();
-    expect(useRunner).toBeDefined();
-  });
-
-  it('initAppDir', async () => {
-    expect(await initAppDir(__dirname)).toBe(path.resolve(__dirname, '..'));
-    // expect(await initAppDir()).toBe(path.resolve(__dirname, '..'));
-
-    // FIXME: windows 下面会失败，先忽略这个测试
-    // try {
-    //   await initAppDir(kOSRootDir);
-    //   expect(true).toBe(false); // SHOULD NOT BE HERE
-    // } catch (err: any) {
-    //   expect(err.message).toMatch(/no package.json found in current work dir/);
-    // }
-  });
-
-  test('should use default port if not restarting in dev mode', async () => {
-    let resolved = await getResolvedConfig();
-    expect(resolved.server.port).toEqual(defaults.server.port);
-    expect(getPort).toHaveBeenCalledWith(defaults.server.port);
-
-    // getResolvedConfig should use the value givin by getPort
-    restartWithExistingPort = -1;
-    (getPort as jest.Mock).mockClear();
-    (getPort as jest.Mock).mockReturnValue(1111);
-    resolved = await getResolvedConfig();
-    expect(resolved.server.port).toEqual(1111);
-    expect(getPort).toHaveBeenCalledWith(defaults.server.port);
-
-    argv = ['start'];
-    (isDev as jest.Mock).mockReturnValue(false);
-    restartWithExistingPort = 0;
-    resolved = await getResolvedConfig();
-    expect(resolved.server.port).toEqual(defaults.server.port);
-
-    restartWithExistingPort = 1234;
-    resolved = await getResolvedConfig();
-    expect(resolved.server.port).toEqual(defaults.server.port);
-
-    restartWithExistingPort = -1;
-    resolved = await getResolvedConfig();
-    expect(resolved.server.port).toEqual(defaults.server.port);
-  });
-
-  test('should reuse existing port if restarting in dev mode', async () => {
-    restartWithExistingPort = 1234;
-    const resolved = await getResolvedConfig();
-    expect(resolved.server.port).toEqual(1234);
-  });
-});
-
-// type TEST = Parameters<typeof resolveConfig>;
-// type TypeC = TEST[1];

package/tests/context.test.ts

@@ -1,70 +0,0 @@
-import path from 'path';
-import { initAppContext } from '../src/context';
-
-describe('context', () => {
-  it('initAppContext', () => {
-    const appDirectory = path.resolve(
-      __dirname,
-      './fixtures/load-plugin/user-plugins',
-    );
-    const appContext = initAppContext(appDirectory, [], false);
-    expect(appContext).toEqual({
-      appDirectory,
-      configFile: false,
-      ip: expect.any(String),
-      port: 0,
-      packageName: expect.any(String),
-      srcDirectory: expect.any(String),
-      distDirectory: expect.any(String),
-      sharedDirectory: expect.any(String),
-      nodeModulesDirectory: expect.any(String),
-      internalDirectory: expect.any(String),
-      plugins: [],
-      htmlTemplates: {},
-      serverRoutes: [],
-      entrypoints: [],
-      checkedEntries: [],
-      existSrc: true,
-      internalDirAlias: '@_modern_js_internal',
-      internalSrcAlias: '@_modern_js_src',
-      metaName: 'modern-js',
-    });
-  });
-
-  it('custom AppContext', () => {
-    const appDirectory = path.resolve(
-      __dirname,
-      './fixtures/load-plugin/user-plugins',
-    );
-
-    const customOptions = {
-      srcDir: 'source',
-      distDir: 'dist',
-      sharedDir: 'myShared',
-      metaName: 'jupiter',
-    };
-
-    const appContext = initAppContext(appDirectory, [], false, customOptions);
-    expect(appContext).toEqual({
-      appDirectory,
-      configFile: false,
-      ip: expect.any(String),
-      port: 0,
-      packageName: 'user-plugins',
-      srcDirectory: path.resolve(appDirectory, './source'),
-      distDirectory: 'dist',
-      sharedDirectory: path.resolve(appDirectory, './myShared'),
-      nodeModulesDirectory: expect.any(String),
-      internalDirectory: path.resolve(appDirectory, './node_modules/.jupiter'),
-      plugins: [],
-      htmlTemplates: {},
-      serverRoutes: [],
-      entrypoints: [],
-      checkedEntries: [],
-      existSrc: true,
-      internalDirAlias: '@_jupiter_internal',
-      internalSrcAlias: '@_jupiter_src',
-      metaName: 'jupiter',
-    });
-  });
-});

package/tests/fixtures/index-test/package.json

@@ -1,3 +0,0 @@
-{
-  "name": "index-test"
-}

package/tests/fixtures/load-plugin/not-found/package.json

@@ -1,3 +0,0 @@
-{
-  "name": "not-found"
-}

package/tests/fixtures/load-plugin/not-found/test-plugin-a.js

@@ -1 +0,0 @@
-module.exports = { name: 'a' };

package/tests/fixtures/load-plugin/user-plugins/package.json

@@ -1,3 +0,0 @@
-{
-  "name": "user-plugins"
-}

package/tests/fixtures/load-plugin/user-plugins/test-plugin-a.js

@@ -1 +0,0 @@
-module.exports = { name: 'a' };

package/tests/fixtures/load-plugin/user-plugins/test-plugin-b.js

@@ -1,3 +0,0 @@
-Object.defineProperty(exports, '__esModule', { value: true });
-
-exports.default = { name: 'b' };

package/tests/fixtures/load-plugin/user-plugins/test-plugin-c.js

@@ -1,3 +0,0 @@
-Object.defineProperty(exports, '__esModule', { value: true });
-
-exports.default = name => ({ name });

package/tests/index.test.ts

@@ -1,69 +0,0 @@
-import path from 'path';
-import { cli } from '../src';
-import { resolveConfig, loadUserConfig } from '../src/config';
-import { loadEnv } from '../src/loadEnv';
-
-jest.mock('../src/config', () => ({
-  __esModule: true,
-  ...jest.requireActual('../src/config'),
-  loadUserConfig: jest.fn(),
-  resolveConfig: jest.fn(),
-}));
-
-jest.mock('../src/loadEnv', () => ({
-  __esModule: true,
-  ...jest.requireActual('../src/loadEnv'),
-  loadEnv: jest.fn(),
-}));
-
-describe('@modern-js/core test', () => {
-  let mockResolveConfig: any = {};
-  let mockLoadedConfig: any = {};
-  const cwdSpy = jest.spyOn(process, 'cwd');
-  const cwd = path.join(__dirname, './fixtures/index-test');
-
-  const resetMock = () => {
-    jest.resetAllMocks();
-    cwdSpy.mockReturnValue(cwd);
-    (resolveConfig as jest.Mock).mockReturnValue(
-      Promise.resolve(mockResolveConfig),
-    );
-    (loadUserConfig as jest.Mock).mockImplementation(() =>
-      Promise.resolve(mockLoadedConfig),
-    );
-  };
-
-  const resetValues = () => {
-    mockLoadedConfig = {
-      config: {},
-      filePath: false,
-      dependencies: [],
-      pkgConfig: {},
-      jsConfig: {},
-    };
-    mockResolveConfig = {
-      server: {
-        port: 8080,
-      },
-      output: {
-        path: './my/test/path',
-      },
-    };
-  };
-
-  beforeEach(() => {
-    resetValues();
-    resetMock();
-  });
-
-  it('test cli create', () => {
-    expect(cli).toBeTruthy();
-  });
-
-  it('test cli init dev', async () => {
-    cwdSpy.mockReturnValue(path.join(cwd, 'nested-folder'));
-    await cli.init(['dev']);
-    expect(loadEnv).toHaveBeenCalledWith(cwd, undefined);
-    // TODO: add more test cases
-  });
-});

package/tests/initWatcher.test.ts

@@ -1,63 +0,0 @@
-import * as path from 'path';
-import { fs, wait } from '@modern-js/utils';
-import { initWatcher } from '../src/initWatcher';
-
-jest.useRealTimers();
-
-const mockAppDirectory = path.join(__dirname, './fixtures/index-test');
-const mockConfigDir = './config';
-const mockSrcDirectory = path.join(mockAppDirectory, './src');
-
-describe.skip('initWatcher', () => {
-  afterAll(() => {
-    const file = path.join(mockSrcDirectory, './index.ts');
-    if (fs.existsSync(file)) {
-      fs.unlinkSync(file);
-    }
-  });
-
-  test('will trigger add event', async () => {
-    let triggeredType = '';
-    let triggeredFile = '';
-    const loaded = {
-      filePath: '',
-      dependencies: [],
-    };
-    const hooksRunner = {
-      watchFiles: async () => [mockSrcDirectory],
-      fileChange: jest.fn(({ filename, eventType }) => {
-        triggeredType = eventType;
-        triggeredFile = filename;
-      }),
-    };
-
-    if (await fs.pathExists(mockSrcDirectory)) {
-      await fs.remove(mockSrcDirectory);
-    }
-
-    const watcher = await initWatcher(
-      loaded as any,
-      mockAppDirectory,
-      mockConfigDir,
-      hooksRunner as any,
-      ['dev'],
-    );
-    await wait(100);
-
-    const file = path.join(mockSrcDirectory, './index.ts');
-    await fs.outputFile(file, '');
-    await wait(100);
-    // expect(hooksRunner.fileChange).toBeCalledTimes(1);
-    // expect(triggeredType).toBe('add');
-    expect(file.includes(triggeredFile)).toBeTruthy();
-
-    await wait(100);
-    await fs.remove(file);
-    await wait(200);
-    expect(hooksRunner.fileChange).toBeCalledTimes(2);
-    expect(triggeredType).toBe('unlink');
-    expect(file.includes(triggeredFile)).toBeTruthy();
-
-    watcher?.close();
-  });
-});