@servicetitan/startup 25.1.0 → 26.0.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.
- package/dist/cli/commands/start.d.ts.map +1 -1
- package/dist/cli/commands/start.js +1 -0
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/utils/bundle.js +5 -5
- package/dist/cli/utils/bundle.js.map +1 -1
- package/dist/utils/get-configuration.d.ts +3 -2
- package/dist/utils/get-configuration.d.ts.map +1 -1
- package/dist/utils/get-configuration.js +2 -28
- package/dist/utils/get-configuration.js.map +1 -1
- package/dist/utils/index.d.ts +4 -3
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +4 -3
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/log.js +1 -1
- package/dist/utils/log.js.map +1 -1
- package/dist/utils/pick.d.ts +2 -0
- package/dist/utils/pick.d.ts.map +1 -0
- package/dist/utils/pick.js +13 -0
- package/dist/utils/pick.js.map +1 -0
- package/dist/webpack/configs/dev-server-config.d.ts +1 -1
- package/dist/webpack/configs/dev-server-config.d.ts.map +1 -1
- package/dist/webpack/configs/dev-server-config.js +46 -5
- package/dist/webpack/configs/dev-server-config.js.map +1 -1
- package/package.json +12 -13
- package/src/cli/commands/__tests__/start.test.ts +5 -5
- package/src/cli/commands/start.ts +1 -0
- package/src/cli/utils/__tests__/bundle.test.ts +17 -5
- package/src/cli/utils/bundle.ts +4 -5
- package/src/utils/__tests__/get-configuration.test.ts +0 -60
- package/src/utils/__tests__/log.test.ts +2 -2
- package/src/utils/get-configuration.ts +3 -34
- package/src/utils/index.ts +4 -3
- package/src/utils/log.ts +1 -1
- package/src/utils/pick.ts +8 -0
- package/src/webpack/__tests__/create-webpack-config.test.ts +104 -12
- package/src/webpack/configs/dev-server-config.ts +61 -12
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/start.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC;AAE5B,UAAU,IAAI;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC/B;AAED,qBAAa,KAAM,YAAW,OAAO;IACrB,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAE9B,WAAW;IAKL,OAAO;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/start.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC;AAE5B,UAAU,IAAI;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC/B;AAED,qBAAa,KAAM,YAAW,OAAO;IACrB,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,IAAI;IAE9B,WAAW;IAKL,OAAO;CAwDhB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/cli/commands/start.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/cli/commands/start.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/utils/bundle.js
CHANGED
|
@@ -124,19 +124,19 @@ function run(config) {
|
|
|
124
124
|
}
|
|
125
125
|
function runServe(_a) {
|
|
126
126
|
return __awaiter(this, void 0, void 0, function* () {
|
|
127
|
-
var _b
|
|
127
|
+
var _b;
|
|
128
128
|
var { devServer = {} } = _a, config = __rest(_a, ["devServer"]);
|
|
129
129
|
const compiler = (0, webpack_1.default)(config);
|
|
130
130
|
const host = (_b = devServer.host) !== null && _b !== void 0 ? _b : 'localhost';
|
|
131
131
|
const port = yield (0, portfinder_1.getPortPromise)({
|
|
132
|
-
port: (
|
|
132
|
+
port: Number(devServer.port) || 8080,
|
|
133
133
|
host,
|
|
134
134
|
});
|
|
135
135
|
return new Promise((_0, reject) => {
|
|
136
|
-
const server = new webpack_dev_server_1.default(
|
|
137
|
-
server.
|
|
136
|
+
const server = new webpack_dev_server_1.default(Object.assign(Object.assign({}, devServer), { host, port }), compiler);
|
|
137
|
+
server.startCallback(e => {
|
|
138
138
|
if (e) {
|
|
139
|
-
server.
|
|
139
|
+
server.stopCallback(() => {
|
|
140
140
|
reject(e);
|
|
141
141
|
});
|
|
142
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/cli/utils/bundle.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/cli/utils/bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,13 @@ import { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-serv
|
|
|
2
2
|
import { ESLint } from 'eslint';
|
|
3
3
|
import { LinterOptions } from 'stylelint';
|
|
4
4
|
import { Config } from '@jest/types';
|
|
5
|
-
declare const allowedWebpackDevServerOptions: readonly ["headers", "port", "proxy", "
|
|
5
|
+
export declare const allowedWebpackDevServerOptions: readonly ["headers", "port", "proxy", "static"];
|
|
6
6
|
type ElementType<T> = T extends readonly (infer ElementType)[] ? ElementType : never;
|
|
7
7
|
export interface WebpackConfiguration extends Omit<Pick<WebpackDevServerConfiguration, ElementType<typeof allowedWebpackDevServerOptions>>, 'proxy'> {
|
|
8
|
+
'contentBase'?: boolean | string | string[] | number;
|
|
8
9
|
'custom-style-rules'?: boolean;
|
|
9
10
|
'expose-shared-dependencies'?: boolean;
|
|
11
|
+
'devServer'?: WebpackDevServerConfiguration;
|
|
10
12
|
'disable-style-check'?: boolean;
|
|
11
13
|
'proxy'?: WebpackDevServerConfiguration['proxy'] | string;
|
|
12
14
|
}
|
|
@@ -55,7 +57,6 @@ type Configuration = {
|
|
|
55
57
|
type LocationOrJson = string | Record<string, any>;
|
|
56
58
|
export declare function getConfiguration(locationOrJson?: LocationOrJson): Configuration;
|
|
57
59
|
export declare function getConfigurationSafe(locationOrJson?: LocationOrJson): Configuration;
|
|
58
|
-
export declare function getDevServerConfiguration(): Pick<WebpackDevServerConfiguration, "headers" | "port" | "proxy" | "contentBase"> | undefined;
|
|
59
60
|
export declare function getESLintConfiguration(): ESLintConfiguration;
|
|
60
61
|
export declare function getJestConfiguration(): JestConfiguration & NodeConfiguration;
|
|
61
62
|
export declare function getStylelintConfiguration(): StylelintConfiguration;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-configuration.d.ts","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"
|
|
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,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;IAC5C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,6BAA6B,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC;CAC7D;AAED,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,OAAO;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,sBAAuB,SAAQ,OAAO,CAAC,aAAa,CAAC;IAClE,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;AAE9D,MAAM,WAAW,iBAAiB;IAE9B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAGD,oBAAY,WAAW;IACnB,OAAO,UAAU;IACjB,gBAAgB,mBAAmB;IACnC,QAAQ,WAAW;IACnB,MAAM,SAAS;IACf,SAAS,YAAY;IACrB,kBAAkB,qBAAqB;IACvC,MAAM,SAAS;IACf,mBAAmB,sBAAsB;IACzC,qBAAqB,wBAAwB;IAC7C,aAAa,gBAAgB;IAC7B,iBAAiB,oBAAoB;IACrC,OAAO,UAAU;IACjB,cAAc,iBAAiB;IAC/B,MAAM,SAAS;CAClB;AAGD,UAAU,mBAAmB;IACzB,UAAU,EAAE,OAAO,CAAC;CACvB;AAED,KAAK,aAAa,GAAG;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,SAAS,EAAE,sBAAsB,CAAA;KAAE,CAAC;IAC5E,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,GAAG,mBAAmB,CAAC;IAChD,SAAS,CAAC,EAAE,KAAK,GAAG,oBAAoB,CAAC;CAC5C,GAAG;KACC,GAAG,IAAI,WAAW,GAAG,iBAAiB;CAC1C,GAAG,iBAAiB,CAAC;AAEtB,KAAK,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEnD,wBAAgB,gBAAgB,CAAC,cAAc,GAAE,cAAqB,GAAG,aAAa,CAMrF;AAED,wBAAgB,oBAAoB,CAAC,cAAc,GAAE,cAAqB,GAAG,aAAa,CAMzF;AAED,wBAAgB,sBAAsB,wBAErC;AAED,wBAAgB,oBAAoB,0CAEnC;AAED,wBAAgB,yBAAyB,2BAExC;AAED,wBAAgB,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,WAEvD;AAED,wBAAgB,kBAAkB,YAQjC;AAED,wBAAgB,0BAA0B,YAQzC;AAED,wBAAgB,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,WAEvD;AAED,wBAAgB,YAAY,YAG3B;AAED,wBAAgB,oBAAoB,YAQnC;AAED,wBAAgB,cAAc,YAG7B"}
|
|
@@ -3,11 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.isWebComponent = exports.isStyleCheckDisabled = exports.isLegacyRoot = exports.isLegacy = exports.isExposeSharedDependencies = exports.isCustomStyleRules = exports.isBundle = exports.getStylelintConfiguration = exports.getJestConfiguration = exports.getESLintConfiguration = exports.
|
|
7
|
-
const fs_1 = __importDefault(require("fs"));
|
|
6
|
+
exports.isWebComponent = exports.isStyleCheckDisabled = exports.isLegacyRoot = exports.isLegacy = exports.isExposeSharedDependencies = exports.isCustomStyleRules = exports.isBundle = exports.getStylelintConfiguration = exports.getJestConfiguration = exports.getESLintConfiguration = exports.getConfigurationSafe = exports.getConfiguration = exports.CommandName = exports.allowedWebpackDevServerOptions = void 0;
|
|
8
7
|
const path_1 = __importDefault(require("path"));
|
|
9
8
|
const read_json_1 = require("./read-json");
|
|
10
|
-
|
|
9
|
+
exports.allowedWebpackDevServerOptions = ['headers', 'port', 'proxy', 'static'];
|
|
11
10
|
/* eslint-disable @typescript-eslint/naming-convention */
|
|
12
11
|
var CommandName;
|
|
13
12
|
(function (CommandName) {
|
|
@@ -42,23 +41,6 @@ function getConfigurationSafe(locationOrJson = './') {
|
|
|
42
41
|
return (_a = json === null || json === void 0 ? void 0 : json.cli) !== null && _a !== void 0 ? _a : {};
|
|
43
42
|
}
|
|
44
43
|
exports.getConfigurationSafe = getConfigurationSafe;
|
|
45
|
-
function getDevServerConfiguration() {
|
|
46
|
-
const configuration = getConfiguration();
|
|
47
|
-
if (typeof configuration.webpack !== 'object') {
|
|
48
|
-
return undefined;
|
|
49
|
-
}
|
|
50
|
-
const result = pick(configuration.webpack, allowedWebpackDevServerOptions);
|
|
51
|
-
if (typeof result.proxy === 'string') {
|
|
52
|
-
if (fs_1.default.existsSync(result.proxy)) {
|
|
53
|
-
result.proxy = require(path_1.default.resolve(result.proxy));
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
delete result.proxy;
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
return result;
|
|
60
|
-
}
|
|
61
|
-
exports.getDevServerConfiguration = getDevServerConfiguration;
|
|
62
44
|
function getESLintConfiguration() {
|
|
63
45
|
var _a, _b;
|
|
64
46
|
return (_b = (_a = getConfiguration().lint) === null || _a === void 0 ? void 0 : _a.eslint) !== null && _b !== void 0 ? _b : {};
|
|
@@ -117,12 +99,4 @@ function isWebComponent() {
|
|
|
117
99
|
return config === true || typeof config === 'object';
|
|
118
100
|
}
|
|
119
101
|
exports.isWebComponent = isWebComponent;
|
|
120
|
-
function pick(target, keys) {
|
|
121
|
-
return keys.reduce((result, key) => {
|
|
122
|
-
if (Object.hasOwn(target, key)) {
|
|
123
|
-
result[key] = target[key];
|
|
124
|
-
}
|
|
125
|
-
return result;
|
|
126
|
-
}, {});
|
|
127
|
-
}
|
|
128
102
|
//# sourceMappingURL=get-configuration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-configuration.js","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"get-configuration.js","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
export * from './get-configuration';
|
|
2
2
|
export * from './get-destination-folders';
|
|
3
3
|
export * from './get-folders';
|
|
4
|
+
export * from './get-jest-config';
|
|
5
|
+
export * from './get-package-data';
|
|
4
6
|
export * from './get-package-name';
|
|
5
7
|
export * from './get-packages';
|
|
6
|
-
export * from './get-package-data';
|
|
7
8
|
export * from './get-startup-version';
|
|
8
9
|
export * from './get-tsconfig';
|
|
10
|
+
export * from './load-shared-dependencies';
|
|
9
11
|
export * from './log';
|
|
12
|
+
export * from './pick';
|
|
10
13
|
export * from './read-json';
|
|
11
14
|
export * from './to-array';
|
|
12
|
-
export * from './load-shared-dependencies';
|
|
13
|
-
export * from './get-jest-config';
|
|
14
15
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC"}
|
package/dist/utils/index.js
CHANGED
|
@@ -17,14 +17,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
17
17
|
__exportStar(require("./get-configuration"), exports);
|
|
18
18
|
__exportStar(require("./get-destination-folders"), exports);
|
|
19
19
|
__exportStar(require("./get-folders"), exports);
|
|
20
|
+
__exportStar(require("./get-jest-config"), exports);
|
|
21
|
+
__exportStar(require("./get-package-data"), exports);
|
|
20
22
|
__exportStar(require("./get-package-name"), exports);
|
|
21
23
|
__exportStar(require("./get-packages"), exports);
|
|
22
|
-
__exportStar(require("./get-package-data"), exports);
|
|
23
24
|
__exportStar(require("./get-startup-version"), exports);
|
|
24
25
|
__exportStar(require("./get-tsconfig"), exports);
|
|
26
|
+
__exportStar(require("./load-shared-dependencies"), exports);
|
|
25
27
|
__exportStar(require("./log"), exports);
|
|
28
|
+
__exportStar(require("./pick"), exports);
|
|
26
29
|
__exportStar(require("./read-json"), exports);
|
|
27
30
|
__exportStar(require("./to-array"), exports);
|
|
28
|
-
__exportStar(require("./load-shared-dependencies"), exports);
|
|
29
|
-
__exportStar(require("./get-jest-config"), exports);
|
|
30
31
|
//# sourceMappingURL=index.js.map
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,4DAA0C;AAC1C,gDAA8B;AAC9B,qDAAmC;AACnC,iDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,4DAA0C;AAC1C,gDAA8B;AAC9B,oDAAkC;AAClC,qDAAmC;AACnC,qDAAmC;AACnC,iDAA+B;AAC/B,wDAAsC;AACtC,iDAA+B;AAC/B,6DAA2C;AAC3C,wCAAsB;AACtB,yCAAuB;AACvB,8CAA4B;AAC5B,6CAA2B"}
|
package/dist/utils/log.js
CHANGED
|
@@ -23,7 +23,7 @@ class Log {
|
|
|
23
23
|
process.stdout.write(chalk_1.default.bold.green(...text) + '\n');
|
|
24
24
|
}
|
|
25
25
|
warning(...text) {
|
|
26
|
-
process.stdout.write(chalk_1.default.bold.
|
|
26
|
+
process.stdout.write(chalk_1.default.bold.yellow(...text) + '\n');
|
|
27
27
|
}
|
|
28
28
|
error(...text) {
|
|
29
29
|
process.stdout.write(chalk_1.default.bold.red(...text) + '\n');
|
package/dist/utils/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,mCAAsC;AAItC,MAAM,GAAG;IAGL;QAFiB;;;;;WAAgC;QAG7C,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IAChD,CAAC;IAED,IAAI,CAAC,GAAG,IAAc;QAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,CAAC,GAAG,IAAc;QACrB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,CAAC,GAAG,IAAc;QACrB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/utils/log.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,mCAAsC;AAItC,MAAM,GAAG;IAGL;QAFiB;;;;;WAAgC;QAG7C,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IAChD,CAAC;IAED,IAAI,CAAC,GAAG,IAAc;QAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,CAAC,GAAG,IAAc;QACrB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,CAAC,GAAG,IAAc;QACrB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,GAAG,IAAc;QACnB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,GAAG,IAAW;QACnC,IAAI,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,GAAG,EAAE,CAAC;YACP,GAAG,GAAG,IAAA,mBAAW,EAAC,SAAS,CAAC,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7B,MAAM,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACxF,GAAG,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AAEY,QAAA,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;AAE7B,SAAgB,SAAS,CAAC,EAAO,EAAE,EAAU,EAAE,UAA8B;IACzE,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC;IAEhC,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;QAC/B,OAAO;IACX,CAAC;IAED,UAAU,CAAC,KAAK,GAAG,UAAU,GAAG,IAAW;QACvC,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAExC,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;gBAC5B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;oBACpB,WAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrB,MAAM,CAAC,CAAC;gBACZ,CAAC,CAAC,CAAC;YACP,CAAC;YAED,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,WAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC,CAAC;AACN,CAAC;AAxBD,8BAwBC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pick.d.ts","sourceRoot":"","sources":["../../src/utils/pick.ts"],"names":[],"mappings":"AAAA,wBAAgB,IAAI,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,cAOtF"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.pick = void 0;
|
|
4
|
+
function pick(target, keys) {
|
|
5
|
+
return keys.reduce((result, key) => {
|
|
6
|
+
if (Object.hasOwn(target, key)) {
|
|
7
|
+
result[key] = target[key];
|
|
8
|
+
}
|
|
9
|
+
return result;
|
|
10
|
+
}, {});
|
|
11
|
+
}
|
|
12
|
+
exports.pick = pick;
|
|
13
|
+
//# sourceMappingURL=pick.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pick.js","sourceRoot":"","sources":["../../src/utils/pick.ts"],"names":[],"mappings":";;;AAAA,SAAgB,IAAI,CAAsC,MAAS,EAAE,IAAkB;IACnF,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QAC/B,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC,EAAE,EAAgB,CAAC,CAAC;AACzB,CAAC;AAPD,oBAOC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Configuration } from 'webpack';
|
|
2
2
|
import { Context, Overrides } from './types';
|
|
3
|
-
type Result = Pick<Configuration, 'devServer'> | undefined;
|
|
3
|
+
type Result = Pick<Configuration, 'devServer' | 'watchOptions'> | undefined;
|
|
4
4
|
export declare function devServerConfig(context: Context, overrides: Overrides): Result;
|
|
5
5
|
export {};
|
|
6
6
|
//# sourceMappingURL=dev-server-config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server-config.d.ts","sourceRoot":"","sources":["../../../src/webpack/configs/dev-server-config.ts"],"names":[],"mappings":"
|
|
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;AAWxC,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,CAqB9E"}
|
|
@@ -1,23 +1,64 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.devServerConfig = void 0;
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
8
|
+
const path_1 = __importDefault(require("path"));
|
|
4
9
|
const utils_1 = require("../../utils");
|
|
5
10
|
const stats_config_1 = require("./stats-config");
|
|
6
11
|
function devServerConfig(context, overrides) {
|
|
7
12
|
if (context.isProduction) {
|
|
8
13
|
return;
|
|
9
14
|
}
|
|
10
|
-
const
|
|
15
|
+
const watchOptions = watchOptionsConfig();
|
|
16
|
+
const devServer = Object.assign({ hot: false, port: 8080, historyApiFallback: true, devMiddleware: Object.assign({ writeToDisk: true }, (0, stats_config_1.statsConfig)(context, overrides)), headers: {
|
|
11
17
|
'Access-Control-Allow-Origin': '*',
|
|
12
18
|
'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept',
|
|
13
|
-
} },
|
|
14
|
-
|
|
19
|
+
} }, getDevServerConfig());
|
|
20
|
+
/* istanbul ignore next: debug only */
|
|
21
|
+
utils_1.log.debug('dev-server-config', () => JSON.stringify({ devServer, watchOptions }, null, 2));
|
|
22
|
+
return { devServer, watchOptions };
|
|
15
23
|
}
|
|
16
24
|
exports.devServerConfig = devServerConfig;
|
|
25
|
+
function getDevServerConfig() {
|
|
26
|
+
const webpack = (0, utils_1.getConfiguration)().webpack || {}; // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing
|
|
27
|
+
/* istanbul ignore next: debug only */
|
|
28
|
+
utils_1.log.debug('dev-server-config', () => JSON.stringify({ webpack }, null, 2));
|
|
29
|
+
const result = (0, utils_1.pick)(webpack, utils_1.allowedWebpackDevServerOptions);
|
|
30
|
+
if (typeof result.proxy === 'string') {
|
|
31
|
+
if (fs_1.default.existsSync(result.proxy)) {
|
|
32
|
+
result.proxy = require(path_1.default.resolve(result.proxy));
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
delete result.proxy;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (result.static === undefined) {
|
|
39
|
+
const contentBase = webpack.contentBase;
|
|
40
|
+
if (contentBase !== undefined) {
|
|
41
|
+
utils_1.log.warning(CONTENT_BASE_DEPRECATION_WARNING);
|
|
42
|
+
if (typeof contentBase !== 'number') {
|
|
43
|
+
result.static = contentBase;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
result.static = '.';
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return Object.assign(Object.assign({}, result), webpack.devServer);
|
|
51
|
+
}
|
|
17
52
|
function watchOptionsConfig() {
|
|
18
|
-
const
|
|
53
|
+
const ignored = (0, utils_1.getPackages)({ scope: (0, utils_1.getPackageName)() })
|
|
19
54
|
.filter(({ type }) => type === utils_1.PackageType.TSC)
|
|
20
55
|
.map(({ location }) => location);
|
|
21
|
-
return
|
|
56
|
+
return { ignored };
|
|
22
57
|
}
|
|
58
|
+
const CONTENT_BASE_DEPRECATION_WARNING = `
|
|
59
|
+
DEPRECATION WARNING: webpack.contentBase in package.json is deprecated.
|
|
60
|
+
Use webpack.static instead.
|
|
61
|
+
`
|
|
62
|
+
.replace(/\n\s*/g, ' ')
|
|
63
|
+
.trim();
|
|
23
64
|
//# sourceMappingURL=dev-server-config.js.map
|
|
@@ -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":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AAExB,uCAQqB;AACrB,iDAA6C;AAO7C,SAAgB,eAAe,CAAC,OAAgB,EAAE,SAAoB;IAClE,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,OAAO;IACX,CAAC;IAED,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;IAC1C,MAAM,SAAS,mBACX,GAAG,EAAE,KAAK,EACV,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,IAAI,EACxB,aAAa,kBAAI,WAAW,EAAE,IAAI,IAAK,IAAA,0BAAW,EAAC,OAAO,EAAE,SAAS,CAAC,GACtE,OAAO,EAAE;YACL,6BAA6B,EAAE,GAAG;YAClC,8BAA8B,EAAE,gDAAgD;SACnF,IACE,kBAAkB,EAAE,CAC1B,CAAC;IAEF,sCAAsC;IACtC,WAAG,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3F,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;AACvC,CAAC;AArBD,0CAqBC;AAED,SAAS,kBAAkB;IACvB,MAAM,OAAO,GAAG,IAAA,wBAAgB,GAAE,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,mEAAmE;IACrH,sCAAsC;IACtC,WAAG,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAE3E,MAAM,MAAM,GAAG,IAAA,YAAI,EAAC,OAAO,EAAE,sCAA8B,CAAC,CAAC;IAC7D,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QACnC,IAAI,YAAE,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,CAAC;aAAM,CAAC;YACJ,OAAO,MAAM,CAAC,KAAK,CAAC;QACxB,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACxC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC5B,WAAG,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;YAC9C,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAClC,MAAM,CAAC,MAAM,GAAG,WAAW,CAAC;YAChC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;QACxB,CAAC;IACL,CAAC;IAED,OAAO,gCAAK,MAAM,GAAK,OAAO,CAAC,SAAS,CAA8B,CAAC;AAC3E,CAAC;AAED,SAAS,kBAAkB;IACvB,MAAM,OAAO,GAAG,IAAA,mBAAW,EAAC,EAAE,KAAK,EAAE,IAAA,sBAAc,GAAE,EAAE,CAAC;SACnD,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,mBAAW,CAAC,GAAG,CAAC;SAC9C,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;IAErC,OAAO,EAAE,OAAO,EAAE,CAAC;AACvB,CAAC;AAED,MAAM,gCAAgC,GAAG;;;CAGxC;KACI,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;KACtB,IAAI,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@servicetitan/startup",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "26.0.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"homepage": "https://docs.st.dev/docs/frontend/startup",
|
|
6
6
|
"repository": {
|
|
@@ -30,15 +30,14 @@
|
|
|
30
30
|
"@types/moment-locales-webpack-plugin": "~1.2.2",
|
|
31
31
|
"@types/sass": "~1.45.0",
|
|
32
32
|
"@types/webpack-assets-manifest": "~5.1.4",
|
|
33
|
-
"@types/webpack-dev-server": "~3.11.5",
|
|
34
33
|
"@types/yargs": "~17.0.24"
|
|
35
34
|
},
|
|
36
35
|
"dependencies": {
|
|
37
|
-
"@babel/preset-env": "~7.
|
|
36
|
+
"@babel/preset-env": "~7.25.3",
|
|
38
37
|
"@jest/core": "~29.7.0",
|
|
39
38
|
"@jest/types": "~29.6.3",
|
|
40
|
-
"@servicetitan/eslint-config": "
|
|
41
|
-
"@servicetitan/stylelint-config": "
|
|
39
|
+
"@servicetitan/eslint-config": "26.0.1",
|
|
40
|
+
"@servicetitan/stylelint-config": "26.0.1",
|
|
42
41
|
"@svgr/webpack": "^8.1.0",
|
|
43
42
|
"@swc/core": "1.6.13",
|
|
44
43
|
"@types/debug": "^4.1.12",
|
|
@@ -47,7 +46,7 @@
|
|
|
47
46
|
"chokidar": "~3.6.0",
|
|
48
47
|
"cpx": "~1.5.0",
|
|
49
48
|
"css-loader": "~7.1.2",
|
|
50
|
-
"debug": "^4.3.
|
|
49
|
+
"debug": "^4.3.6",
|
|
51
50
|
"deepmerge": "~4.3.1",
|
|
52
51
|
"esbuild-loader": "~4.2.2",
|
|
53
52
|
"eslint": "~8.57.0",
|
|
@@ -60,26 +59,26 @@
|
|
|
60
59
|
"jest-circus": "~29.7.0",
|
|
61
60
|
"jest-environment-jsdom": "^29.7.0",
|
|
62
61
|
"jest-fetch-mock": "~3.0.3",
|
|
63
|
-
"lerna": "~8.1.
|
|
62
|
+
"lerna": "~8.1.7",
|
|
64
63
|
"less": "~4.2.0",
|
|
65
64
|
"less-loader": "~12.2.0",
|
|
66
65
|
"less-plugin-npm-import": "~2.1.0",
|
|
67
|
-
"memfs": "~4.
|
|
66
|
+
"memfs": "~4.11.1",
|
|
68
67
|
"mini-css-extract-plugin": "~2.9.0",
|
|
69
68
|
"moment": "^2.30.1",
|
|
70
69
|
"moment-locales-webpack-plugin": "~1.2.0",
|
|
71
70
|
"multimatch": "~5.0.0",
|
|
72
71
|
"portfinder": "~1.0.32",
|
|
73
|
-
"postcss": "~8.4.
|
|
72
|
+
"postcss": "~8.4.40",
|
|
74
73
|
"prettier": "~2.7.1",
|
|
75
74
|
"sass": "~1.77.8",
|
|
76
|
-
"sass-loader": "~
|
|
75
|
+
"sass-loader": "~16.0.0",
|
|
77
76
|
"source-map-loader": "~5.0.0",
|
|
78
77
|
"string-width": "<5.0.0",
|
|
79
78
|
"style-loader": "~4.0.0",
|
|
80
79
|
"stylelint": "~14.16.1",
|
|
81
80
|
"swc-loader": "0.2.6",
|
|
82
|
-
"ts-jest": "~29.
|
|
81
|
+
"ts-jest": "~29.2.4",
|
|
83
82
|
"ts-loader": "~9.5.1",
|
|
84
83
|
"ts-node": "~10.9.2",
|
|
85
84
|
"typed-css-modules": "~0.9.1",
|
|
@@ -88,7 +87,7 @@
|
|
|
88
87
|
"webpack": "~5.93.0",
|
|
89
88
|
"webpack-assets-manifest": "~5.2.1",
|
|
90
89
|
"webpack-bundle-analyzer": "^4.10.2",
|
|
91
|
-
"webpack-dev-server": "~
|
|
90
|
+
"webpack-dev-server": "~5.0.4",
|
|
92
91
|
"webpack-filter-warnings-plugin": "~1.2.1",
|
|
93
92
|
"webpack-merge": "~6.0.1",
|
|
94
93
|
"webpack-virtual-modules": "~0.6.2",
|
|
@@ -105,5 +104,5 @@
|
|
|
105
104
|
"cli": {
|
|
106
105
|
"webpack": false
|
|
107
106
|
},
|
|
108
|
-
"gitHead": "
|
|
107
|
+
"gitHead": "3590356944af4147775bccfee592494c4464f60f"
|
|
109
108
|
}
|
|
@@ -69,7 +69,7 @@ describe(`[startup] ${Start.name}`, () => {
|
|
|
69
69
|
'scope': packages.map(({ name }) => name),
|
|
70
70
|
'parallel': true,
|
|
71
71
|
'stream': true,
|
|
72
|
-
'--': ['--watch'],
|
|
72
|
+
'--': ['--color', '--watch'],
|
|
73
73
|
});
|
|
74
74
|
});
|
|
75
75
|
|
|
@@ -81,7 +81,7 @@ describe(`[startup] ${Start.name}`, () => {
|
|
|
81
81
|
|
|
82
82
|
expect(lernaExec).toHaveBeenCalledWith(
|
|
83
83
|
expect.objectContaining({
|
|
84
|
-
'--': ['--watch', '--code-coverage'],
|
|
84
|
+
'--': ['--color', '--watch', '--code-coverage'],
|
|
85
85
|
})
|
|
86
86
|
);
|
|
87
87
|
});
|
|
@@ -95,7 +95,7 @@ describe(`[startup] ${Start.name}`, () => {
|
|
|
95
95
|
|
|
96
96
|
expect(lernaExec).toHaveBeenCalledWith(
|
|
97
97
|
expect.objectContaining({
|
|
98
|
-
'--': ['--watch', '--esbuild'],
|
|
98
|
+
'--': ['--color', '--watch', '--esbuild'],
|
|
99
99
|
})
|
|
100
100
|
);
|
|
101
101
|
});
|
|
@@ -109,7 +109,7 @@ describe(`[startup] ${Start.name}`, () => {
|
|
|
109
109
|
|
|
110
110
|
expect(lernaExec).toHaveBeenCalledWith(
|
|
111
111
|
expect.objectContaining({
|
|
112
|
-
'--': ['--watch', '--experimental-bundlers'],
|
|
112
|
+
'--': ['--color', '--watch', '--experimental-bundlers'],
|
|
113
113
|
})
|
|
114
114
|
);
|
|
115
115
|
});
|
|
@@ -123,7 +123,7 @@ describe(`[startup] ${Start.name}`, () => {
|
|
|
123
123
|
|
|
124
124
|
expect(lernaExec).toHaveBeenCalledWith(
|
|
125
125
|
expect.objectContaining({
|
|
126
|
-
'--': ['--watch', `--config "${args.config}"`],
|
|
126
|
+
'--': ['--color', '--watch', `--config "${args.config}"`],
|
|
127
127
|
})
|
|
128
128
|
);
|
|
129
129
|
});
|
|
@@ -255,10 +255,10 @@ describe('[startup] Cli Utils', () => {
|
|
|
255
255
|
options = undefined;
|
|
256
256
|
vol.fromJSON(packageFS());
|
|
257
257
|
jest.mocked(WebpackDevServer).mockImplementation((): any => ({
|
|
258
|
-
|
|
258
|
+
startCallback: jest.fn((callback?: (error?: Error) => void) =>
|
|
259
259
|
stopWatching(callback)
|
|
260
260
|
),
|
|
261
|
-
|
|
261
|
+
stopCallback: compiler.close,
|
|
262
262
|
}));
|
|
263
263
|
compiler.watch = jest.fn((_, callback): any => {
|
|
264
264
|
stopWatching(callback);
|
|
@@ -281,17 +281,26 @@ describe('[startup] Cli Utils', () => {
|
|
|
281
281
|
{ name: expectPackageName() }
|
|
282
282
|
);
|
|
283
283
|
expect(webpack).toHaveBeenCalledWith(createWebpackResult);
|
|
284
|
-
expect(WebpackDevServer).toHaveBeenCalledWith(
|
|
284
|
+
expect(WebpackDevServer).toHaveBeenCalledWith(
|
|
285
|
+
{ host: 'localhost', port: 8080 },
|
|
286
|
+
compiler
|
|
287
|
+
);
|
|
285
288
|
});
|
|
286
289
|
|
|
287
290
|
function itUsesConfig(params: { name: string; config: () => Record<string, any> }) {
|
|
288
291
|
test(`uses ${params.name}`, async () => {
|
|
289
292
|
const { devServer, ...config } = params.config();
|
|
293
|
+
const host = devServer.host ?? 'localhost';
|
|
294
|
+
const port =
|
|
295
|
+
typeof devServer.port === 'string' ? Number(devServer.port) : devServer.port;
|
|
290
296
|
|
|
291
297
|
await subject();
|
|
292
298
|
|
|
293
299
|
expect(webpack).toHaveBeenCalledWith(config);
|
|
294
|
-
expect(WebpackDevServer).toHaveBeenCalledWith(
|
|
300
|
+
expect(WebpackDevServer).toHaveBeenCalledWith(
|
|
301
|
+
{ ...devServer, host, port },
|
|
302
|
+
compiler
|
|
303
|
+
);
|
|
295
304
|
});
|
|
296
305
|
}
|
|
297
306
|
|
|
@@ -344,7 +353,10 @@ describe('[startup] Cli Utils', () => {
|
|
|
344
353
|
});
|
|
345
354
|
expect(webpack).toHaveBeenCalledWith(createWebpackResult);
|
|
346
355
|
expect(compiler.watch).toHaveBeenCalled();
|
|
347
|
-
expect(WebpackDevServer).toHaveBeenCalledWith(
|
|
356
|
+
expect(WebpackDevServer).toHaveBeenCalledWith(
|
|
357
|
+
{ host: 'localhost', port: 8080 },
|
|
358
|
+
compiler
|
|
359
|
+
);
|
|
348
360
|
});
|
|
349
361
|
|
|
350
362
|
function itUsesConfig(params: { name: string; config: () => Record<string, any> }) {
|
package/src/cli/utils/bundle.ts
CHANGED
|
@@ -133,16 +133,15 @@ async function runServe({ devServer = {}, ...config }: Configuration) {
|
|
|
133
133
|
const compiler = webpack(config);
|
|
134
134
|
const host = devServer.host ?? 'localhost';
|
|
135
135
|
const port = await getPortPromise({
|
|
136
|
-
port: devServer.port
|
|
136
|
+
port: Number(devServer.port) || 8080,
|
|
137
137
|
host,
|
|
138
138
|
});
|
|
139
139
|
|
|
140
140
|
return new Promise<void>((_0, reject) => {
|
|
141
|
-
const server = new WebpackDevServer(
|
|
142
|
-
|
|
143
|
-
server.listen(port, host, e => {
|
|
141
|
+
const server = new WebpackDevServer({ ...devServer, host, port }, compiler);
|
|
142
|
+
server.startCallback(e => {
|
|
144
143
|
if (e) {
|
|
145
|
-
server.
|
|
144
|
+
server.stopCallback(() => {
|
|
146
145
|
reject(e);
|
|
147
146
|
});
|
|
148
147
|
}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import { fs, vol } from 'memfs';
|
|
2
|
-
import WebpackDevServer from 'webpack-dev-server';
|
|
3
|
-
import path from 'path';
|
|
4
2
|
|
|
5
3
|
import {
|
|
6
4
|
getConfiguration,
|
|
7
5
|
getConfigurationSafe,
|
|
8
|
-
getDevServerConfiguration,
|
|
9
6
|
getESLintConfiguration,
|
|
10
7
|
getJestConfiguration,
|
|
11
8
|
getStylelintConfiguration,
|
|
@@ -137,63 +134,6 @@ describe('[startup] Utils', () => {
|
|
|
137
134
|
});
|
|
138
135
|
});
|
|
139
136
|
|
|
140
|
-
describe(`${getDevServerConfiguration.name}`, () => {
|
|
141
|
-
const subject = () => getDevServerConfiguration();
|
|
142
|
-
|
|
143
|
-
itReturns(subject, undefined);
|
|
144
|
-
|
|
145
|
-
describe('with "cli.webpack"', () => {
|
|
146
|
-
const webpack: WebpackDevServer.Configuration = {
|
|
147
|
-
// allowed options
|
|
148
|
-
contentBase: 'foo',
|
|
149
|
-
headers: { foo: 'bar' },
|
|
150
|
-
port: 9000,
|
|
151
|
-
proxy: { baz: 'qux' },
|
|
152
|
-
// example disallowed options
|
|
153
|
-
compress: true,
|
|
154
|
-
clientLogLevel: 'debug',
|
|
155
|
-
};
|
|
156
|
-
|
|
157
|
-
beforeEach(() => mockPackageJson({ cli: { webpack } }));
|
|
158
|
-
|
|
159
|
-
test('returns allowed options from "cli.webpack', () => {
|
|
160
|
-
const { contentBase, headers, port, proxy } = webpack;
|
|
161
|
-
expect(subject()).toEqual({ contentBase, headers, port, proxy });
|
|
162
|
-
});
|
|
163
|
-
|
|
164
|
-
describe('when "cli.webpack.proxy" is a path', () => {
|
|
165
|
-
const proxy = 'proxy.js';
|
|
166
|
-
const proxyConfig = { cli: { webpack: { ...webpack, proxy } } };
|
|
167
|
-
|
|
168
|
-
beforeEach(() => mockPackageJson(proxyConfig));
|
|
169
|
-
|
|
170
|
-
describe('when file does not exist', () => {
|
|
171
|
-
test('drops the proxy option', () => {
|
|
172
|
-
expect(subject()?.proxy).toBeUndefined();
|
|
173
|
-
});
|
|
174
|
-
});
|
|
175
|
-
|
|
176
|
-
describe('when file exists', () => {
|
|
177
|
-
beforeEach(() => {
|
|
178
|
-
vol.fromJSON({
|
|
179
|
-
...packageJsonFS(proxyConfig),
|
|
180
|
-
[proxy]: JSON.stringify(webpack.proxy),
|
|
181
|
-
});
|
|
182
|
-
|
|
183
|
-
// Have to mock proxy.js because our fs is virtual, but require() is not
|
|
184
|
-
jest.doMock(path.resolve('proxy.js'), () => webpack.proxy, {
|
|
185
|
-
virtual: true,
|
|
186
|
-
});
|
|
187
|
-
});
|
|
188
|
-
|
|
189
|
-
test('loads proxy option from the file', () => {
|
|
190
|
-
expect(subject()?.proxy).toEqual(webpack.proxy);
|
|
191
|
-
});
|
|
192
|
-
});
|
|
193
|
-
});
|
|
194
|
-
});
|
|
195
|
-
});
|
|
196
|
-
|
|
197
137
|
describe(`${getESLintConfiguration.name}`, () => {
|
|
198
138
|
const subject = () => getESLintConfiguration();
|
|
199
139
|
|
|
@@ -26,10 +26,10 @@ describe(`[startup] Utils`, () => {
|
|
|
26
26
|
expect(stdoutSpy).toHaveBeenCalledWith(`${chalk.bold.green(message)}\n`);
|
|
27
27
|
});
|
|
28
28
|
|
|
29
|
-
test('warning() writes
|
|
29
|
+
test('warning() writes yellow text', () => {
|
|
30
30
|
log.warning(message);
|
|
31
31
|
|
|
32
|
-
expect(stdoutSpy).toHaveBeenCalledWith(`${chalk.bold.
|
|
32
|
+
expect(stdoutSpy).toHaveBeenCalledWith(`${chalk.bold.yellow(message)}\n`);
|
|
33
33
|
});
|
|
34
34
|
|
|
35
35
|
test('error() writes red text', () => {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import fs from 'fs';
|
|
2
1
|
import path from 'path';
|
|
3
2
|
|
|
4
3
|
import { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
|
|
@@ -7,7 +6,7 @@ import { LinterOptions } from 'stylelint';
|
|
|
7
6
|
import { Config } from '@jest/types';
|
|
8
7
|
import { readJson, readJsonSafe } from './read-json';
|
|
9
8
|
|
|
10
|
-
const allowedWebpackDevServerOptions = ['headers', 'port', 'proxy', '
|
|
9
|
+
export const allowedWebpackDevServerOptions = ['headers', 'port', 'proxy', 'static'] as const;
|
|
11
10
|
|
|
12
11
|
type ElementType<T> = T extends readonly (infer ElementType)[] ? ElementType : never;
|
|
13
12
|
|
|
@@ -16,8 +15,10 @@ export interface WebpackConfiguration
|
|
|
16
15
|
Pick<WebpackDevServerConfiguration, ElementType<typeof allowedWebpackDevServerOptions>>,
|
|
17
16
|
'proxy'
|
|
18
17
|
> {
|
|
18
|
+
'contentBase'?: boolean | string | string[] | number; // deprecated 2024-07
|
|
19
19
|
'custom-style-rules'?: boolean;
|
|
20
20
|
'expose-shared-dependencies'?: boolean;
|
|
21
|
+
'devServer'?: WebpackDevServerConfiguration;
|
|
21
22
|
'disable-style-check'?: boolean;
|
|
22
23
|
'proxy'?: WebpackDevServerConfiguration['proxy'] | string;
|
|
23
24
|
}
|
|
@@ -89,29 +90,6 @@ export function getConfigurationSafe(locationOrJson: LocationOrJson = './'): Con
|
|
|
89
90
|
return json?.cli ?? {};
|
|
90
91
|
}
|
|
91
92
|
|
|
92
|
-
export function getDevServerConfiguration() {
|
|
93
|
-
const configuration = getConfiguration();
|
|
94
|
-
|
|
95
|
-
if (typeof configuration.webpack !== 'object') {
|
|
96
|
-
return undefined;
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
const result = pick(configuration.webpack, allowedWebpackDevServerOptions);
|
|
100
|
-
|
|
101
|
-
if (typeof result.proxy === 'string') {
|
|
102
|
-
if (fs.existsSync(result.proxy)) {
|
|
103
|
-
result.proxy = require(path.resolve(result.proxy));
|
|
104
|
-
} else {
|
|
105
|
-
delete result.proxy;
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
return result as Pick<
|
|
110
|
-
WebpackDevServerConfiguration,
|
|
111
|
-
ElementType<typeof allowedWebpackDevServerOptions>
|
|
112
|
-
>;
|
|
113
|
-
}
|
|
114
|
-
|
|
115
93
|
export function getESLintConfiguration() {
|
|
116
94
|
return getConfiguration().lint?.eslint ?? {};
|
|
117
95
|
}
|
|
@@ -171,12 +149,3 @@ export function isWebComponent() {
|
|
|
171
149
|
const config = getConfiguration()['web-component'];
|
|
172
150
|
return config === true || typeof config === 'object';
|
|
173
151
|
}
|
|
174
|
-
|
|
175
|
-
function pick<T extends object, K extends keyof T>(target: T, keys: readonly K[]) {
|
|
176
|
-
return keys.reduce((result, key) => {
|
|
177
|
-
if (Object.hasOwn(target, key)) {
|
|
178
|
-
result[key] = target[key];
|
|
179
|
-
}
|
|
180
|
-
return result;
|
|
181
|
-
}, {} as Pick<T, K>);
|
|
182
|
-
}
|
package/src/utils/index.ts
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
export * from './get-configuration';
|
|
2
2
|
export * from './get-destination-folders';
|
|
3
3
|
export * from './get-folders';
|
|
4
|
+
export * from './get-jest-config';
|
|
5
|
+
export * from './get-package-data';
|
|
4
6
|
export * from './get-package-name';
|
|
5
7
|
export * from './get-packages';
|
|
6
|
-
export * from './get-package-data';
|
|
7
8
|
export * from './get-startup-version';
|
|
8
9
|
export * from './get-tsconfig';
|
|
10
|
+
export * from './load-shared-dependencies';
|
|
9
11
|
export * from './log';
|
|
12
|
+
export * from './pick';
|
|
10
13
|
export * from './read-json';
|
|
11
14
|
export * from './to-array';
|
|
12
|
-
export * from './load-shared-dependencies';
|
|
13
|
-
export * from './get-jest-config';
|
package/src/utils/log.ts
CHANGED
|
@@ -6,6 +6,7 @@ import MomentLocalesPlugin from 'moment-locales-webpack-plugin';
|
|
|
6
6
|
import os from 'os';
|
|
7
7
|
import path from 'path';
|
|
8
8
|
import { IgnorePlugin, ProvidePlugin } from 'webpack';
|
|
9
|
+
import WebpackDevServer from 'webpack-dev-server';
|
|
9
10
|
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
|
|
10
11
|
const FilterWarningsPlugin = require('webpack-filter-warnings-plugin');
|
|
11
12
|
import { argv } from 'yargs';
|
|
@@ -13,6 +14,8 @@ import { argv } from 'yargs';
|
|
|
13
14
|
import {
|
|
14
15
|
Package,
|
|
15
16
|
PackageType,
|
|
17
|
+
WebpackConfiguration,
|
|
18
|
+
getConfiguration,
|
|
16
19
|
getFolders,
|
|
17
20
|
getPackageData,
|
|
18
21
|
getPackageDependencyVersion,
|
|
@@ -21,6 +24,7 @@ import {
|
|
|
21
24
|
isCustomStyleRules,
|
|
22
25
|
isWebComponent,
|
|
23
26
|
loadSharedDependencies,
|
|
27
|
+
log,
|
|
24
28
|
} from '../../utils';
|
|
25
29
|
import { createPackage } from '../../__mocks__';
|
|
26
30
|
import { fileRules, productionStyleRules, styleRules } from '../__mocks__';
|
|
@@ -47,6 +51,7 @@ jest.mock('webpack-virtual-modules', () => jest.fn());
|
|
|
47
51
|
jest.mock('yargs', () => ({ argv: {} }));
|
|
48
52
|
jest.mock('../../utils', () => ({
|
|
49
53
|
...jest.requireActual('../../utils'),
|
|
54
|
+
getConfiguration: jest.fn(),
|
|
50
55
|
getFolders: jest.fn(),
|
|
51
56
|
getPackageData: jest.fn(),
|
|
52
57
|
getPackageDependencyVersion: jest.fn(),
|
|
@@ -56,7 +61,7 @@ jest.mock('../../utils', () => ({
|
|
|
56
61
|
isExposeSharedDependencies: jest.fn(),
|
|
57
62
|
isWebComponent: jest.fn(),
|
|
58
63
|
loadSharedDependencies: jest.fn(),
|
|
59
|
-
log: { debug: jest.fn(), info: jest.fn() },
|
|
64
|
+
log: { debug: jest.fn(), info: jest.fn(), warning: jest.fn() },
|
|
60
65
|
}));
|
|
61
66
|
jest.mock('../utils', () => ({
|
|
62
67
|
...jest.requireActual('../utils'),
|
|
@@ -81,6 +86,7 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
|
|
|
81
86
|
let packages: Package[];
|
|
82
87
|
let overrides: Parameters<typeof createWebpackConfig>[0];
|
|
83
88
|
let options: Parameters<typeof createWebpackConfig>[1];
|
|
89
|
+
let configuration: { webpack?: WebpackConfiguration };
|
|
84
90
|
|
|
85
91
|
function mockPlugIn(name: string) {
|
|
86
92
|
return (options: Record<string, any>): any => ({ [name]: options });
|
|
@@ -101,6 +107,7 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
|
|
|
101
107
|
},
|
|
102
108
|
};
|
|
103
109
|
options = undefined;
|
|
110
|
+
configuration = {};
|
|
104
111
|
|
|
105
112
|
jest.resetAllMocks();
|
|
106
113
|
jest.mocked(MiniCssExtractPlugin).mockImplementation(mockPlugIn('MiniCssExtractPlugin'));
|
|
@@ -114,6 +121,7 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
|
|
|
114
121
|
jest.mocked(MomentLocalesPlugin).mockImplementation(mockPlugIn('MomentLocalesPlugin'));
|
|
115
122
|
jest.mocked(ProvidePlugin).mockImplementation(mockPlugIn('ProvidePlugin'));
|
|
116
123
|
|
|
124
|
+
jest.mocked(getConfiguration).mockImplementation(() => configuration as any);
|
|
117
125
|
jest.mocked(getFolders).mockImplementation((location?: string) => {
|
|
118
126
|
const prefix = location ? `${location.replace(/\W/g, '')}-` : '';
|
|
119
127
|
return { source: `${prefix}${source}`, destination };
|
|
@@ -185,16 +193,100 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
|
|
|
185
193
|
expect(subject().amd).toEqual(false);
|
|
186
194
|
});
|
|
187
195
|
|
|
196
|
+
const defaultDefServerConfig = {
|
|
197
|
+
hot: false,
|
|
198
|
+
port: 8080,
|
|
199
|
+
historyApiFallback: true,
|
|
200
|
+
devMiddleware: { stats: expect.anything(), writeToDisk: true },
|
|
201
|
+
headers: {
|
|
202
|
+
'Access-Control-Allow-Origin': '*',
|
|
203
|
+
'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept',
|
|
204
|
+
},
|
|
205
|
+
static: '.',
|
|
206
|
+
};
|
|
207
|
+
|
|
188
208
|
test('configures "devServer"', () => {
|
|
189
|
-
expect(subject().devServer).toEqual(
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
209
|
+
expect(subject().devServer).toEqual(defaultDefServerConfig);
|
|
210
|
+
});
|
|
211
|
+
|
|
212
|
+
describe('with custom devServer options', () => {
|
|
213
|
+
const options: WebpackDevServer.Configuration = {
|
|
214
|
+
// allowed options
|
|
215
|
+
headers: { foo: 'bar' },
|
|
216
|
+
port: 9000,
|
|
217
|
+
proxy: [{ context: ['/foo'] }],
|
|
218
|
+
static: 'foo',
|
|
219
|
+
// disallowed options
|
|
220
|
+
compress: true,
|
|
221
|
+
client: { logging: 'verbose', overlay: false },
|
|
222
|
+
};
|
|
223
|
+
|
|
224
|
+
beforeEach(() => (configuration = { webpack: options }));
|
|
225
|
+
|
|
226
|
+
test('adds allowed options to "devServer" configuration', () => {
|
|
227
|
+
expect(subject().devServer).toEqual({
|
|
228
|
+
...defaultDefServerConfig,
|
|
229
|
+
headers: options.headers,
|
|
230
|
+
port: options.port,
|
|
231
|
+
proxy: options.proxy,
|
|
232
|
+
static: options.static,
|
|
233
|
+
});
|
|
234
|
+
});
|
|
235
|
+
|
|
236
|
+
describe('with "devServer" option', () => {
|
|
237
|
+
beforeEach(() => (configuration.webpack = { devServer: options }));
|
|
238
|
+
|
|
239
|
+
test('adds all options to "devServer" configuration', () => {
|
|
240
|
+
expect(subject().devServer).toEqual({
|
|
241
|
+
...defaultDefServerConfig,
|
|
242
|
+
...options,
|
|
243
|
+
});
|
|
244
|
+
});
|
|
245
|
+
});
|
|
246
|
+
|
|
247
|
+
describe('when "proxy" is a path', () => {
|
|
248
|
+
const proxy = 'proxy.js';
|
|
249
|
+
const proxyConfig = { context: ['/bar'] };
|
|
250
|
+
|
|
251
|
+
beforeEach(() => (configuration.webpack!.proxy = proxy));
|
|
252
|
+
|
|
253
|
+
describe('when file does not exist', () => {
|
|
254
|
+
test('drops the proxy option', () => {
|
|
255
|
+
expect(subject().devServer!.proxy).toBeUndefined();
|
|
256
|
+
});
|
|
257
|
+
});
|
|
258
|
+
|
|
259
|
+
describe('when file exists', () => {
|
|
260
|
+
beforeEach(() => {
|
|
261
|
+
vol.fromJSON({ [proxy]: JSON.stringify(proxyConfig) });
|
|
262
|
+
|
|
263
|
+
// Have to mock proxy file because our fs is virtual, but require() is not
|
|
264
|
+
jest.doMock(path.resolve(proxy), () => proxyConfig, {
|
|
265
|
+
virtual: true,
|
|
266
|
+
});
|
|
267
|
+
});
|
|
268
|
+
|
|
269
|
+
test('loads proxy option from the file', () => {
|
|
270
|
+
expect(subject().devServer!.proxy).toEqual(proxyConfig);
|
|
271
|
+
});
|
|
272
|
+
});
|
|
273
|
+
});
|
|
274
|
+
|
|
275
|
+
describe('when options omits "static"', () => {
|
|
276
|
+
beforeEach(() => delete configuration.webpack!.static);
|
|
277
|
+
|
|
278
|
+
describe('when options includes "contentBase"', () => {
|
|
279
|
+
const contentBase = 'src/public';
|
|
280
|
+
|
|
281
|
+
beforeEach(() => (configuration.webpack!.contentBase = contentBase));
|
|
282
|
+
|
|
283
|
+
test('moves "contentBase" value to "static" and logs deprecation warning', () => {
|
|
284
|
+
expect(subject().devServer!.static).toEqual(contentBase);
|
|
285
|
+
expect(log.warning).toHaveBeenCalledWith(
|
|
286
|
+
expect.stringMatching('DEPRECATION WARNING')
|
|
287
|
+
);
|
|
288
|
+
});
|
|
289
|
+
});
|
|
198
290
|
});
|
|
199
291
|
});
|
|
200
292
|
|
|
@@ -214,11 +306,11 @@ describe(`[startup] ${createWebpackConfig.name}`, () => {
|
|
|
214
306
|
];
|
|
215
307
|
});
|
|
216
308
|
|
|
217
|
-
test('configures "
|
|
309
|
+
test('configures "watchOptions" to ignore TSC packages', () => {
|
|
218
310
|
const ignored = packages
|
|
219
311
|
.filter(({ type }) => type === PackageType.TSC)
|
|
220
312
|
.map(({ location }) => location);
|
|
221
|
-
expect(subject().
|
|
313
|
+
expect(subject().watchOptions).toEqual({ ignored });
|
|
222
314
|
});
|
|
223
315
|
});
|
|
224
316
|
|
|
@@ -1,36 +1,85 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import path from 'path';
|
|
1
3
|
import { Configuration } from 'webpack';
|
|
2
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
PackageType,
|
|
6
|
+
allowedWebpackDevServerOptions,
|
|
7
|
+
getConfiguration,
|
|
8
|
+
getPackageName,
|
|
9
|
+
getPackages,
|
|
10
|
+
log,
|
|
11
|
+
pick,
|
|
12
|
+
} from '../../utils';
|
|
3
13
|
import { statsConfig } from './stats-config';
|
|
4
14
|
import { Context, Overrides } from './types';
|
|
5
15
|
|
|
6
|
-
type
|
|
7
|
-
type
|
|
16
|
+
type DevServerConfig = NonNullable<Configuration['devServer']>;
|
|
17
|
+
type WatchOptionsConfig = NonNullable<Configuration['watchOptions']>;
|
|
18
|
+
type Result = Pick<Configuration, 'devServer' | 'watchOptions'> | undefined;
|
|
8
19
|
|
|
9
20
|
export function devServerConfig(context: Context, overrides: Overrides): Result {
|
|
10
21
|
if (context.isProduction) {
|
|
11
22
|
return;
|
|
12
23
|
}
|
|
13
24
|
|
|
14
|
-
const
|
|
25
|
+
const watchOptions = watchOptionsConfig();
|
|
26
|
+
const devServer = {
|
|
27
|
+
hot: false,
|
|
15
28
|
port: 8080,
|
|
16
29
|
historyApiFallback: true,
|
|
17
|
-
writeToDisk: true,
|
|
30
|
+
devMiddleware: { writeToDisk: true, ...statsConfig(context, overrides) },
|
|
18
31
|
headers: {
|
|
19
32
|
'Access-Control-Allow-Origin': '*',
|
|
20
33
|
'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept',
|
|
21
34
|
},
|
|
22
|
-
...
|
|
23
|
-
...statsConfig(context, overrides),
|
|
24
|
-
...getDevServerConfiguration(),
|
|
35
|
+
...getDevServerConfig(),
|
|
25
36
|
};
|
|
26
37
|
|
|
27
|
-
|
|
38
|
+
/* istanbul ignore next: debug only */
|
|
39
|
+
log.debug('dev-server-config', () => JSON.stringify({ devServer, watchOptions }, null, 2));
|
|
40
|
+
return { devServer, watchOptions };
|
|
28
41
|
}
|
|
29
42
|
|
|
30
|
-
function
|
|
31
|
-
const
|
|
43
|
+
function getDevServerConfig() {
|
|
44
|
+
const webpack = getConfiguration().webpack || {}; // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing
|
|
45
|
+
/* istanbul ignore next: debug only */
|
|
46
|
+
log.debug('dev-server-config', () => JSON.stringify({ webpack }, null, 2));
|
|
47
|
+
|
|
48
|
+
const result = pick(webpack, allowedWebpackDevServerOptions);
|
|
49
|
+
if (typeof result.proxy === 'string') {
|
|
50
|
+
if (fs.existsSync(result.proxy)) {
|
|
51
|
+
result.proxy = require(path.resolve(result.proxy));
|
|
52
|
+
} else {
|
|
53
|
+
delete result.proxy;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
if (result.static === undefined) {
|
|
58
|
+
const contentBase = webpack.contentBase;
|
|
59
|
+
if (contentBase !== undefined) {
|
|
60
|
+
log.warning(CONTENT_BASE_DEPRECATION_WARNING);
|
|
61
|
+
if (typeof contentBase !== 'number') {
|
|
62
|
+
result.static = contentBase;
|
|
63
|
+
}
|
|
64
|
+
} else {
|
|
65
|
+
result.static = '.';
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
return { ...result, ...webpack.devServer } as Partial<DevServerConfig>;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function watchOptionsConfig(): WatchOptionsConfig {
|
|
73
|
+
const ignored = getPackages({ scope: getPackageName() })
|
|
32
74
|
.filter(({ type }) => type === PackageType.TSC)
|
|
33
75
|
.map(({ location }) => location);
|
|
34
76
|
|
|
35
|
-
return
|
|
77
|
+
return { ignored };
|
|
36
78
|
}
|
|
79
|
+
|
|
80
|
+
const CONTENT_BASE_DEPRECATION_WARNING = `
|
|
81
|
+
DEPRECATION WARNING: webpack.contentBase in package.json is deprecated.
|
|
82
|
+
Use webpack.static instead.
|
|
83
|
+
`
|
|
84
|
+
.replace(/\n\s*/g, ' ')
|
|
85
|
+
.trim();
|