@servicetitan/startup 18.1.0 → 19.3.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.
@@ -1,10 +1,13 @@
1
+ import { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
1
2
  import { ESLint } from 'eslint';
2
3
  import { LinterOptions } from 'stylelint';
3
4
  import { Config } from '@jest/types';
4
- export interface WebpackConfiguration {
5
+ declare const allowedWebpackDevServerOptions: readonly ["headers", "port", "proxy"];
6
+ declare type ElementType<T> = T extends readonly (infer ElementType)[] ? ElementType : never;
7
+ export interface WebpackConfiguration extends Omit<Pick<WebpackDevServerConfiguration, ElementType<typeof allowedWebpackDevServerOptions>>, 'proxy'> {
5
8
  'custom-style-rules'?: boolean;
6
9
  'expose-shared-dependencies'?: boolean;
7
- 'port'?: number;
10
+ 'proxy'?: WebpackDevServerConfiguration['proxy'] | string;
8
11
  }
9
12
  export interface ESLintConfiguration extends ESLint.Options {
10
13
  disabled?: boolean;
@@ -28,7 +31,7 @@ export declare function getConfiguration(location?: string): Configuration;
28
31
  export declare function isBundle(location?: string): boolean;
29
32
  export declare function isCustomStyleRules(): boolean;
30
33
  export declare function isExposeSharedDependencies(): boolean;
31
- export declare function getDevServerPort(): number | undefined;
34
+ export declare function getDevServerConfiguration(): Pick<WebpackDevServerConfiguration, "headers" | "port" | "proxy"> | undefined;
32
35
  export declare function isWebComponent(): boolean;
33
36
  export declare function isLegacy(location?: string): boolean;
34
37
  export declare function getESLintConfiguration(): ESLintConfiguration;
@@ -1 +1 @@
1
- {"version":3,"file":"get-configuration.d.ts","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,MAAM,WAAW,oBAAoB;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;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,GAAG,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,oBAAY,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;AAE9D,UAAU,aAAa;IACnB,SAAS,CAAC,EAAE,KAAK,GAAG,oBAAoB,CAAC;IACzC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE;QACL,MAAM,EAAE,mBAAmB,CAAC;QAC5B,SAAS,EAAE,sBAAsB,CAAC;KACrC,CAAC;IACF,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,SAAO,GAAG,aAAa,CAE/D;AAED,wBAAgB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,WAEzC;AAED,wBAAgB,kBAAkB,YAQjC;AAED,wBAAgB,0BAA0B,YAQzC;AAED,wBAAgB,gBAAgB,uBAQ/B;AAED,wBAAgB,cAAc,YAE7B;AAED,wBAAgB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,WAEzC;AAED,wBAAgB,sBAAsB,wBAErC;AAED,wBAAgB,yBAAyB,2BAExC;AAED,wBAAgB,oBAAoB,sBAEnC"}
1
+ {"version":3,"file":"get-configuration.d.ts","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":"AAGA,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;AAIrC,QAAA,MAAM,8BAA8B,uCAAwC,CAAC;AAE7E,aAAK,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,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,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,GAAG,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,oBAAY,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;AAE9D,UAAU,aAAa;IACnB,SAAS,CAAC,EAAE,KAAK,GAAG,oBAAoB,CAAC;IACzC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE;QACL,MAAM,EAAE,mBAAmB,CAAC;QAC5B,SAAS,EAAE,sBAAsB,CAAC;KACrC,CAAC;IACF,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,SAAO,GAAG,aAAa,CAE/D;AAED,wBAAgB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,WAEzC;AAED,wBAAgB,kBAAkB,YAQjC;AAED,wBAAgB,0BAA0B,YAQzC;AAUD,wBAAgB,yBAAyB,kFAqBxC;AAED,wBAAgB,cAAc,YAE7B;AAED,wBAAgB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,WAEzC;AAED,wBAAgB,sBAAsB,wBAErC;AAED,wBAAgB,yBAAyB,2BAExC;AAED,wBAAgB,oBAAoB,sBAEnC"}
@@ -3,9 +3,11 @@ 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.getJestConfiguration = exports.getStylelintConfiguration = exports.getESLintConfiguration = exports.isLegacy = exports.isWebComponent = exports.getDevServerPort = exports.isExposeSharedDependencies = exports.isCustomStyleRules = exports.isBundle = exports.getConfiguration = void 0;
6
+ exports.getJestConfiguration = exports.getStylelintConfiguration = exports.getESLintConfiguration = exports.isLegacy = exports.isWebComponent = exports.getDevServerConfiguration = exports.isExposeSharedDependencies = exports.isCustomStyleRules = exports.isBundle = exports.getConfiguration = void 0;
7
+ const fs_1 = __importDefault(require("fs"));
7
8
  const path_1 = __importDefault(require("path"));
8
9
  const _1 = require(".");
10
+ const allowedWebpackDevServerOptions = ['headers', 'port', 'proxy'];
9
11
  function getConfiguration(location = './') {
10
12
  var _a;
11
13
  return (_a = (0, _1.readJson)(path_1.default.join(location, 'package.json')).cli) !== null && _a !== void 0 ? _a : {};
@@ -31,14 +33,28 @@ function isExposeSharedDependencies() {
31
33
  return configuration.webpack['expose-shared-dependencies'] === true;
32
34
  }
33
35
  exports.isExposeSharedDependencies = isExposeSharedDependencies;
34
- function getDevServerPort() {
36
+ function pick(target, keys) {
37
+ return Object.fromEntries(keys
38
+ .filter(key => Object.prototype.hasOwnProperty.call(target, key))
39
+ .map(key => [key, target[key]]));
40
+ }
41
+ function getDevServerConfiguration() {
35
42
  const configuration = getConfiguration();
36
43
  if (typeof configuration.webpack !== 'object') {
37
44
  return undefined;
38
45
  }
39
- return configuration.webpack.port;
46
+ const result = pick(configuration.webpack, allowedWebpackDevServerOptions);
47
+ if (typeof result.proxy === 'string') {
48
+ if (fs_1.default.existsSync(result.proxy)) {
49
+ result.proxy = require(path_1.default.resolve(result.proxy));
50
+ }
51
+ else {
52
+ delete result.proxy;
53
+ }
54
+ }
55
+ return result;
40
56
  }
41
- exports.getDevServerPort = getDevServerPort;
57
+ exports.getDevServerConfiguration = getDevServerConfiguration;
42
58
  function isWebComponent() {
43
59
  return getConfiguration()['web-component'] === true;
44
60
  }
@@ -1 +1 @@
1
- {"version":3,"file":"get-configuration.js","sourceRoot":"","sources":["../../src/utils/get-configuration.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAMxB,wBAA6B;AA8B7B,SAAgB,gBAAgB,CAAC,QAAQ,GAAG,IAAI;;IAC5C,OAAO,MAAA,IAAA,WAAQ,EAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,mCAAI,EAAE,CAAC;AACnE,CAAC;AAFD,4CAEC;AAED,SAAgB,QAAQ,CAAC,QAAiB;IACtC,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC;AACxD,CAAC;AAFD,4BAEC;AAED,SAAgB,kBAAkB;IAC9B,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IAEzC,IAAI,OAAO,aAAa,CAAC,OAAO,KAAK,QAAQ,EAAE;QAC3C,OAAO,KAAK,CAAC;KAChB;IAED,OAAO,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,IAAI,CAAC;AAChE,CAAC;AARD,gDAQC;AAED,SAAgB,0BAA0B;IACtC,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IAEzC,IAAI,OAAO,aAAa,CAAC,OAAO,KAAK,QAAQ,EAAE;QAC3C,OAAO,KAAK,CAAC;KAChB;IAED,OAAO,aAAa,CAAC,OAAO,CAAC,4BAA4B,CAAC,KAAK,IAAI,CAAC;AACxE,CAAC;AARD,gEAQC;AAED,SAAgB,gBAAgB;IAC5B,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IAEzC,IAAI,OAAO,aAAa,CAAC,OAAO,KAAK,QAAQ,EAAE;QAC3C,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC;AACtC,CAAC;AARD,4CAQC;AAED,SAAgB,cAAc;IAC1B,OAAO,gBAAgB,EAAE,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC;AACxD,CAAC;AAFD,wCAEC;AAED,SAAgB,QAAQ,CAAC,QAAiB;IACtC,OAAO,gBAAgB,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC;AACtD,CAAC;AAFD,4BAEC;AAED,SAAgB,sBAAsB;;IAClC,OAAO,MAAA,MAAA,gBAAgB,EAAE,CAAC,IAAI,0CAAE,MAAM,mCAAI,EAAE,CAAC;AACjD,CAAC;AAFD,wDAEC;AAED,SAAgB,yBAAyB;;IACrC,OAAO,MAAA,MAAA,gBAAgB,EAAE,CAAC,IAAI,0CAAE,SAAS,mCAAI,EAAE,CAAC;AACpD,CAAC;AAFD,8DAEC;AAED,SAAgB,oBAAoB;;IAChC,OAAO,MAAA,gBAAgB,EAAE,CAAC,IAAI,mCAAI,EAAE,CAAC;AACzC,CAAC;AAFD,oDAEC"}
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":"development.config.d.ts","sourceRoot":"","sources":["../../src/webpack/development.config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAkBxC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC;AAC5B,OAAO,EAAsC,SAAS,IAAI,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAInG,MAAM,WAAW,SAAS;IACtB,aAAa,EAAE,eAAe,CAAC,eAAe,CAAC,GAAG;QAC9C,IAAI,EAAE,aAAa,CAAC;KACvB,CAAC;IACF,OAAO,CAAC,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;CACxC;AAED,wBAAgB,YAAY,CACxB,EAAE,aAAa,EAAE,OAAY,EAAE,EAAE,SAAS,EAC1C,OAAO,GAAE,OAAY,GACtB,aAAa,CA8Lf"}
1
+ {"version":3,"file":"development.config.d.ts","sourceRoot":"","sources":["../../src/webpack/development.config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAkBxC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC;AAC5B,OAAO,EAAsC,SAAS,IAAI,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAInG,MAAM,WAAW,SAAS;IACtB,aAAa,EAAE,eAAe,CAAC,eAAe,CAAC,GAAG;QAC9C,IAAI,EAAE,aAAa,CAAC;KACvB,CAAC;IACF,OAAO,CAAC,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;CACxC;AAED,wBAAgB,YAAY,CACxB,EAAE,aAAa,EAAE,OAAY,EAAE,EAAE,SAAS,EAC1C,OAAO,GAAE,OAAY,GACtB,aAAa,CA+Lf"}
@@ -11,12 +11,11 @@ const utils_1 = require("../utils");
11
11
  const shared_config_1 = require("./shared.config");
12
12
  const feature_cohort_1 = require("./utils/feature-cohort");
13
13
  function createConfig({ configuration, plugins = {} }, options = {}) {
14
- var _a;
15
14
  const sharedConfig = (0, shared_config_1.createConfig)({ plugins }, options);
16
15
  const watchIgnore = (0, utils_1.getPackages)({ scope: (0, utils_1.getPackageName)() })
17
16
  .filter(({ type }) => type === utils_1.PackageType.TSC)
18
17
  .map(({ location }) => path_1.default.join(location, (0, utils_1.getFolders)(location).source));
19
- return (0, webpack_merge_1.default)(sharedConfig, Object.assign(Object.assign({ devtool: 'cheap-module-source-map', devServer: Object.assign(Object.assign({ port: (_a = (0, utils_1.getDevServerPort)()) !== null && _a !== void 0 ? _a : 8080, historyApiFallback: true, stats: sharedConfig.stats }, (watchIgnore.length
18
+ return (0, webpack_merge_1.default)(sharedConfig, Object.assign(Object.assign({ devtool: 'cheap-module-source-map', devServer: Object.assign(Object.assign(Object.assign({ port: 8080, historyApiFallback: true, stats: sharedConfig.stats }, (watchIgnore.length
20
19
  ? {
21
20
  watchOptions: {
22
21
  ignored: watchIgnore,
@@ -25,7 +24,7 @@ function createConfig({ configuration, plugins = {} }, options = {}) {
25
24
  : {})), { writeToDisk: true, headers: {
26
25
  'Access-Control-Allow-Origin': '*',
27
26
  'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept',
28
- } }), module: {
27
+ } }), (0, utils_1.getDevServerConfiguration)()), module: {
29
28
  rules: !(0, utils_1.isCustomStyleRules)()
30
29
  ? [
31
30
  {
@@ -1 +1 @@
1
- {"version":3,"file":"development.config.js","sourceRoot":"","sources":["../../src/webpack/development.config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"development.config.js","sourceRoot":"","sources":["../../src/webpack/development.config.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"production.config.d.ts","sourceRoot":"","sources":["../../src/webpack/production.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAA6B,EACzB,aAAa,IAAI,2BAA2B,EAC/C,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC;AAC5B,OAAO,EAAsC,SAAS,IAAI,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEnG,MAAM,WAAW,SAAS;IACtB,aAAa,EAAE,eAAe,CAAC,eAAe,CAAC,GAAG;QAC9C,IAAI,EAAE,YAAY,CAAC;KACtB,CAAC;IACF,OAAO,CAAC,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG;QACnC,oBAAoB,CAAC,EAAE,2BAA2B,CAAC;KACtD,CAAC;CACL;AAID,wBAAgB,YAAY,CACxB,EAAE,aAAa,EAAE,OAAY,EAAE,EAAE,SAAS,EAC1C,OAAO,GAAE,OAAY,GACtB,aAAa,CA4If"}
1
+ {"version":3,"file":"production.config.d.ts","sourceRoot":"","sources":["../../src/webpack/production.config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAA6B,EACzB,aAAa,IAAI,2BAA2B,EAC/C,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC;AAC5B,OAAO,EAAsC,SAAS,IAAI,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEnG,MAAM,WAAW,SAAS;IACtB,aAAa,EAAE,eAAe,CAAC,eAAe,CAAC,GAAG;QAC9C,IAAI,EAAE,YAAY,CAAC;KACtB,CAAC;IACF,OAAO,CAAC,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG;QACnC,oBAAoB,CAAC,EAAE,2BAA2B,CAAC;KACtD,CAAC;CACL;AAID,wBAAgB,YAAY,CACxB,EAAE,aAAa,EAAE,OAAY,EAAE,EAAE,SAAS,EAC1C,OAAO,GAAE,OAAY,GACtB,aAAa,CAgJf"}
@@ -4,13 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.createConfig = void 0;
7
+ const deepmerge_1 = __importDefault(require("deepmerge"));
7
8
  const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
8
9
  const webpack_merge_1 = __importDefault(require("webpack-merge"));
9
10
  const utils_1 = require("../utils");
10
11
  const shared_config_1 = require("./shared.config");
11
12
  const cdnPath = process.env.CLIENT_CDN_PATH;
12
13
  function createConfig({ configuration, plugins = {} }, options = {}) {
13
- const { MiniCssExtractPlugin: miniCssExtractPluginOptions } = plugins;
14
+ const { MiniCssExtractPlugin: miniCssExtractPluginOptions = {} } = plugins;
14
15
  return (0, webpack_merge_1.default)((0, shared_config_1.createConfig)({ plugins }, options), {
15
16
  devtool: (0, utils_1.isWebComponent)() ? false : 'source-map',
16
17
  module: {
@@ -123,9 +124,11 @@ function createConfig({ configuration, plugins = {} }, options = {}) {
123
124
  plugins: [
124
125
  ...(!(0, utils_1.isCustomStyleRules)()
125
126
  ? [
126
- new mini_css_extract_plugin_1.default(Object.assign({ filename: (0, utils_1.isWebComponent)()
127
+ new mini_css_extract_plugin_1.default((0, deepmerge_1.default)({
128
+ filename: (0, utils_1.isWebComponent)()
127
129
  ? '[name].css'
128
- : '[name].[contenthash:8].bundle.css' }, miniCssExtractPluginOptions)),
130
+ : '[name].[contenthash:8].bundle.css',
131
+ }, miniCssExtractPluginOptions)),
129
132
  ]
130
133
  : []),
131
134
  ],
@@ -1 +1 @@
1
- {"version":3,"file":"production.config.js","sourceRoot":"","sources":["../../src/webpack/production.config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"production.config.js","sourceRoot":"","sources":["../../src/webpack/production.config.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,11 @@
1
1
  import { Configuration } from 'webpack';
2
+ import { ForkTsCheckerWebpackPluginOptions } from 'fork-ts-checker-webpack-plugin/lib/ForkTsCheckerWebpackPluginOptions';
2
3
  import { Options as HtmlWebpackPluginOptions } from 'html-webpack-plugin';
3
4
  import { Options } from '.';
4
5
  export interface Overrides {
5
6
  configuration?: Configuration;
6
7
  plugins?: {
8
+ ForkTsCheckerWebpackPlugin?: ForkTsCheckerWebpackPluginOptions;
7
9
  HtmlWebpackPlugin?: HtmlWebpackPluginOptions;
8
10
  };
9
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"shared.config.d.ts","sourceRoot":"","sources":["../../src/webpack/shared.config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAgB,MAAM,SAAS,CAAC;AAUtD,OAA0B,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAa7F,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC;AAE5B,MAAM,WAAW,SAAS;IACtB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,EAAE;QACN,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;KAChD,CAAC;CACL;AAED,wBAAgB,YAAY,CACxB,EAAE,aAAkB,EAAE,OAAY,EAAE,GAAE,SAAc,EACpD,EAAE,KAAK,EAAE,GAAE,OAAY,GACxB,aAAa,CA4Nf"}
1
+ {"version":3,"file":"shared.config.d.ts","sourceRoot":"","sources":["../../src/webpack/shared.config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAgB,MAAM,SAAS,CAAC;AAStD,OAAO,EAAE,iCAAiC,EAAE,MAAM,sEAAsE,CAAC;AAEzH,OAA0B,EAAE,OAAO,IAAI,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAa7F,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC;AAE5B,MAAM,WAAW,SAAS;IACtB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,OAAO,CAAC,EAAE;QACN,0BAA0B,CAAC,EAAE,iCAAiC,CAAC;QAC/D,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;KAChD,CAAC;CACL;AAED,wBAAgB,YAAY,CACxB,EAAE,aAAkB,EAAE,OAAY,EAAE,GAAE,SAAc,EACpD,EAAE,KAAK,EAAE,GAAE,OAAY,GACxB,aAAa,CAsOf"}
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.createConfig = void 0;
7
7
  const path_1 = __importDefault(require("path"));
8
+ const deepmerge_1 = __importDefault(require("deepmerge"));
8
9
  const webpack_1 = require("webpack");
9
10
  /*
10
11
  * the following caused by major incompat in the types of this plugin
@@ -24,7 +25,7 @@ function createConfig({ configuration = {}, plugins = {} } = {}, { embed } = {})
24
25
  const dependencies = (0, utils_1.isExposeSharedDependencies)()
25
26
  ? Object.assign(Object.assign({}, (0, utils_1.readJson)('../../package.json').dependencies), (0, utils_1.readJson)('./package.json').dependencies) : undefined;
26
27
  const metadata = (0, utils_1.isWebComponent)() ? (0, utils_1.readJson)(`./${destination}/metadata.json`) : undefined;
27
- const { HtmlWebpackPlugin: htmlWebpackPluginOptions } = plugins;
28
+ const { ForkTsCheckerWebpackPlugin: forkTsCheckerWebpackPluginOptions = {}, HtmlWebpackPlugin: htmlWebpackPluginOptions = {}, } = plugins;
28
29
  return (0, webpack_merge_1.default)(Object.assign(Object.assign({ entry: (0, utils_1.isWebComponent)()
29
30
  ? { index: `./${source}/index` }
30
31
  : [
@@ -59,17 +60,15 @@ function createConfig({ configuration = {}, plugins = {} } = {}, { embed } = {})
59
60
  use: { loader: 'worker-loader' },
60
61
  },
61
62
  {
62
- test: /\.(png|svg|jpg|jpeg|gif)(\?v=\d+\.\d+\.\d+)?$/i,
63
+ test: /\.(png|svg|jpg|jpeg|gif)$/i,
63
64
  type: 'asset',
64
- parser: { dataUrlCondition: { maxSize: 65000 } },
65
65
  generator: {
66
66
  filename: 'images/[contenthash][ext][query]',
67
67
  },
68
68
  },
69
69
  {
70
- test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/i,
71
- type: 'asset',
72
- parser: { dataUrlCondition: { maxSize: 65000 } },
70
+ test: /\.(woff|woff2|eot|ttf|otf)$/i,
71
+ type: 'asset/resource',
73
72
  generator: {
74
73
  filename: 'fonts/[contenthash][ext][query]',
75
74
  },
@@ -87,28 +86,28 @@ function createConfig({ configuration = {}, plugins = {} } = {}, { embed } = {})
87
86
  }, plugins: [
88
87
  ...(!embed
89
88
  ? [
90
- new ForkTsCheckerWebpackPlugin({
89
+ new ForkTsCheckerWebpackPlugin((0, deepmerge_1.default)({
91
90
  typescript: { configOverwrite: { references: [] } },
92
- }),
91
+ }, forkTsCheckerWebpackPluginOptions)),
93
92
  new FilterWarningsPlugin({
94
93
  exclude: /export .* was not found in/,
95
94
  }),
96
- new html_webpack_plugin_1.default(Object.assign(Object.assign(Object.assign({ title: 'ServiceTitan', hash: true }, ((0, utils_1.isWebComponent)()
95
+ new html_webpack_plugin_1.default((0, deepmerge_1.default)(Object.assign(Object.assign({ title: 'ServiceTitan', hash: true }, ((0, utils_1.isWebComponent)()
97
96
  ? {
98
97
  inject: false,
99
98
  templateContent: ({ htmlWebpackPlugin }) => `
100
- <!DOCTYPE html>
101
- <html>
102
- <head>
103
- ${htmlWebpackPlugin.tags.headTags}
104
- </head>
105
- <body>
106
- <${metadata.name} />
107
-
108
- ${htmlWebpackPlugin.tags.bodyTags}
109
- </body>
110
- </html>
111
- `,
99
+ <!DOCTYPE html>
100
+ <html>
101
+ <head>
102
+ ${htmlWebpackPlugin.tags.headTags}
103
+ </head>
104
+ <body>
105
+ <${metadata.name} />
106
+
107
+ ${htmlWebpackPlugin.tags.bodyTags}
108
+ </body>
109
+ </html>
110
+ `,
112
111
  }
113
112
  : {})), { templateParameters: {
114
113
  splitByEntry: split_by_entry_1.splitByEntry,
@@ -1 +1 @@
1
- {"version":3,"file":"shared.config.js","sourceRoot":"","sources":["../../src/webpack/shared.config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared.config.js","sourceRoot":"","sources":["../../src/webpack/shared.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": "18.1.0",
3
+ "version": "19.3.0",
4
4
  "description": "",
5
5
  "homepage": "https://docs.st.dev/docs/frontend/startup",
6
6
  "repository": {
@@ -22,52 +22,53 @@
22
22
  "bin": "./bin/index.js",
23
23
  "devDependencies": {
24
24
  "@types/cpx": "~1.5.2",
25
- "@types/eslint": "~7.28.2",
25
+ "@types/eslint": "~8.2.1",
26
26
  "@types/less": "~3.0.3",
27
27
  "@types/mini-css-extract-plugin": "~2.4.0",
28
- "@types/sass": "~1.43.0",
28
+ "@types/sass": "~1.43.1",
29
29
  "@types/stylelint": "~13.13.3",
30
30
  "@types/webpack-dev-server": "~3.11.5",
31
- "@types/yargs": "~17.0.5"
31
+ "@types/yargs": "~17.0.7"
32
32
  },
33
33
  "dependencies": {
34
- "@jest/core": "~27.3.1",
35
- "@jest/types": "~27.2.5",
34
+ "@jest/core": "~27.4.3",
35
+ "@jest/types": "~27.4.2",
36
36
  "@lerna/exec": "~4.0.0",
37
- "@servicetitan/eslint-config": "^18.1.0",
38
- "@servicetitan/stylelint-config": "^18.1.0",
39
- "@types/jest": "~27.0.2",
37
+ "@servicetitan/eslint-config": "^19.3.0",
38
+ "@servicetitan/stylelint-config": "^19.3.0",
39
+ "@types/jest": "~27.0.3",
40
40
  "chalk": "~4.1.2",
41
41
  "chokidar": "~3.5.2",
42
42
  "cpx": "~1.5.0",
43
43
  "css-loader": "~6.5.1",
44
+ "deepmerge": "~4.2.2",
44
45
  "eslint": "~7.31.0",
45
46
  "execa": "~5.1.1",
46
- "fork-ts-checker-webpack-plugin": "~6.4.0",
47
+ "fork-ts-checker-webpack-plugin": "~6.5.0",
47
48
  "glob": "~7.2.0",
48
49
  "html-webpack-plugin": "~5.5.0",
49
50
  "identity-obj-proxy": "~3.0.0",
50
- "jest": "~27.3.1",
51
- "jest-circus": "~27.3.1",
51
+ "jest": "~27.4.3",
52
+ "jest-circus": "~27.4.5",
52
53
  "jest-fetch-mock": "~3.0.3",
53
54
  "lerna": "~4.0.0",
54
55
  "less": "~4.1.2",
55
56
  "less-loader": "~10.2.0",
56
57
  "less-plugin-npm-import": "~2.1.0",
57
- "memfs": "~3.3.0",
58
- "mini-css-extract-plugin": "~2.4.4",
58
+ "memfs": "~3.4.0",
59
+ "mini-css-extract-plugin": "~2.4.5",
59
60
  "portfinder": "~1.0.28",
60
61
  "prettier": "~2.4.1",
61
- "sass": "~1.43.4",
62
- "sass-loader": "~12.3.0",
62
+ "sass": "~1.44.0",
63
+ "sass-loader": "~12.4.0",
63
64
  "source-map-loader": "~3.0.0",
64
65
  "style-loader": "~3.3.1",
65
66
  "stylelint": "~13.13.1",
66
- "ts-jest": "~27.0.7",
67
+ "ts-jest": "~27.1.1",
67
68
  "ts-loader": "~9.2.6",
68
69
  "ts-node": "~10.4.0",
69
70
  "typed-css-modules": "~0.7.0",
70
- "typescript": "~4.4.4",
71
+ "typescript": "~4.5.3",
71
72
  "username": "~5.1.0",
72
73
  "webpack": "~5.61.0",
73
74
  "webpack-dev-server": "~3.11.2",
@@ -76,7 +77,7 @@
76
77
  "webpack-virtual-modules": "~0.4.3",
77
78
  "worker-loader": "~3.0.8",
78
79
  "xhr-mock": "~2.5.1",
79
- "yargs": "~17.2.1"
80
+ "yargs": "~17.3.0"
80
81
  },
81
82
  "publishConfig": {
82
83
  "access": "public"
@@ -84,5 +85,5 @@
84
85
  "cli": {
85
86
  "webpack": false
86
87
  },
87
- "gitHead": "d9f324df3e2b30a0b07f854e803ee56b63c65431"
88
+ "gitHead": "c2541cf4d4dc01064f7d327370a90f7b4d107a0e"
88
89
  }
@@ -1,15 +1,25 @@
1
+ import fs from 'fs';
1
2
  import path from 'path';
2
3
 
4
+ import { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server';
3
5
  import { ESLint } from 'eslint';
4
6
  import { LinterOptions } from 'stylelint';
5
7
  import { Config } from '@jest/types';
6
8
 
7
9
  import { readJson } from '.';
8
10
 
9
- export interface WebpackConfiguration {
11
+ const allowedWebpackDevServerOptions = ['headers', 'port', 'proxy'] as const;
12
+
13
+ type ElementType<T> = T extends readonly (infer ElementType)[] ? ElementType : never;
14
+
15
+ export interface WebpackConfiguration
16
+ extends Omit<
17
+ Pick<WebpackDevServerConfiguration, ElementType<typeof allowedWebpackDevServerOptions>>,
18
+ 'proxy'
19
+ > {
10
20
  'custom-style-rules'?: boolean;
11
21
  'expose-shared-dependencies'?: boolean;
12
- 'port'?: number;
22
+ 'proxy'?: WebpackDevServerConfiguration['proxy'] | string;
13
23
  }
14
24
 
15
25
  export interface ESLintConfiguration extends ESLint.Options {
@@ -62,14 +72,35 @@ export function isExposeSharedDependencies() {
62
72
  return configuration.webpack['expose-shared-dependencies'] === true;
63
73
  }
64
74
 
65
- export function getDevServerPort() {
75
+ function pick<T, K extends keyof T>(target: T, keys: readonly K[]) {
76
+ return Object.fromEntries(
77
+ keys
78
+ .filter(key => Object.prototype.hasOwnProperty.call(target, key))
79
+ .map(key => [key, target[key]])
80
+ ) as Pick<T, K>;
81
+ }
82
+
83
+ export function getDevServerConfiguration() {
66
84
  const configuration = getConfiguration();
67
85
 
68
86
  if (typeof configuration.webpack !== 'object') {
69
87
  return undefined;
70
88
  }
71
89
 
72
- return configuration.webpack.port;
90
+ const result = pick(configuration.webpack, allowedWebpackDevServerOptions);
91
+
92
+ if (typeof result.proxy === 'string') {
93
+ if (fs.existsSync(result.proxy)) {
94
+ result.proxy = require(path.resolve(result.proxy));
95
+ } else {
96
+ delete result.proxy;
97
+ }
98
+ }
99
+
100
+ return result as Pick<
101
+ WebpackDevServerConfiguration,
102
+ ElementType<typeof allowedWebpackDevServerOptions>
103
+ >;
73
104
  }
74
105
 
75
106
  export function isWebComponent() {
@@ -6,7 +6,7 @@ import MiniCssExtractPlugin from 'mini-css-extract-plugin';
6
6
  import merge from 'webpack-merge';
7
7
 
8
8
  import {
9
- getDevServerPort,
9
+ getDevServerConfiguration,
10
10
  getFolders,
11
11
  getPackageName,
12
12
  getPackages,
@@ -45,7 +45,7 @@ export function createConfig(
45
45
  {
46
46
  devtool: 'cheap-module-source-map',
47
47
  devServer: {
48
- port: getDevServerPort() ?? 8080,
48
+ port: 8080,
49
49
  historyApiFallback: true,
50
50
  stats: sharedConfig.stats,
51
51
  ...(watchIgnore.length
@@ -61,6 +61,7 @@ export function createConfig(
61
61
  'Access-Control-Allow-Headers':
62
62
  'Origin, X-Requested-With, Content-Type, Accept',
63
63
  },
64
+ ...getDevServerConfiguration(),
64
65
  },
65
66
  module: {
66
67
  rules: !isCustomStyleRules()
@@ -1,3 +1,5 @@
1
+ import deepmerge from 'deepmerge';
2
+
1
3
  import { Configuration } from 'webpack';
2
4
 
3
5
  import MiniCssExtractPlugin, {
@@ -25,7 +27,7 @@ export function createConfig(
25
27
  { configuration, plugins = {} }: Overrides,
26
28
  options: Options = {}
27
29
  ): Configuration {
28
- const { MiniCssExtractPlugin: miniCssExtractPluginOptions } = plugins;
30
+ const { MiniCssExtractPlugin: miniCssExtractPluginOptions = {} } = plugins;
29
31
 
30
32
  return merge(
31
33
  createSharedConfig({ plugins }, options),
@@ -141,12 +143,16 @@ export function createConfig(
141
143
  plugins: [
142
144
  ...(!isCustomStyleRules()
143
145
  ? [
144
- new MiniCssExtractPlugin({
145
- filename: isWebComponent()
146
- ? '[name].css'
147
- : '[name].[contenthash:8].bundle.css',
148
- ...miniCssExtractPluginOptions,
149
- }),
146
+ new MiniCssExtractPlugin(
147
+ deepmerge<MiniCssExtractPluginOptions>(
148
+ {
149
+ filename: isWebComponent()
150
+ ? '[name].css'
151
+ : '[name].[contenthash:8].bundle.css',
152
+ },
153
+ miniCssExtractPluginOptions
154
+ )
155
+ ),
150
156
  ]
151
157
  : []),
152
158
  ],
@@ -1,5 +1,7 @@
1
1
  import path from 'path';
2
2
 
3
+ import deepmerge from 'deepmerge';
4
+
3
5
  import { Configuration, DefinePlugin } from 'webpack';
4
6
 
5
7
  /*
@@ -9,6 +11,7 @@ import { Configuration, DefinePlugin } from 'webpack';
9
11
  */
10
12
  // import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
11
13
  const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); // TODO: rm
14
+ import { ForkTsCheckerWebpackPluginOptions } from 'fork-ts-checker-webpack-plugin/lib/ForkTsCheckerWebpackPluginOptions';
12
15
  const FilterWarningsPlugin = require('webpack-filter-warnings-plugin');
13
16
  import HtmlWebpackPlugin, { Options as HtmlWebpackPluginOptions } from 'html-webpack-plugin';
14
17
  import VirtualModulesPlugin from 'webpack-virtual-modules';
@@ -28,6 +31,7 @@ import { Options } from '.';
28
31
  export interface Overrides {
29
32
  configuration?: Configuration;
30
33
  plugins?: {
34
+ ForkTsCheckerWebpackPlugin?: ForkTsCheckerWebpackPluginOptions;
31
35
  HtmlWebpackPlugin?: HtmlWebpackPluginOptions;
32
36
  };
33
37
  }
@@ -45,7 +49,10 @@ export function createConfig(
45
49
  : undefined;
46
50
  const metadata = isWebComponent() ? readJson(`./${destination}/metadata.json`) : undefined;
47
51
 
48
- const { HtmlWebpackPlugin: htmlWebpackPluginOptions } = plugins;
52
+ const {
53
+ ForkTsCheckerWebpackPlugin: forkTsCheckerWebpackPluginOptions = {},
54
+ HtmlWebpackPlugin: htmlWebpackPluginOptions = {},
55
+ } = plugins;
49
56
 
50
57
  return merge(
51
58
  {
@@ -87,17 +94,15 @@ export function createConfig(
87
94
  use: { loader: 'worker-loader' },
88
95
  },
89
96
  {
90
- test: /\.(png|svg|jpg|jpeg|gif)(\?v=\d+\.\d+\.\d+)?$/i,
97
+ test: /\.(png|svg|jpg|jpeg|gif)$/i,
91
98
  type: 'asset',
92
- parser: { dataUrlCondition: { maxSize: 65000 } },
93
99
  generator: {
94
100
  filename: 'images/[contenthash][ext][query]',
95
101
  },
96
102
  },
97
103
  {
98
- test: /\.(woff|woff2|eot|ttf|otf)(\?v=\d+\.\d+\.\d+)?$/i,
99
- type: 'asset',
100
- parser: { dataUrlCondition: { maxSize: 65000 } },
104
+ test: /\.(woff|woff2|eot|ttf|otf)$/i,
105
+ type: 'asset/resource',
101
106
  generator: {
102
107
  filename: 'fonts/[contenthash][ext][query]',
103
108
  },
@@ -116,38 +121,47 @@ export function createConfig(
116
121
  plugins: [
117
122
  ...(!embed
118
123
  ? [
119
- new ForkTsCheckerWebpackPlugin({
120
- typescript: { configOverwrite: { references: [] } },
121
- }),
124
+ new ForkTsCheckerWebpackPlugin(
125
+ deepmerge<ForkTsCheckerWebpackPluginOptions>(
126
+ {
127
+ typescript: { configOverwrite: { references: [] } },
128
+ },
129
+ forkTsCheckerWebpackPluginOptions
130
+ )
131
+ ),
122
132
  new FilterWarningsPlugin({
123
133
  exclude: /export .* was not found in/,
124
134
  }),
125
- new HtmlWebpackPlugin({
126
- title: 'ServiceTitan',
127
- hash: true,
128
- ...(isWebComponent()
129
- ? {
130
- inject: false,
131
- templateContent: ({ htmlWebpackPlugin }) => `
132
- <!DOCTYPE html>
133
- <html>
134
- <head>
135
- ${htmlWebpackPlugin.tags.headTags}
136
- </head>
137
- <body>
138
- <${metadata.name} />
139
-
140
- ${htmlWebpackPlugin.tags.bodyTags}
141
- </body>
142
- </html>
143
- `,
144
- }
145
- : {}),
146
- templateParameters: {
147
- splitByEntry,
148
- },
149
- ...htmlWebpackPluginOptions,
150
- }),
135
+ new HtmlWebpackPlugin(
136
+ deepmerge<HtmlWebpackPluginOptions>(
137
+ {
138
+ title: 'ServiceTitan',
139
+ hash: true,
140
+ ...(isWebComponent()
141
+ ? {
142
+ inject: false,
143
+ templateContent: ({ htmlWebpackPlugin }) => `
144
+ <!DOCTYPE html>
145
+ <html>
146
+ <head>
147
+ ${htmlWebpackPlugin.tags.headTags}
148
+ </head>
149
+ <body>
150
+ <${metadata.name} />
151
+
152
+ ${htmlWebpackPlugin.tags.bodyTags}
153
+ </body>
154
+ </html>
155
+ `,
156
+ }
157
+ : {}),
158
+ templateParameters: {
159
+ splitByEntry,
160
+ },
161
+ },
162
+ htmlWebpackPluginOptions
163
+ )
164
+ ),
151
165
  ]
152
166
  : []),
153
167
  ...(isWebComponent() || isExposeSharedDependencies()