@modern-js/app-tools 1.6.0 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/CHANGELOG.md +38 -0
  2. package/dist/js/modern/commands/build.js +4 -5
  3. package/dist/js/modern/commands/dev.js +2 -3
  4. package/dist/js/modern/utils/createCompiler.js +1 -1
  5. package/dist/js/modern/utils/getSpecifiedEntries.js +1 -1
  6. package/dist/js/node/commands/build.js +4 -6
  7. package/dist/js/node/commands/dev.js +2 -3
  8. package/dist/js/node/utils/createCompiler.js +2 -4
  9. package/dist/js/node/utils/getSpecifiedEntries.js +2 -4
  10. package/dist/types/hooks.d.ts +1 -1
  11. package/dist/types/utils/createCompiler.d.ts +1 -1
  12. package/package.json +11 -14
package/CHANGELOG.md CHANGED
@@ -1,5 +1,43 @@
1
1
  # @modern-js/app-tools
2
2
 
3
+ ## 1.6.1
4
+
5
+ ### Patch Changes
6
+
7
+ - 77519490: refactor(webpack): remove `@modern-js/core`
8
+ - 592edabc: feat: prebundle url-join,mime-types,json5,fast-glob,globby,ora,inquirer
9
+ - 895fa0ff: chore: using "workspace:\*" in devDependencies
10
+ - 3d1fac2a: chore: app-tools no longer depend on webpack
11
+ - 247e2005: support devServer.devMiddleware, same as webpack-dev-server
12
+ - Updated dependencies [2d155c4c]
13
+ - Updated dependencies [a0475f1a]
14
+ - Updated dependencies [a0499e4f]
15
+ - Updated dependencies [123e432d]
16
+ - Updated dependencies [6c1438d2]
17
+ - Updated dependencies [e5a9b26d]
18
+ - Updated dependencies [0b26b93b]
19
+ - Updated dependencies [123e432d]
20
+ - Updated dependencies [f9f66ef9]
21
+ - Updated dependencies [71526621]
22
+ - Updated dependencies [77519490]
23
+ - Updated dependencies [592edabc]
24
+ - Updated dependencies [3578716a]
25
+ - Updated dependencies [895fa0ff]
26
+ - Updated dependencies [3d1fac2a]
27
+ - Updated dependencies [3578913e]
28
+ - Updated dependencies [247e2005]
29
+ - Updated dependencies [1c3beab3]
30
+ - @modern-js/utils@1.6.0
31
+ - @modern-js/webpack@1.5.7
32
+ - @modern-js/server@1.4.11
33
+ - @modern-js/prod-server@1.1.2
34
+ - @modern-js/node-bundle-require@1.3.2
35
+ - @modern-js/core@1.9.0
36
+ - @modern-js/plugin-analyze@1.4.1
37
+ - @modern-js/new-action@1.3.7
38
+ - @modern-js/types@1.5.1
39
+ - @modern-js/plugin-fast-refresh@1.2.4
40
+
3
41
  ## 1.6.0
4
42
 
5
43
  ### Minor Changes
package/dist/js/modern/commands/build.js CHANGED
@@ -4,8 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
4
4
 
5
5
  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; }
6
6
 
7
- import { webpack } from 'webpack';
8
- import { WebpackConfigTarget, getWebpackConfig } from '@modern-js/webpack';
7
+ import { webpack, getWebpackConfig, WebpackConfigTarget } from '@modern-js/webpack';
9
8
  import { manager, ResolvedConfigContext } from '@modern-js/core';
10
9
  import { formatWebpackMessages, measureFileSizesBeforeBuild, printFileSizesAfterBuild, printBuildError, logger, isUseSSRBundle, emptyDir } from '@modern-js/utils';
11
10
  import { generateRoutes } from "../utils/routes";
@@ -112,20 +111,20 @@ export const build = async (api, options) => {
112
111
  const buildConfigs = [];
113
112
  buildConfigs.push({
114
113
  type: 'legacy',
115
- config: getWebpackConfig(WebpackConfigTarget.CLIENT)
114
+ config: getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, resolvedConfig)
116
115
  });
117
116
 
118
117
  if (resolvedConfig.output.enableModernMode) {
119
118
  buildConfigs.push({
120
119
  type: 'modern',
121
- config: getWebpackConfig(WebpackConfigTarget.MODERN)
120
+ config: getWebpackConfig(WebpackConfigTarget.MODERN, appContext, resolvedConfig)
122
121
  });
123
122
  }
124
123
 
125
124
  if (isUseSSRBundle(resolvedConfig)) {
126
125
  buildConfigs.push({
127
126
  type: 'ssr',
128
- config: getWebpackConfig(WebpackConfigTarget.NODE)
127
+ config: getWebpackConfig(WebpackConfigTarget.NODE, appContext, resolvedConfig)
129
128
  });
130
129
  }
131
130
 
