@modern-js/app-tools 1.3.0 → 1.4.1

package/dist/js/node/utils/getSpecifiedEntries.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSpecifiedEntries = void 0;
+
+var _inquirer = _interopRequireDefault(require("inquirer"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const getSpecifiedEntries = async (entry, entrypoints) => {
+  const entryNames = entrypoints.map(e => e.entryName);
+
+  if (!entry) {
+    return entryNames;
+  }
+
+  if (typeof entry === 'boolean') {
+    const {
+      selected
+    } = await _inquirer.default.prompt([{
+      type: 'checkbox',
+      name: 'selected',
+      choices: entryNames,
+      message: '请选择需要构建的入口',
+
+      validate(answer) {
+        if (answer.length < 1) {
+          return 'You must choose at least one topping.';
+        }
+
+        return true;
+      }
+
+    }]);
+    return selected;
+  }
+
+  entry.forEach(name => {
+    if (!entryNames.includes(name)) {
+      throw new Error(`can not found entry ${name}, compiler entry should in ${entryNames.join(', ')}`);
+    }
+  });
+  return entry;
+};
+
+exports.getSpecifiedEntries = getSpecifiedEntries;

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

@@ -11,8 +11,11 @@ var _core = require("@modern-js/core");
 
 const printInstructions = async (appContext, config) => {
   let message = (0, _utils.prettyInstructions)(appContext, config);
+  const {
+    existSrc
+  } = appContext;
 
-  if ((0, _utils.isDev)()) {
+  if ((0, _utils.isDev)() && existSrc) {
     message += `\n${_utils.chalk.cyanBright([`Note that the development build is not optimized.`, `To create a production build, execute build command.`].join('\n'))}`;
   } // call beforePrintInstructions hook.
 

package/dist/js/node/utils/routes.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateRoutes = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _utils = require("@modern-js/utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const generateRoutes = async appContext => {
+  const {
+    serverRoutes,
+    distDirectory
+  } = appContext;
+  const output = JSON.stringify({
+    routes: serverRoutes
+  }, null, 2);
+  await _utils.fs.outputFile(_path.default.join(distDirectory, _utils.ROUTE_SPEC_FILE), output);
+};
+
+exports.generateRoutes = generateRoutes;

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

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

package/dist/types/index.d.ts

@@ -14,8 +14,10 @@ declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@m
   watchFiles: import("@modern-js/core").ParallelWorkflow<void, unknown>;
   fileChange: import("@modern-js/core").AsyncWorkflow<{
     filename: string;
+    eventType: "add" | "unlink" | "change";
   }, void>;
   beforeExit: import("@modern-js/core").AsyncWorkflow<void, void>;
+  beforeRestart: import("@modern-js/core").AsyncWorkflow<void, void>;
 } & import("@modern-js/core").ClearDraftProgress<import("@modern-js/core").Hooks>>>>;
 
 export default _default;

package/dist/types/locale/en.d.ts

@@ -3,6 +3,7 @@ export declare const EN_LOCALE: {
     dev: {
       describe: string;
       config: string;
+      entry: string;
     };
     build: {
       describe: string;

package/dist/types/locale/index.d.ts

@@ -5,6 +5,7 @@ declare const localeKeys: {
     dev: {
       describe: string;
       config: string;
+      entry: string;
     };
     build: {
       describe: string;
@@ -29,6 +30,7 @@ declare const localeKeys: {
     dev: {
       describe: string;
       config: string;
+      entry: string;
     };
     build: {
       describe: string;

package/dist/types/locale/zh.d.ts

@@ -3,6 +3,7 @@ export declare const ZH_LOCALE: {
     dev: {
       describe: string;
       config: string;
+      entry: string;
     };
     build: {
       describe: string;

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

@@ -1,2 +1,4 @@
 import { Server, ModernServerOptions } from '@modern-js/server';
+export declare const getServer: () => Server | null;
+export declare const closeServer: () => Promise<void>;
 export declare const createServer: (options: ModernServerOptions) => Promise<Server>;

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

@@ -0,0 +1,2 @@
+import { Entrypoint } from '@modern-js/types';
+export declare const getSpecifiedEntries: (entry: string[] | boolean, entrypoints: Entrypoint[]) => Promise<string[]>;

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

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

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

@@ -0,0 +1,3 @@
+export declare type DevOptions = {
+  entry: string[] | boolean;
+};

package/lib/types.d.ts

@@ -71,11 +71,6 @@ declare module '*.less' {
   export default classes;
 }
 
-declare module '*.styl' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
 declare module '*.sass' {
   const classes: { readonly [key: string]: string };
   export default classes;
@@ -96,11 +91,6 @@ declare module '*.module.less' {
   export default classes;
 }
 
-declare module '*.module.styl' {
-  const classes: { readonly [key: string]: string };
-  export default classes;
-}
-
 declare module '*.module.sass' {
   const classes: { readonly [key: string]: string };
   export default classes;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.0",
+  "version": "1.4.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -50,18 +50,18 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.3.0",
-    "@modern-js/types": "^1.2.0",
-    "@modern-js/i18n-cli-language-detector": "^1.2.0",
-    "@modern-js/new-action": "^1.3.0",
-    "@modern-js/plugin": "^1.2.0",
-    "@modern-js/plugin-analyze": "^1.2.0",
-    "@modern-js/plugin-fast-refresh": "^1.2.0",
-    "@modern-js/plugin-i18n": "^1.2.0",
-    "@modern-js/plugin-polyfill": "^1.2.0",
-    "@modern-js/server": "^1.3.0",
-    "@modern-js/utils": "^1.2.0",
-    "@modern-js/webpack": "^1.2.0",
+    "@modern-js/core": "^1.4.1",
+    "@modern-js/types": "^1.3.1",
+    "@modern-js/i18n-cli-language-detector": "^1.2.1",
+    "@modern-js/new-action": "^1.3.1",
+    "@modern-js/plugin": "^1.2.1",
+    "@modern-js/plugin-analyze": "^1.3.1",
+    "@modern-js/plugin-fast-refresh": "^1.2.1",
+    "@modern-js/plugin-i18n": "^1.2.1",
+    "@modern-js/server": "^1.4.1",
+    "@modern-js/utils": "^1.3.1",
+    "@modern-js/webpack": "^1.3.1",
+    "inquirer": "^8.2.0",
     "webpack": "^5.54.0"
   },
   "devDependencies": {
@@ -72,7 +72,8 @@
     "typescript": "^4",
     "@scripts/build": "0.0.0",
     "jest": "^27",
-    "@scripts/jest-config": "0.0.0"
+    "@scripts/jest-config": "0.0.0",
+    "@types/inquirer": "^8.2.0"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -82,8 +83,7 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "scripts": {
     "new": "modern new",

package/tests/commands/build.test.ts

@@ -0,0 +1,37 @@
+import { build } from '../../src/commands/build';
+
+const mockBeforeBuild = jest.fn();
+const mockAfterBuild = jest.fn();
+const mockGenerateRoutes = jest.fn();
+
+jest.mock('@modern-js/core', () => ({
+  __esModule: true,
+  mountHook() {
+    return {
+      beforeBuild: mockBeforeBuild,
+      afterBuild: mockAfterBuild,
+    };
+  },
+  useAppContext: jest.fn(() => ({
+    existSrc: false,
+  })),
+  useResolvedConfigContext: jest.fn(),
+}));
+
+jest.mock('../../src/utils/routes', () => ({
+  __esModule: true,
+  generateRoutes: () => mockGenerateRoutes(),
+}));
+
+describe('command build', () => {
+  afterAll(() => {
+    jest.resetAllMocks();
+  });
+
+  test('existSrc is false', async () => {
+    await build();
+    expect(mockBeforeBuild).toBeCalled();
+    expect(mockGenerateRoutes).toBeCalled();
+    expect(mockAfterBuild).toBeCalled();
+  });
+});

package/tests/commands/dev.test.ts

@@ -0,0 +1,7 @@
+import { dev } from '../../src/commands/dev';
+
+describe('command', () => {
+  test('dev', () => {
+    expect(dev).toBeDefined();
+  });
+});

package/tests/routes.test.ts

@@ -0,0 +1,27 @@
+import { fs } from '@modern-js/utils';
+import { generateRoutes } from '../src/utils/routes';
+
+jest.mock('@modern-js/utils', () => {
+  const originalModule = jest.requireActual('@modern-js/utils');
+  return {
+    __esModule: true,
+    ...originalModule,
+    fs: {
+      outputFile: jest.fn((filename: string, output: string) => ({
+        filename,
+        output,
+      })),
+    },
+  };
+});
+
+describe('routes', () => {
+  test('generateRoutes', async () => {
+    const mockAppContext = {
+      serverRoutes: [],
+      distDirectory: './dist',
+    };
+    await generateRoutes(mockAppContext as any);
+    expect(fs.outputFile).toHaveBeenCalledTimes(1);
+  });
+});

package/tests/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "declaration": true,
+    "jsx": "preserve",
+    "baseUrl": "./",
+    "outDir": "./out",
+    "emitDeclarationOnly": true,
+    "isolatedModules": true,
+    "paths": {},
+    "types": ["node", "jest"]
+  }
+}

package/tests/utils.test.ts

@@ -0,0 +1,67 @@
+import inquirer from 'inquirer';
+import { Server } from '@modern-js/server';
+import {
+  closeServer,
+  createServer,
+  getServer,
+} from '../src/utils/createServer';
+import { getSpecifiedEntries } from '../src/utils/getSpecifiedEntries';
+
+describe('test app-tools utils', () => {
+  it('should return all entryNames correctly', async () => {
+    const checked = await getSpecifiedEntries(false, [
+      { entryName: 'a' },
+      { entryName: 'b' },
+    ] as any);
+
+    expect(checked).toEqual(['a', 'b']);
+  });
+
+  it('should return spec entry', async () => {
+    const checked = await getSpecifiedEntries(['a'], [
+      { entryName: 'a' },
+      { entryName: 'b' },
+    ] as any);
+
+    expect(checked).toEqual(['a']);
+  });
+
+  it('should return select entry', async () => {
+    inquirer.prompt = jest.fn().mockResolvedValue({ selected: ['b'] }) as any;
+    const checked = await getSpecifiedEntries(true, [
+      { entryName: 'a' },
+      { entryName: 'b' },
+    ] as any);
+
+    expect(checked).toEqual(['b']);
+  });
+
+  it('should get error if entry not allow', resolve => {
+    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();
+    });
+  });
+
+  it('should create and close server correctly', async () => {
+    const app = await createServer({
+      dev: false,
+      pwd: '.',
+      config: {
+        output: {
+          path: 'dist',
+        },
+      },
+    } as any);
+
+    expect(app instanceof Server).toBe(true);
+    expect(getServer()).toBe(app);
+
+    await closeServer();
+    expect(getServer()).toBeNull();
+  });
+});

package/src/commands/build.ts

@@ -1,129 +0,0 @@
-import { Configuration, webpack } from 'webpack';
-import { WebpackConfigTarget, getWebpackConfig } from '@modern-js/webpack';
-import {
-  useAppContext,
-  useResolvedConfigContext,
-  mountHook,
-  ResolvedConfigContext,
-  manager,
-} from '@modern-js/core';
-import {
-  fs,
-  formatWebpackMessages,
-  measureFileSizesBeforeBuild,
-  printFileSizesAfterBuild,
-  printBuildError,
-  logger,
-  isUseSSRBundle,
-} from '@modern-js/utils';
-
-// 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;
-
-interface CliOptions {
-  analyze?: boolean;
-}
-
-export const build = async (options?: CliOptions) => {
-  const webpackBuild = async (webpackConfig: Configuration, type?: string) => {
-    const compiler = webpack(webpackConfig);
-
-    return new Promise((resolve, reject) => {
-      let label = process.env.NODE_ENV || '';
-      if (type && type !== 'legacy') {
-        label += ` ${type}`;
-      }
-      logger.info(`Creating a ${label} build...`);
-
-      compiler.run((err, stats) => {
-        let messages: {
-          errors: any;
-          warnings: any;
-        };
-        if (!err) {
-          messages = formatWebpackMessages(
-            stats!.toJson({ all: false, warnings: true, errors: true }),
-          );
-
-          if (messages.errors.length === 0) {
-            logger.info(`File sizes after ${label} build:\n`);
-            printFileSizesAfterBuild(
-              stats,
-              previousFileSizes,
-              outputPath,
-              WARN_AFTER_BUNDLE_GZIP_SIZE,
-              WARN_AFTER_CHUNK_GZIP_SIZE,
-            );
-            logger.log();
-          }
-        }
-
-        // When using run or watch, call close and wait for it to finish before calling run or watch again.
-        // Concurrent compilations will corrupt the output files.
-        compiler.close(closeErr => {
-          if (closeErr) {
-            logger.error(closeErr);
-          }
-          if (err) {
-            reject(err);
-          } else {
-            if (messages.errors.length) {
-              reject(new Error(messages.errors.join('\n\n')));
-              return;
-            }
-            resolve({ warnings: messages.warnings });
-          }
-        });
-      });
-    });
-  };
-
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const resolvedConfig = useResolvedConfigContext();
-  const appContext = useAppContext();
-  /* eslint-enable react-hooks/rules-of-hooks */
-
-  manager.run(() => {
-    ResolvedConfigContext.set({ ...resolvedConfig, cliOptions: options });
-  });
-
-  const outputPath = appContext.distDirectory;
-  const previousFileSizes = await measureFileSizesBeforeBuild(outputPath);
-  fs.emptyDirSync(outputPath);
-
-  const buildConfigs = [];
-
-  buildConfigs.push({
-    type: 'legacy',
-    config: getWebpackConfig(WebpackConfigTarget.CLIENT)!,
-  });
-
-  if (resolvedConfig.output.enableModernMode) {
-    buildConfigs.push({
-      type: 'modern',
-      config: getWebpackConfig(WebpackConfigTarget.MODERN)!,
-    });
-  }
-
-  if (isUseSSRBundle(resolvedConfig)) {
-    buildConfigs.push({
-      type: 'ssr',
-      config: getWebpackConfig(WebpackConfigTarget.NODE)!,
-    });
-  }
-
-  await (mountHook() as any).beforeBuild({
-    webpackConfigs: buildConfigs.map(({ config }) => config),
-  });
-
-  for (const buildConfig of buildConfigs) {
-    const { type: buildType, config } = buildConfig;
-    try {
-      await webpackBuild(config, buildType);
-    } catch (error) {
-      printBuildError(error as Error);
-    }
-  }
-  await (mountHook() as any).afterBuild();
-};

package/src/commands/deploy.ts

@@ -1,6 +0,0 @@
-import { mountHook } from '@modern-js/core';
-
-export const deploy = async (options: any) => {
-  await (mountHook() as any).beforeDeploy(options);
-  await (mountHook() as any).afterDeploy(options);
-};

package/src/commands/dev.ts

@@ -1,80 +0,0 @@
-import {
-  Configuration,
-  getWebpackConfig,
-  WebpackConfigTarget,
-} from '@modern-js/webpack';
-import {
-  fs,
-  logger,
-  HMR_SOCK_PATH,
-  clearConsole,
-  chalk,
-  isSSR,
-} from '@modern-js/utils';
-import {
-  useAppContext,
-  useResolvedConfigContext,
-  mountHook,
-} from '@modern-js/core';
-import { createCompiler } from '../utils/createCompiler';
-import { createServer } from '../utils/createServer';
-
-export const dev = async () => {
-  /* eslint-disable react-hooks/rules-of-hooks */
-  const appContext = useAppContext();
-  const userConfig = useResolvedConfigContext();
-  /* eslint-enable react-hooks/rules-of-hooks */
-
-  const { appDirectory, distDirectory, port } = appContext;
-
-  fs.emptyDirSync(distDirectory);
-
-  await (mountHook() as any).beforeDev();
-
-  const webpackConfigs = [
-    isSSR(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE),
-    getWebpackConfig(WebpackConfigTarget.CLIENT),
-  ].filter(Boolean) as Configuration[];
-
-  const compiler = await createCompiler({
-    webpackConfigs,
-    userConfig,
-    appContext,
-  });
-
-  const app = await createServer({
-    dev: {
-      ...{
-        client: {
-          port: port!.toString(),
-          overlay: false,
-          logging: 'none',
-          path: HMR_SOCK_PATH,
-          host: 'localhost',
-        },
-        dev: { writeToDisk: (file: string) => !file.includes('.hot-update.') },
-        hot: true,
-        liveReload: true,
-        port,
-        https: userConfig.dev.https,
-      },
-      ...userConfig.tools.devServer,
-    },
-    compiler,
-    pwd: appDirectory,
-    config: userConfig as any,
-    plugins: appContext.plugins
-      .filter((p: any) => p.server)
-      .map((p: any) => p.server),
-  });
-
-  app.listen(port, (err: Error) => {
-    if (err) {
-      throw err;
-    }
-
-    clearConsole();
-
-    logger.log(chalk.cyan(`Starting the development server...`));
-  });
-};

package/src/commands/index.ts

@@ -1,3 +0,0 @@
-export * from './dev';
-export * from './build';
-export * from './start';

package/src/commands/start.ts

@@ -1,30 +0,0 @@
-import { logger, chalk } from '@modern-js/utils';
-import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
-import server from '@modern-js/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 */
-
-  const { appDirectory, port } = appContext;
-
-  logger.log(chalk.cyan(`Starting the modern server...`));
-
-  const app = await server({
-    pwd: appDirectory,
-    config: userConfig as any,
-    plugins: appContext.plugins
-      .filter((p: any) => p.server)
-      .map((p: any) => p.server),
-  });
-
-  app.listen(port, async (err: Error) => {
-    if (err) {
-      throw err;
-    }
-    await printInstructions(appContext, userConfig);
-  });
-};