@modern-js/app-tools 1.4.0 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/app-tools
 
+## 1.4.1
+
+### Patch Changes
+
+- 78279953: compiler entry bug fix and dev build console
+- c78400c7: fix: remove stylus support
+- 4d72edea: support dev compiler by entry
+- Updated dependencies [75f4eeb8]
+- Updated dependencies [b7a9eeba]
+- Updated dependencies [2cfc4235]
+- Updated dependencies [8d55e234]
+- Updated dependencies [53aca274]
+- Updated dependencies [78279953]
+- Updated dependencies [e116ace5]
+- Updated dependencies [4d72edea]
+  - @modern-js/webpack@1.3.1
+  - @modern-js/plugin-analyze@1.3.1
+  - @modern-js/server@1.4.1
+  - @modern-js/core@1.4.1
+  - @modern-js/types@1.3.1
+  - @modern-js/utils@1.3.1
+
 ## 1.4.0
 
 ### Minor Changes

package/dist/js/modern/commands/dev.js

@@ -6,12 +6,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { 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 { 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";
-export const dev = async () => {
+import { getSpecifiedEntries } from "../utils/getSpecifiedEntries";
+export const dev = async options => {
   /* eslint-disable react-hooks/rules-of-hooks */
   const appContext = useAppContext();
   const userConfig = useResolvedConfigContext();
@@ -21,8 +22,14 @@ export const dev = async () => {
     appDirectory,
     distDirectory,
     port,
-    existSrc
+    existSrc,
+    entrypoints
   } = appContext;
+  const checkedEntries = await getSpecifiedEntries(options.entry || false, entrypoints);
+  AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
+    checkedEntries
+  }));
+  appContext.checkedEntries = checkedEntries;
   fs.emptyDirSync(distDirectory);
   await mountHook().beforeDev();
   let compiler = null;

package/dist/js/modern/index.js

@@ -12,6 +12,7 @@ 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
 
 usePlugins([require.resolve('@modern-js/plugin-analyze/cli'), require.resolve('@modern-js/plugin-fast-refresh/cli')]);
@@ -25,8 +26,8 @@ export default createPlugin(() => {
     commands({
       program
     }) {
-      program.command('dev').usage('[options]').description(i18n.t(localeKeys.command.dev.describe)).option('-c --config <config>', i18n.t(localeKeys.command.dev.config)).action(async () => {
-        await dev();
+      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 {
@@ -77,6 +78,7 @@ export default createPlugin(() => {
       const absolutePath = path.resolve(appDirectory, filename);
 
       if (!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink')) {
+        await closeServer();
         await cli.restart();
       }
     },

package/dist/js/modern/locale/en.js

@@ -2,7 +2,8 @@ export const EN_LOCALE = {
   command: {
     dev: {
       describe: 'start dev server',
-      config: 'specify config file'
+      config: 'specify config file',
+      entry: 'compiler by entry'
     },
     build: {
       describe: 'build application',

package/dist/js/modern/locale/zh.js

@@ -2,7 +2,8 @@ export const ZH_LOCALE = {
   command: {
     dev: {
       describe: '本地开发命令',
-      config: '制定配置文件路径'
+      config: '制定配置文件路径',
+      entry: '按入口编译'
     },
     build: {
       describe: '构建应用命令',

package/dist/js/modern/utils/createServer.js

@@ -1,5 +1,12 @@
 import { Server } from '@modern-js/server';
-let server;
+let server = null;
+export const getServer = () => server;
+export const closeServer = async () => {
+  if (server) {
+    await server.close();
+    server = null;
+  }
+};
 export const createServer = async options => {
   if (server) {
     await server.close();

package/dist/js/modern/utils/getSpecifiedEntries.js

@@ -0,0 +1,36 @@
+import inquirer from 'inquirer';
+export const getSpecifiedEntries = async (entry, entrypoints) => {
+  const entryNames = entrypoints.map(e => e.entryName);
+
+  if (!entry) {
+    return entryNames;
+  }
+
+  if (typeof entry === 'boolean') {
+    const {
+      selected
+    } = await inquirer.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;
+};

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

@@ -19,13 +19,15 @@ var _routes = require("../utils/routes");
 
 var _printInstructions = require("../utils/printInstructions");
 
+var _getSpecifiedEntries = require("../utils/getSpecifiedEntries");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const dev = async () => {
+const dev = async options => {
   /* eslint-disable react-hooks/rules-of-hooks */
   const appContext = (0, _core.useAppContext)();
   const userConfig = (0, _core.useResolvedConfigContext)();
@@ -35,8 +37,16 @@ const dev = async () => {
     appDirectory,
     distDirectory,
     port,
-    existSrc
+    existSrc,
+    entrypoints
   } = appContext;
+  const checkedEntries = await (0, _getSpecifiedEntries.getSpecifiedEntries)(options.entry || false, entrypoints);
+
+  _core.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
+    checkedEntries
+  }));
+
+  appContext.checkedEntries = checkedEntries;
 
   _utils.fs.emptyDirSync(distDirectory);
 

package/dist/js/node/index.js

@@ -27,6 +27,8 @@ var _start = require("./commands/start");
 
 var _dev = require("./commands/dev");
 
+var _createServer = require("./utils/createServer");
+
 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; }
@@ -52,8 +54,8 @@ var _default = (0, _core.createPlugin)(() => {
     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)).action(async () => {
-        await (0, _dev.dev)();
+      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 {
@@ -104,6 +106,7 @@ var _default = (0, _core.createPlugin)(() => {
       const absolutePath = path.resolve(appDirectory, filename);
 
       if (!absolutePath.includes(srcDirectory) && (eventType === 'change' || eventType === 'unlink')) {
+        await (0, _createServer.closeServer)();
         await _core.cli.restart();
       }
     },

package/dist/js/node/locale/en.js

@@ -8,7 +8,8 @@ const EN_LOCALE = {
   command: {
     dev: {
       describe: 'start dev server',
-      config: 'specify config file'
+      config: 'specify config file',
+      entry: 'compiler by entry'
     },
     build: {
       describe: 'build application',

package/dist/js/node/locale/zh.js

@@ -8,7 +8,8 @@ const ZH_LOCALE = {
   command: {
     dev: {
       describe: '本地开发命令',
-      config: '制定配置文件路径'
+      config: '制定配置文件路径',
+      entry: '按入口编译'
     },
     build: {
       describe: '构建应用命令',

package/dist/js/node/utils/createServer.js

@@ -3,11 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createServer = void 0;
+exports.getServer = exports.createServer = exports.closeServer = void 0;
 
 var _server = require("@modern-js/server");
 
-let server;
+let server = null;
+
+const getServer = () => server;
+
+exports.getServer = getServer;
+
+const closeServer = async () => {
+  if (server) {
+    await server.close();
+    server = null;
+  }
+};
+
+exports.closeServer = closeServer;
 
 const createServer = async options => {
   if (server) {

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/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/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/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.4.0",
+  "version": "1.4.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -50,17 +50,18 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.4.0",
-    "@modern-js/types": "^1.3.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.0",
+    "@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.0",
-    "@modern-js/utils": "^1.3.0",
-    "@modern-js/webpack": "^1.3.0",
+    "@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": {
@@ -71,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": {
@@ -81,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/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();
+  });
+});