@modern-js/app-tools 1.6.0 → 1.6.3

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 +82 -0
  2. package/dist/js/modern/commands/build.js +8 -8
  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 +9 -9
  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 +13 -16
package/CHANGELOG.md CHANGED
@@ -1,5 +1,87 @@
1
1
  # @modern-js/app-tools
2
2
 
3
+ ## 1.6.3
4
+
5
+ ### Patch Changes
6
+
7
+ - 69a728375: fix: remove exports.jsnext:source after publish
8
+ - Updated dependencies [b7b8075dc]
9
+ - Updated dependencies [cd7346b0d]
10
+ - Updated dependencies [0e0537005]
11
+ - Updated dependencies [6b0bb5e3b]
12
+ - Updated dependencies [738c55d39]
13
+ - Updated dependencies [69a728375]
14
+ - @modern-js/webpack@1.6.2
15
+ - @modern-js/utils@1.7.2
16
+ - @modern-js/server@1.4.13
17
+ - @modern-js/new-action@1.3.8
18
+ - @modern-js/core@1.10.1
19
+ - @modern-js/plugin-analyze@1.4.2
20
+ - @modern-js/plugin-fast-refresh@1.2.5
21
+ - @modern-js/plugin-i18n@1.2.5
22
+ - @modern-js/prod-server@1.1.4
23
+ - @modern-js/node-bundle-require@1.3.2
24
+
25
+ ## 1.6.2
26
+
27
+ ### Patch Changes
28
+
29
+ - 8cf0ca21: fix: build commands not work
30
+ - Updated dependencies [4697d1db]
31
+ - Updated dependencies [0ee4bb4e]
32
+ - Updated dependencies [a4c5fe78]
33
+ - Updated dependencies [6fa74d5f]
34
+ - Updated dependencies [a22d3ea8]
35
+ - Updated dependencies [5c00db22]
36
+ - Updated dependencies [92f4909e]
37
+ - @modern-js/webpack@1.6.0
38
+ - @modern-js/core@1.10.0
39
+ - @modern-js/utils@1.7.0
40
+ - @modern-js/prod-server@1.1.3
41
+ - @modern-js/types@1.5.2
42
+ - @modern-js/server@1.4.12
43
+ - @modern-js/plugin-analyze@1.4.1
44
+ - @modern-js/plugin-fast-refresh@1.2.4
45
+ - @modern-js/node-bundle-require@1.3.2
46
+
47
+ ## 1.6.1
48
+
49
+ ### Patch Changes
50
+
51
+ - 77519490: refactor(webpack): remove `@modern-js/core`
52
+ - 592edabc: feat: prebundle url-join,mime-types,json5,fast-glob,globby,ora,inquirer
53
+ - 895fa0ff: chore: using "workspace:\*" in devDependencies
54
+ - 3d1fac2a: chore: app-tools no longer depend on webpack
55
+ - 247e2005: support devServer.devMiddleware, same as webpack-dev-server
56
+ - Updated dependencies [2d155c4c]
57
+ - Updated dependencies [a0475f1a]
58
+ - Updated dependencies [a0499e4f]
59
+ - Updated dependencies [123e432d]
60
+ - Updated dependencies [6c1438d2]
61
+ - Updated dependencies [e5a9b26d]
62
+ - Updated dependencies [0b26b93b]
63
+ - Updated dependencies [123e432d]
64
+ - Updated dependencies [f9f66ef9]
65
+ - Updated dependencies [71526621]
66
+ - Updated dependencies [77519490]
67
+ - Updated dependencies [592edabc]
68
+ - Updated dependencies [3578716a]
69
+ - Updated dependencies [895fa0ff]
70
+ - Updated dependencies [3d1fac2a]
71
+ - Updated dependencies [3578913e]
72
+ - Updated dependencies [247e2005]
73
+ - Updated dependencies [1c3beab3]
74
+ - @modern-js/utils@1.6.0
75
+ - @modern-js/webpack@1.5.7
76
+ - @modern-js/server@1.4.11
77
+ - @modern-js/prod-server@1.1.2
78
+ - @modern-js/node-bundle-require@1.3.2
79
+ - @modern-js/core@1.9.0
80
+ - @modern-js/plugin-analyze@1.4.1
81
+ - @modern-js/new-action@1.3.7
82
+ - @modern-js/types@1.5.1
83
+ - @modern-js/plugin-fast-refresh@1.2.4
84
+
3
85
  ## 1.6.0
4
86
 
5
87
  ### 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";
@@ -14,7 +13,7 @@ import { buildServerConfig, emitResolvedConfig } from "../utils/config";
14
13
  const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
15
14
  const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