package/dist/js/modern/commands/dev.js CHANGED
@@ -47,7 +47,7 @@ export const dev = async (api, options) => {
47
47
  getWebpackConfig,
48
48
  WebpackConfigTarget
49
49
  } = await import('@modern-js/webpack');
50
- const webpackConfigs = [isSSR(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE), getWebpackConfig(WebpackConfigTarget.CLIENT)].filter(Boolean);
50
+ const webpackConfigs = [isSSR(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE, appContext, userConfig), getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, userConfig)].filter(Boolean);
51
51
  compiler = await createCompiler({
52
52
  api,
53
53
  webpackConfigs,
@@ -60,14 +60,13 @@ export const dev = async (api, options) => {
60
60
  const app = await createServer({
61
61
  dev: _objectSpread(_objectSpread({}, {
62
62
  client: {
63
- // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
64
63
  port: port.toString(),
65
64
  overlay: false,
66
65
  logging: 'none',
67
66
  path: HMR_SOCK_PATH,
68
67
  host: 'localhost'
69
68
  },
70
- dev: {
69
+ devMiddleware: {
71
70
  writeToDisk: file => !file.includes('.hot-update.')
72
71
  },
73
72
  hot: true,
package/dist/js/modern/utils/createCompiler.js CHANGED
@@ -1,4 +1,4 @@
1
- import webpack from 'webpack';
1
+ import { webpack } from '@modern-js/webpack';
2
2
  import { chalk, logger, formatWebpackMessages, clearConsole } from '@modern-js/utils';
3
3
  import { printInstructions } from "./printInstructions";
4
4
 
package/dist/js/modern/utils/getSpecifiedEntries.js CHANGED
@@ -1,4 +1,4 @@
1
- import inquirer from 'inquirer';
1
+ import { inquirer } from '@modern-js/utils';
2
2
  export const getSpecifiedEntries = async (entry, entrypoints) => {
3
3
  const entryNames = entrypoints.map(e => e.entryName);
4
4
 
package/dist/js/node/commands/build.js CHANGED
@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.build = void 0;
7
7
 
8
- var _webpack = require("webpack");
9
-
10
- var _webpack2 = require("@modern-js/webpack");
8
+ var _webpack = require("@modern-js/webpack");
11
9
 
12
10
  var _core = require("@modern-js/core");
13
11
 
@@ -130,20 +128,20 @@ const build = async (api, options) => {
130
128
  const buildConfigs = [];
131
129
  buildConfigs.push({
132
130
  type: 'legacy',
133
- config: (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.CLIENT)
131
+ config: (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.CLIENT, appContext, resolvedConfig)
134
132
  });
135
133
 
136
134
  if (resolvedConfig.output.enableModernMode) {
137
135
  buildConfigs.push({
138
136
  type: 'modern',
139
- config: (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.MODERN)
137
+ config: (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.MODERN, appContext, resolvedConfig)
140
138
  });
141
139
  }
142
140
 
143
141
  if ((0, _utils.isUseSSRBundle)(resolvedConfig)) {
144
142
  buildConfigs.push({
145
143
  type: 'ssr',
146
- config: (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.NODE)
144
+ config: (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.NODE, appContext, resolvedConfig)
147
145
  });
148
146
  }
149
147
 
package/dist/js/node/commands/dev.js CHANGED
@@ -67,7 +67,7 @@ const dev = async (api, options) => {
67
67
  getWebpackConfig,
68
68
  WebpackConfigTarget
69
69
  } = await Promise.resolve().then(() => _interopRequireWildcard(require('@modern-js/webpack')));
70
- const webpackConfigs = [(0, _utils.isSSR)(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE), getWebpackConfig(WebpackConfigTarget.CLIENT)].filter(Boolean);
70
+ const webpackConfigs = [(0, _utils.isSSR)(userConfig) && getWebpackConfig(WebpackConfigTarget.NODE, appContext, userConfig), getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, userConfig)].filter(Boolean);
71
71
  compiler = await (0, _createCompiler.createCompiler)({
72
72
  api,
73
73
  webpackConfigs,
@@ -80,14 +80,13 @@ const dev = async (api, options) => {
80
80
  const app = await (0, _createServer.createServer)({
81
81
  dev: _objectSpread(_objectSpread({}, {
82
82
  client: {
83
- // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
84
83
  port: port.toString(),
85
84
  overlay: false,
86
85
  logging: 'none',
87
86
  path: _utils.HMR_SOCK_PATH,
88
87
  host: 'localhost'
89
88
  },
90
- dev: {
89
+ devMiddleware: {
91
90
  writeToDisk: file => !file.includes('.hot-update.')
92
91
  },
93
92
  hot: true,
package/dist/js/node/utils/createCompiler.js CHANGED
@@ -5,14 +5,12 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.createCompiler = void 0;
7
7
 
8
- var _webpack = _interopRequireDefault(require("webpack"));
8
+ var _webpack = require("@modern-js/webpack");
9
9
 
10
10
  var _utils = require("@modern-js/utils");
11
11
 
12
12
  var _printInstructions = require("./printInstructions");
13
13
 
14
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
-
16
14
  const prettyTime = stats => {
17
15
  var _stats$children;
18
16
 
@@ -31,7 +29,7 @@ const createCompiler = async ({
31
29
  await hookRunners.beforeCreateCompiler({
32
30
  webpackConfigs
33
31
  });
34
- const compiler = (0, _webpack.default)(webpackConfigs);
32
+ const compiler = (0, _webpack.webpack)(webpackConfigs);
35
33
  await hookRunners.afterCreateCompiler({
36
34
  compiler
37
35
  });
package/dist/js/node/utils/getSpecifiedEntries.js CHANGED
@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.getSpecifiedEntries = void 0;
7
7
 
8
- var _inquirer = _interopRequireDefault(require("inquirer"));
9
-
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
8
+ var _utils = require("@modern-js/utils");
11
9
 
12
10
  const getSpecifiedEntries = async (entry, entrypoints) => {
13
11
  const entryNames = entrypoints.map(e => e.entryName);
@@ -19,7 +17,7 @@ const getSpecifiedEntries = async (entry, entrypoints) => {
19
17
  if (typeof entry === 'boolean') {
20
18
  const {
21
19
  selected
22
- } = await _inquirer.default.prompt([{
20
+ } = await _utils.inquirer.prompt([{
23
21
  type: 'checkbox',
24
22
  name: 'selected',
25
23
  choices: entryNames,
package/dist/types/hooks.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { Compiler, Configuration, MultiCompiler } from '@modern-js/types';
1
+ import type { Compiler, Configuration, MultiCompiler } from '@modern-js/webpack';
2
2
  export declare const beforeDev: import("@modern-js/plugin").AsyncWorkflow<void, unknown>;
3
3
  export declare const afterDev: import("@modern-js/plugin").AsyncWorkflow<void, unknown>;
4
4
  export declare const beforeCreateCompiler: import("@modern-js/plugin").AsyncWorkflow<{
package/dist/types/utils/createCompiler.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import webpack, { Configuration } from 'webpack';
1
+ import { webpack, Configuration } from '@modern-js/webpack';
2
2
  import type { IAppContext, NormalizedConfig, PluginAPI } from '@modern-js/core';
3
3
  export declare const createCompiler: ({
4
4
  api,
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "modern",
12
12
  "modern.js"
13
13
  ],
14
- "version": "1.6.0",
14
+ "version": "1.6.1",
15
15
  "jsnext:source": "./src/index.ts",
16
16
  "types": "./dist/types/index.d.ts",
17
17
  "main": "./dist/js/node/index.js",
@@ -57,27 +57,24 @@
57
57
  },
58
58
  "dependencies": {
59
59
  "@babel/runtime": "^7",
60
- "@modern-js/core": "^1.8.0",
60
+ "@modern-js/core": "^1.9.0",
61
61
  "@modern-js/i18n-cli-language-detector": "^1.2.2",
62
- "@modern-js/new-action": "^1.3.6",
63
- "@modern-js/node-bundle-require": "^1.3.1",
62
+ "@modern-js/new-action": "^1.3.7",
63
+ "@modern-js/node-bundle-require": "^1.3.2",
64
64
  "@modern-js/plugin": "^1.3.3",
65
- "@modern-js/plugin-analyze": "^1.4.0",
65
+ "@modern-js/plugin-analyze": "^1.4.1",
66
66
  "@modern-js/plugin-fast-refresh": "^1.2.4",
67
67
  "@modern-js/plugin-i18n": "^1.2.4",
68
- "@modern-js/prod-server": "^1.1.1",
69
- "@modern-js/server": "^1.4.10",
70
- "@modern-js/types": "^1.5.0",
71
- "@modern-js/utils": "^1.5.0",
72
- "@modern-js/webpack": "^1.5.6",
73
- "inquirer": "^8.2.0",
74
- "webpack": "^5.71.0"
68
+ "@modern-js/prod-server": "^1.1.2",
69
+ "@modern-js/server": "^1.4.11",
70
+ "@modern-js/types": "^1.5.1",
71
+ "@modern-js/utils": "^1.6.0",
72
+ "@modern-js/webpack": "^1.5.7"
75
73
  },
76
74
  "devDependencies": {
77
- "@modern-js/server-core": "^1.3.1",
75
+ "@modern-js/server-core": "1.3.2",
78
76
  "@scripts/build": "0.0.0",
79
77
  "@scripts/jest-config": "0.0.0",
80
- "@types/inquirer": "^8.2.0",
81
78
  "@types/jest": "^26",
82
79
  "@types/node": "^14",
83
80
  "@types/react": "^17",