@servicetitan/startup 27.2.1 → 27.4.0
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.
- package/dist/cli/utils/bundle.d.ts.map +1 -1
- package/dist/cli/utils/bundle.js +10 -11
- package/dist/cli/utils/bundle.js.map +1 -1
- package/dist/utils/get-configuration.d.ts +2 -1
- package/dist/utils/get-configuration.d.ts.map +1 -1
- package/dist/utils/get-configuration.js +5 -0
- package/dist/utils/get-configuration.js.map +1 -1
- package/dist/webpack/configs/dev-server-config.d.ts.map +1 -1
- package/dist/webpack/configs/dev-server-config.js +4 -1
- package/dist/webpack/configs/dev-server-config.js.map +1 -1
- package/package.json +11 -10
- package/src/cli/utils/__tests__/bundle.test.ts +45 -6
- package/src/cli/utils/bundle.ts +14 -20
- package/src/utils/__tests__/get-configuration.test.ts +6 -0
- package/src/utils/get-configuration.ts +6 -1
- package/src/webpack/__tests__/create-webpack-config.test.ts +10 -0
- package/src/webpack/configs/dev-server-config.ts +7 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/bundle.ts"],"names":[],"mappings":"AAWA,UAAU,OAAO;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAWD,eAAO,MAAM,wBAAwB,0BAA0B,CAAC;AAChE,eAAO,MAAM,yBAAyB,2BAA2B,CAAC;AAElE,wBAAsB,MAAM,CAAC,OAAO,GAAE,OAAY,gCAwBjD;AAED,wBAAsB,WAAW,CAAC,OAAO,GAAE,OAAY,
|
|
1
|
+
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/bundle.ts"],"names":[],"mappings":"AAWA,UAAU,OAAO;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAClC;AAWD,eAAO,MAAM,wBAAwB,0BAA0B,CAAC;AAChE,eAAO,MAAM,yBAAyB,2BAA2B,CAAC;AAElE,wBAAsB,MAAM,CAAC,OAAO,GAAE,OAAY,gCAwBjD;AAED,wBAAsB,WAAW,CAAC,OAAO,GAAE,OAAY,gCAoCtD"}
|
package/dist/cli/utils/bundle.js
CHANGED
|
@@ -49,6 +49,7 @@ async function bundleWatch(options = {}) {
|
|
|
49
49
|
const mode = 'development';
|
|
50
50
|
const config = readWebpackConfig({ ...options, fallback: `./${exports.webpackDevConfigFileName}` });
|
|
51
51
|
const { codeCoverage, esbuild, experimentalBundlers } = options;
|
|
52
|
+
const configOverrides = { codeCoverage, esbuild, experimentalBundlers, name };
|
|
52
53
|
if ((0, utils_1.isWebComponent)()) {
|
|
53
54
|
const webpackConfig = {
|
|
54
55
|
configuration: { ...config === null || config === void 0 ? void 0 : config.configuration, mode },
|
|
@@ -56,21 +57,19 @@ async function bundleWatch(options = {}) {
|
|
|
56
57
|
};
|
|
57
58
|
return Promise.all([
|
|
58
59
|
runWatch((0, webpack_2.createWebpackConfig)(webpackConfig, {
|
|
59
|
-
codeCoverage,
|
|
60
60
|
embed: true,
|
|
61
|
-
|
|
62
|
-
esbuild,
|
|
63
|
-
experimentalBundlers,
|
|
64
|
-
})),
|
|
65
|
-
runServe((0, webpack_2.createWebpackConfig)(webpackConfig, {
|
|
66
|
-
name,
|
|
67
|
-
codeCoverage,
|
|
68
|
-
esbuild,
|
|
69
|
-
experimentalBundlers,
|
|
61
|
+
...configOverrides,
|
|
70
62
|
})),
|
|
63
|
+
(0, utils_1.isDevServerDisabled)()
|
|
64
|
+
? runWatch((0, webpack_2.createWebpackConfig)(webpackConfig, configOverrides))
|
|
65
|
+
: runServe((0, webpack_2.createWebpackConfig)(webpackConfig, configOverrides)),
|
|
71
66
|
]);
|
|
72
67
|
}
|
|
73
|
-
|
|
68
|
+
const webpackConfig = config !== null && config !== void 0 ? config : (0, webpack_2.createWebpackConfig)({ configuration: { mode } }, configOverrides);
|
|
69
|
+
if ((0, utils_1.isDevServerDisabled)()) {
|
|
70
|
+
return runWatch(webpackConfig);
|
|
71
|
+
}
|
|
72
|
+
return runServe(webpackConfig);
|
|
74
73
|
}
|
|
75
74
|
function readWebpackConfig({ config, fallback }) {
|
|
76
75
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/cli/utils/bundle.ts"],"names":[],"mappings":";;;;;;AA+BA,wBAwBC;AAED,
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/cli/utils/bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export interface WebpackConfiguration extends Omit<Pick<WebpackDevServerConfigur
|
|
|
18
18
|
'contentBase'?: boolean | string | string[] | number;
|
|
19
19
|
'custom-style-rules'?: boolean;
|
|
20
20
|
'expose-shared-dependencies'?: boolean;
|
|
21
|
-
'devServer'?: WebpackDevServerConfiguration;
|
|
21
|
+
'devServer'?: false | WebpackDevServerConfiguration;
|
|
22
22
|
'disable-style-check'?: boolean;
|
|
23
23
|
'minify'?: MinifyOptions;
|
|
24
24
|
'proxy'?: WebpackDevServerConfiguration['proxy'] | string;
|
|
@@ -74,6 +74,7 @@ export declare function getStylelintConfiguration(): StylelintConfiguration;
|
|
|
74
74
|
export declare function getWebpackConfiguration(locationOrJson?: LocationOrJson): WebpackConfiguration;
|
|
75
75
|
export declare function isBundle(locationOrJson?: LocationOrJson): boolean;
|
|
76
76
|
export declare function isCustomStyleRules(): boolean;
|
|
77
|
+
export declare function isDevServerDisabled(): boolean;
|
|
77
78
|
export declare function isExposeSharedDependencies(): boolean;
|
|
78
79
|
export declare function isLegacy(locationOrJson?: LocationOrJson): boolean;
|
|
79
80
|
export declare function isLegacyRoot(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-configuration.d.ts","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,IAAI,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,eAAO,MAAM,8BAA8B,iDAAkD,CAAC;AAE9F,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,MAAM,WAAW,CAAC,EAAE,GAAG,WAAW,GAAG,KAAK,CAAC;AAErF,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;CAAG;AAEpC,MAAM,WAAW,aAAa;IAC1B,GAAG,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IACjC,EAAE,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC;CAClC;AAED,MAAM,WAAW,oBACb,SAAQ,IAAI,CACR,IAAI,CAAC,6BAA6B,EAAE,WAAW,CAAC,OAAO,8BAA8B,CAAC,CAAC,EACvF,OAAO,CACV;IACD,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC;IACrD,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,WAAW,CAAC,EAAE,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"get-configuration.d.ts","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ exports.getStylelintConfiguration = getStylelintConfiguration;
|
|
|
12
12
|
exports.getWebpackConfiguration = getWebpackConfiguration;
|
|
13
13
|
exports.isBundle = isBundle;
|
|
14
14
|
exports.isCustomStyleRules = isCustomStyleRules;
|
|
15
|
+
exports.isDevServerDisabled = isDevServerDisabled;
|
|
15
16
|
exports.isExposeSharedDependencies = isExposeSharedDependencies;
|
|
16
17
|
exports.isLegacy = isLegacy;
|
|
17
18
|
exports.isLegacyRoot = isLegacyRoot;
|
|
@@ -74,6 +75,10 @@ function isBundle(locationOrJson) {
|
|
|
74
75
|
function isCustomStyleRules() {
|
|
75
76
|
return getWebpackConfiguration()['custom-style-rules'] === true;
|
|
76
77
|
}
|
|
78
|
+
function isDevServerDisabled() {
|
|
79
|
+
const webpackConfiguration = getWebpackConfiguration();
|
|
80
|
+
return webpackConfiguration.devServer === false;
|
|
81
|
+
}
|
|
77
82
|
function isExposeSharedDependencies() {
|
|
78
83
|
return getWebpackConfiguration()['expose-shared-dependencies'] === true;
|
|
79
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-configuration.js","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":";;;;;;AAyFA,4CAMC;AAED,oDAMC;AAED,wDAEC;AAED,oDAEC;AAED,8DAEC;AAED,0DAGC;AAED,4BAEC;AAED,gDAEC;AAED,gEAEC;AAED,4BAEC;AAED,oCAGC;AAED,oDAEC;AAED,wCAGC;
|
|
1
|
+
{"version":3,"file":"get-configuration.js","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server-config.d.ts","sourceRoot":"","sources":["../../../src/webpack/configs/dev-server-config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-server-config.d.ts","sourceRoot":"","sources":["../../../src/webpack/configs/dev-server-config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAYxC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAI7C,KAAK,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,cAAc,CAAC,GAAG,SAAS,CAAC;AAE5E,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAG,MAAM,CAyB9E"}
|
|
@@ -13,6 +13,9 @@ function devServerConfig(context, overrides) {
|
|
|
13
13
|
return;
|
|
14
14
|
}
|
|
15
15
|
const watchOptions = watchOptionsConfig();
|
|
16
|
+
if ((0, utils_1.isDevServerDisabled)()) {
|
|
17
|
+
return { watchOptions };
|
|
18
|
+
}
|
|
16
19
|
const devServer = {
|
|
17
20
|
hot: false,
|
|
18
21
|
port: 8080,
|
|
@@ -29,7 +32,7 @@ function devServerConfig(context, overrides) {
|
|
|
29
32
|
return { devServer, watchOptions };
|
|
30
33
|
}
|
|
31
34
|
function getDevServerConfig() {
|
|
32
|
-
const webpack = (0, utils_1.
|
|
35
|
+
const webpack = (0, utils_1.getWebpackConfiguration)();
|
|
33
36
|
/* istanbul ignore next: debug only */
|
|
34
37
|
utils_1.log.debug('dev-server-config', () => JSON.stringify({ webpack }, null, 2));
|
|
35
38
|
const result = (0, utils_1.pick)(webpack, utils_1.allowedWebpackDevServerOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server-config.js","sourceRoot":"","sources":["../../../src/webpack/configs/dev-server-config.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"dev-server-config.js","sourceRoot":"","sources":["../../../src/webpack/configs/dev-server-config.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@servicetitan/startup",
|
|
3
|
-
"version": "27.
|
|
3
|
+
"version": "27.4.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://docs.st.dev/docs/frontend/startup",
|
|
6
6
|
"repository": {
|
|
@@ -32,19 +32,19 @@
|
|
|
32
32
|
"@types/yargs": "~17.0.24"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@babel/preset-env": "~7.25.
|
|
35
|
+
"@babel/preset-env": "~7.25.7",
|
|
36
36
|
"@jest/core": "~29.7.0",
|
|
37
37
|
"@jest/types": "~29.6.3",
|
|
38
38
|
"@jsdevtools/coverage-istanbul-loader": "^3.0.5",
|
|
39
|
-
"@servicetitan/eslint-config": "27.
|
|
40
|
-
"@servicetitan/stylelint-config": "27.
|
|
39
|
+
"@servicetitan/eslint-config": "27.4.0",
|
|
40
|
+
"@servicetitan/stylelint-config": "27.4.0",
|
|
41
41
|
"@svgr/webpack": "^8.1.0",
|
|
42
42
|
"@swc/core": "1.7.26",
|
|
43
43
|
"@types/debug": "^4.1.12",
|
|
44
44
|
"@types/jest": "~29.5.12",
|
|
45
45
|
"chalk": "~4.1.2",
|
|
46
46
|
"chokidar": "~3.6.0",
|
|
47
|
-
"cpx2": "
|
|
47
|
+
"cpx2": "7.0.1",
|
|
48
48
|
"css-loader": "~7.1.2",
|
|
49
49
|
"css-minimizer-webpack-plugin": "^7.0.0",
|
|
50
50
|
"debug": "^4.3.7",
|
|
@@ -72,8 +72,8 @@
|
|
|
72
72
|
"portfinder": "~1.0.32",
|
|
73
73
|
"postcss": "~8.4.47",
|
|
74
74
|
"prettier": "~3.3.3",
|
|
75
|
-
"sass": "~1.
|
|
76
|
-
"sass-loader": "~16.0.
|
|
75
|
+
"sass": "~1.79.4",
|
|
76
|
+
"sass-loader": "~16.0.2",
|
|
77
77
|
"source-map-loader": "~5.0.0",
|
|
78
78
|
"string-width": "<5.0.0",
|
|
79
79
|
"style-loader": "~4.0.0",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"typed-css-modules": "~0.9.1",
|
|
87
87
|
"typescript": "5.6.2",
|
|
88
88
|
"username": "~5.1.0",
|
|
89
|
-
"webpack": "~5.
|
|
89
|
+
"webpack": "~5.95.0",
|
|
90
90
|
"webpack-assets-manifest": "~5.2.1",
|
|
91
91
|
"webpack-bundle-analyzer": "^4.10.2",
|
|
92
92
|
"webpack-dev-server": "~5.1.0",
|
|
@@ -98,7 +98,8 @@
|
|
|
98
98
|
"yargs": "~17.7.2"
|
|
99
99
|
},
|
|
100
100
|
"DEVELOPER_NOTES": {
|
|
101
|
-
"string-width": "Fixes lerna issue when running build. Can be removed when lerna adds string-width as a direct dependency."
|
|
101
|
+
"string-width": "Fixes lerna issue when running build. Can be removed when lerna adds string-width as a direct dependency.",
|
|
102
|
+
"cpx2": "Must use 7.0.1 because later versions require glob 11.x which does not support Node 18"
|
|
102
103
|
},
|
|
103
104
|
"publishConfig": {
|
|
104
105
|
"access": "public"
|
|
@@ -106,5 +107,5 @@
|
|
|
106
107
|
"cli": {
|
|
107
108
|
"webpack": false
|
|
108
109
|
},
|
|
109
|
-
"gitHead": "
|
|
110
|
+
"gitHead": "0d58d7916d659a9617a12df86cdd183b5d49eef2"
|
|
110
111
|
}
|
|
@@ -2,7 +2,12 @@ import { fs, vol } from 'memfs';
|
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import webpack from 'webpack';
|
|
4
4
|
import WebpackDevServer from 'webpack-dev-server';
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
getConfiguration,
|
|
7
|
+
getFolders,
|
|
8
|
+
getPackageData,
|
|
9
|
+
loadSharedDependencies,
|
|
10
|
+
} from '../../../utils';
|
|
6
11
|
import { createWebpackConfig } from '../../../webpack';
|
|
7
12
|
import { createPackage } from '../../../__mocks__';
|
|
8
13
|
|
|
@@ -44,12 +49,12 @@ describe('[startup] Cli Utils', () => {
|
|
|
44
49
|
return expect.stringContaining(name);
|
|
45
50
|
}
|
|
46
51
|
|
|
47
|
-
function packageFS() {
|
|
48
|
-
return { 'package.json': JSON.stringify(pkg) };
|
|
52
|
+
function packageFS(configuration: ReturnType<typeof getConfiguration> = {} as any) {
|
|
53
|
+
return { 'package.json': JSON.stringify({ ...pkg, cli: configuration }) };
|
|
49
54
|
}
|
|
50
55
|
|
|
51
|
-
function webComponentFS() {
|
|
52
|
-
return
|
|
56
|
+
function webComponentFS(configuration: ReturnType<typeof getConfiguration> = {} as any) {
|
|
57
|
+
return packageFS({ 'web-component': true, ...configuration });
|
|
53
58
|
}
|
|
54
59
|
|
|
55
60
|
describe(`${bundle.name}`, () => {
|
|
@@ -287,6 +292,19 @@ describe('[startup] Cli Utils', () => {
|
|
|
287
292
|
);
|
|
288
293
|
});
|
|
289
294
|
|
|
295
|
+
describe('when webpack.devServer is set to false in package.json', () => {
|
|
296
|
+
beforeEach(() => {
|
|
297
|
+
vol.fromJSON(packageFS({ webpack: { devServer: false } } as any));
|
|
298
|
+
});
|
|
299
|
+
|
|
300
|
+
test('runs webpack and not webpack development server', async () => {
|
|
301
|
+
await subject();
|
|
302
|
+
|
|
303
|
+
expect(webpack).toHaveBeenCalledWith(createWebpackResult);
|
|
304
|
+
expect(WebpackDevServer).not.toHaveBeenCalled();
|
|
305
|
+
});
|
|
306
|
+
});
|
|
307
|
+
|
|
290
308
|
function itUsesConfig(params: { name: string; config: () => Record<string, any> }) {
|
|
291
309
|
test(`uses ${params.name}`, async () => {
|
|
292
310
|
const { devServer, ...config } = params.config();
|
|
@@ -351,7 +369,8 @@ describe('[startup] Cli Utils', () => {
|
|
|
351
369
|
...options,
|
|
352
370
|
embed: true,
|
|
353
371
|
});
|
|
354
|
-
expect(webpack).
|
|
372
|
+
expect(webpack).toHaveBeenNthCalledWith(1, createWebpackResult);
|
|
373
|
+
expect(webpack).toHaveBeenNthCalledWith(2, createWebpackResult);
|
|
355
374
|
expect(compiler.watch).toHaveBeenCalled();
|
|
356
375
|
expect(WebpackDevServer).toHaveBeenCalledWith(
|
|
357
376
|
{ host: 'localhost', port: 8080 },
|
|
@@ -359,6 +378,26 @@ describe('[startup] Cli Utils', () => {
|
|
|
359
378
|
);
|
|
360
379
|
});
|
|
361
380
|
|
|
381
|
+
describe('when webpack.devServer is set to false in package.json', () => {
|
|
382
|
+
beforeEach(() => {
|
|
383
|
+
vol.fromJSON(webComponentFS({ webpack: { devServer: false } } as any));
|
|
384
|
+
});
|
|
385
|
+
|
|
386
|
+
test('runs webpack and not webpack development server', async () => {
|
|
387
|
+
const options = { name: expectPackageName() };
|
|
388
|
+
const overrides = { configuration: { mode: 'development' } };
|
|
389
|
+
|
|
390
|
+
await subject();
|
|
391
|
+
|
|
392
|
+
expect(createWebpackConfig).toHaveBeenCalledWith(overrides, options);
|
|
393
|
+
expect(createWebpackConfig).toHaveBeenCalledWith(overrides, {
|
|
394
|
+
...options,
|
|
395
|
+
embed: true,
|
|
396
|
+
});
|
|
397
|
+
expect(WebpackDevServer).not.toHaveBeenCalled();
|
|
398
|
+
});
|
|
399
|
+
});
|
|
400
|
+
|
|
362
401
|
function itUsesConfig(params: { name: string; config: () => Record<string, any> }) {
|
|
363
402
|
test(`uses ${params.name}`, async () => {
|
|
364
403
|
const options = { name: expectPackageName() };
|
package/src/cli/utils/bundle.ts
CHANGED
|
@@ -6,7 +6,7 @@ import { getPortPromise } from 'portfinder';
|
|
|
6
6
|
import webpack, { Configuration } from 'webpack';
|
|
7
7
|
import WebpackDevServer from 'webpack-dev-server';
|
|
8
8
|
|
|
9
|
-
import { getPackageName, isWebComponent, log } from '../../utils';
|
|
9
|
+
import { getPackageName, isDevServerDisabled, isWebComponent, log } from '../../utils';
|
|
10
10
|
import { Overrides, createWebpackConfig } from '../../webpack';
|
|
11
11
|
|
|
12
12
|
interface Options {
|
|
@@ -62,6 +62,7 @@ export async function bundleWatch(options: Options = {}) {
|
|
|
62
62
|
const mode = 'development';
|
|
63
63
|
const config = readWebpackConfig({ ...options, fallback: `./${webpackDevConfigFileName}` });
|
|
64
64
|
const { codeCoverage, esbuild, experimentalBundlers } = options;
|
|
65
|
+
const configOverrides = { codeCoverage, esbuild, experimentalBundlers, name };
|
|
65
66
|
|
|
66
67
|
if (isWebComponent()) {
|
|
67
68
|
const webpackConfig: Overrides = {
|
|
@@ -72,31 +73,24 @@ export async function bundleWatch(options: Options = {}) {
|
|
|
72
73
|
return Promise.all([
|
|
73
74
|
runWatch(
|
|
74
75
|
createWebpackConfig(webpackConfig, {
|
|
75
|
-
codeCoverage,
|
|
76
76
|
embed: true,
|
|
77
|
-
|
|
78
|
-
esbuild,
|
|
79
|
-
experimentalBundlers,
|
|
80
|
-
})
|
|
81
|
-
),
|
|
82
|
-
runServe(
|
|
83
|
-
createWebpackConfig(webpackConfig, {
|
|
84
|
-
name,
|
|
85
|
-
codeCoverage,
|
|
86
|
-
esbuild,
|
|
87
|
-
experimentalBundlers,
|
|
77
|
+
...configOverrides,
|
|
88
78
|
})
|
|
89
79
|
),
|
|
80
|
+
isDevServerDisabled()
|
|
81
|
+
? runWatch(createWebpackConfig(webpackConfig, configOverrides))
|
|
82
|
+
: runServe(createWebpackConfig(webpackConfig, configOverrides)),
|
|
90
83
|
]);
|
|
91
84
|
}
|
|
92
85
|
|
|
93
|
-
|
|
94
|
-
config ??
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
86
|
+
const webpackConfig =
|
|
87
|
+
config ?? createWebpackConfig({ configuration: { mode } }, configOverrides);
|
|
88
|
+
|
|
89
|
+
if (isDevServerDisabled()) {
|
|
90
|
+
return runWatch(webpackConfig);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
return runServe(webpackConfig);
|
|
100
94
|
}
|
|
101
95
|
|
|
102
96
|
function readWebpackConfig({ config, fallback }: Options & { fallback: string }) {
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
getStylelintConfiguration,
|
|
9
9
|
isBundle,
|
|
10
10
|
isCustomStyleRules,
|
|
11
|
+
isDevServerDisabled,
|
|
11
12
|
isExposeSharedDependencies,
|
|
12
13
|
isLegacy,
|
|
13
14
|
isLegacyRoot,
|
|
@@ -193,6 +194,11 @@ describe('[startup] Utils', () => {
|
|
|
193
194
|
defaultValue: false,
|
|
194
195
|
trigger: { cli: { webpack: { 'custom-style-rules': true } } },
|
|
195
196
|
},
|
|
197
|
+
{
|
|
198
|
+
fn: isDevServerDisabled,
|
|
199
|
+
defaultValue: false,
|
|
200
|
+
trigger: { cli: { webpack: { devServer: false } } },
|
|
201
|
+
},
|
|
196
202
|
{
|
|
197
203
|
fn: isExposeSharedDependencies,
|
|
198
204
|
defaultValue: false,
|
|
@@ -30,7 +30,7 @@ export interface WebpackConfiguration
|
|
|
30
30
|
'contentBase'?: boolean | string | string[] | number; // deprecated 2024-07
|
|
31
31
|
'custom-style-rules'?: boolean;
|
|
32
32
|
'expose-shared-dependencies'?: boolean;
|
|
33
|
-
'devServer'?: WebpackDevServerConfiguration;
|
|
33
|
+
'devServer'?: false | WebpackDevServerConfiguration;
|
|
34
34
|
'disable-style-check'?: boolean;
|
|
35
35
|
'minify'?: MinifyOptions;
|
|
36
36
|
'proxy'?: WebpackDevServerConfiguration['proxy'] | string;
|
|
@@ -128,6 +128,11 @@ export function isCustomStyleRules() {
|
|
|
128
128
|
return getWebpackConfiguration()['custom-style-rules'] === true;
|
|
129
129
|
}
|
|
130
130
|
|
|
131
|
+
export function isDevServerDisabled() {
|
|
132
|
+
const webpackConfiguration = getWebpackConfiguration();
|
|
133
|
+
return webpackConfiguration.devServer === false;
|
|
134
|
+
}
|
|
135
|
+
|
|
131
136
|
export function isExposeSharedDependencies() {
|
|
132
137
|
return getWebpackConfiguration()['expose-shared-dependencies'] === true;
|
|
133
138
|
}
|
|
@@ -25,6 +25,7 @@ import {
|
|
|
25
25
|
getTsConfig,
|
|
26
26
|
getWebpackConfiguration,
|
|
27
27
|
isCustomStyleRules,
|
|
28
|
+
isDevServerDisabled,
|
|
28
29
|
isWebComponent,
|
|
29
30
|
loadSharedDependencies,
|
|
30
31
|
log,
|
|
@@ -64,6 +65,7 @@ jest.mock('../../utils', () => ({
|
|
|
64
65
|
getTsConfig: jest.fn(),
|
|
65
66
|
getWebpackConfiguration: jest.fn(),
|
|
66
67
|
isCustomStyleRules: jest.fn(),
|
|
68
|
+
isDevServerDisabled: jest.fn(),
|
|
67
69
|
isExposeSharedDependencies: jest.fn(),
|
|
68
70
|
isWebComponent: jest.fn(),
|
|
69
71
|
loadSharedDependencies: jest.fn(),
|
|
@@ -220,6 +222,14 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
|
|
|
220
222
|
expect(subject().devServer).toEqual(defaultDefServerConfig);
|
|
221
223
|
});
|
|
222
224
|
|
|
225
|
+
describe('when "devServer" is disabled', () => {
|
|
226
|
+
beforeEach(() => jest.mocked(isDevServerDisabled).mockReturnValue(true));
|
|
227
|
+
|
|
228
|
+
test('omits "devServer" configuration', () => {
|
|
229
|
+
expect(subject().devServer).toBeUndefined();
|
|
230
|
+
});
|
|
231
|
+
});
|
|
232
|
+
|
|
223
233
|
describe('with custom devServer options', () => {
|
|
224
234
|
const options: WebpackDevServer.Configuration = {
|
|
225
235
|
// allowed options
|
|
@@ -4,9 +4,10 @@ import { Configuration } from 'webpack';
|
|
|
4
4
|
import {
|
|
5
5
|
PackageType,
|
|
6
6
|
allowedWebpackDevServerOptions,
|
|
7
|
-
getConfiguration,
|
|
8
7
|
getPackageName,
|
|
9
8
|
getPackages,
|
|
9
|
+
getWebpackConfiguration,
|
|
10
|
+
isDevServerDisabled,
|
|
10
11
|
log,
|
|
11
12
|
pick,
|
|
12
13
|
} from '../../utils';
|
|
@@ -23,6 +24,10 @@ export function devServerConfig(context: Context, overrides: Overrides): Result
|
|
|
23
24
|
}
|
|
24
25
|
|
|
25
26
|
const watchOptions = watchOptionsConfig();
|
|
27
|
+
if (isDevServerDisabled()) {
|
|
28
|
+
return { watchOptions };
|
|
29
|
+
}
|
|
30
|
+
|
|
26
31
|
const devServer = {
|
|
27
32
|
hot: false,
|
|
28
33
|
port: 8080,
|
|
@@ -41,7 +46,7 @@ export function devServerConfig(context: Context, overrides: Overrides): Result
|
|
|
41
46
|
}
|
|
42
47
|
|
|
43
48
|
function getDevServerConfig() {
|
|
44
|
-
const webpack =
|
|
49
|
+
const webpack = getWebpackConfiguration();
|
|
45
50
|
/* istanbul ignore next: debug only */
|
|
46
51
|
log.debug('dev-server-config', () => JSON.stringify({ webpack }, null, 2));
|
|
47
52
|
|