16
15
  export const build = async (api, options) => {
17
- const resolvedConfig = api.useResolvedConfigContext();
16
+ let resolvedConfig = api.useResolvedConfigContext();
18
17
  const appContext = api.useAppContext();
19
18
  const hookRunners = api.useHookRunners();
20
19
  const {
@@ -93,9 +92,10 @@ export const build = async (api, options) => {
93
92
  };
94
93
 
95
94
  manager.run(() => {
96
- ResolvedConfigContext.set(_objectSpread(_objectSpread({}, resolvedConfig), {}, {
95
+ resolvedConfig = _objectSpread(_objectSpread({}, resolvedConfig), {}, {
97
96
  cliOptions: options
98
- }));
97
+ });
98
+ ResolvedConfigContext.set(resolvedConfig);
99
99
  });
100
100
  const {
101
101
  distDirectory,
@@ -112,20 +112,20 @@ export const build = async (api, options) => {
112
112
  const buildConfigs = [];
113
113
  buildConfigs.push({
114
114
  type: 'legacy',
115
- config: getWebpackConfig(WebpackConfigTarget.CLIENT)
115
+ config: getWebpackConfig(WebpackConfigTarget.CLIENT, appContext, resolvedConfig)
116
116
  });
117
117
 
118
118
  if (resolvedConfig.output.enableModernMode) {
119
119
  buildConfigs.push({
120
120
  type: 'modern',
121
- config: getWebpackConfig(WebpackConfigTarget.MODERN)
121
+ config: getWebpackConfig(WebpackConfigTarget.MODERN, appContext, resolvedConfig)
122
122
  });
123
123
  }
124
124
 
125
125
  if (isUseSSRBundle(resolvedConfig)) {
126
126
  buildConfigs.push({
127
127
  type: 'ssr',
128
- config: getWebpackConfig(WebpackConfigTarget.NODE)
128
+ config: getWebpackConfig(WebpackConfigTarget.NODE, appContext, resolvedConfig)
129
129
  });
130
130
  }
131
131
 
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
 
@@ -28,7 +26,7 @@ const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
28
26
  const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
29
27
 
30
28
  const build = async (api, options) => {
31
- const resolvedConfig = api.useResolvedConfigContext();
29
+ let resolvedConfig = api.useResolvedConfigContext();
32
30
  const appContext = api.useAppContext();
33
31
  const hookRunners = api.useHookRunners();
34
32
  const {
@@ -110,9 +108,11 @@ const build = async (api, options) => {
110
108
  };
111
109
 
112
110
  _core.manager.run(() => {
113
- _core.ResolvedConfigContext.set(_objectSpread(_objectSpread({}, resolvedConfig), {}, {
111
+ resolvedConfig = _objectSpread(_objectSpread({}, resolvedConfig), {}, {
114
112
  cliOptions: options
115
- }));
113
+ });
114
+
115
+ _core.ResolvedConfigContext.set(resolvedConfig);
116
116
  });
117
117
 
118
118
  const {
@@ -130,20 +130,20 @@ const build = async (api, options) => {
130
130
  const buildConfigs = [];
131
131
  buildConfigs.push({
132
132
  type: 'legacy',
133
- config: (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.CLIENT)
133
+ config: (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.CLIENT, appContext, resolvedConfig)
134
134
  });
135
135
 
136
136
  if (resolvedConfig.output.enableModernMode) {
137
137
  buildConfigs.push({
138
138
  type: 'modern',
139
- config: (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.MODERN)
139
+ config: (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.MODERN, appContext, resolvedConfig)
140
140
  });
141
141
  }
142
142
 
143
143
  if ((0, _utils.isUseSSRBundle)(resolvedConfig)) {
144
144
  buildConfigs.push({
145
145
  type: 'ssr',
146
- config: (0, _webpack2.getWebpackConfig)(_webpack2.WebpackConfigTarget.NODE)
146
+ config: (0, _webpack.getWebpackConfig)(_webpack.WebpackConfigTarget.NODE, appContext, resolvedConfig)
147
147
  });
148
148
  }
149
149
 
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.3",
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.10.1",
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.8",
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",
66
- "@modern-js/plugin-fast-refresh": "^1.2.4",
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"
65
+ "@modern-js/plugin-analyze": "^1.4.2",
66
+ "@modern-js/plugin-fast-refresh": "^1.2.5",
67
+ "@modern-js/plugin-i18n": "^1.2.5",
68
+ "@modern-js/prod-server": "^1.1.4",
69
+ "@modern-js/server": "^1.4.13",
70
+ "@modern-js/types": "^1.5.2",
71
+ "@modern-js/utils": "^1.7.2",
72
+ "@modern-js/webpack": "^1.6.2"
75
73
  },
76
74
  "devDependencies": {
77
- "@modern-js/server-core": "^1.3.1",
75
+ "@modern-js/server-core": "1.3.4",
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",