@angular-devkit/build-angular 17.0.0-next.6 → 17.0.0-next.8
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/package.json +16 -16
- package/src/builders/application/build-action.d.ts +3 -0
- package/src/builders/application/build-action.js +68 -53
- package/src/builders/application/execute-build.js +41 -23
- package/src/builders/application/i18n.d.ts +4 -1
- package/src/builders/application/i18n.js +34 -4
- package/src/builders/application/index.d.ts +6 -4
- package/src/builders/application/index.js +11 -13
- package/src/builders/application/options.d.ts +7 -0
- package/src/builders/application/options.js +5 -2
- package/src/builders/application/schema.d.ts +4 -0
- package/src/builders/application/schema.js +1 -1
- package/src/builders/application/schema.json +5 -0
- package/src/builders/browser-esbuild/builder-status-warnings.js +2 -7
- package/src/builders/browser-esbuild/index.d.ts +2 -2
- package/src/builders/browser-esbuild/index.js +45 -3
- package/src/builders/dev-server/builder.js +2 -2
- package/src/builders/dev-server/load-proxy-config.js +3 -2
- package/src/builders/dev-server/options.d.ts +1 -1
- package/src/builders/dev-server/options.js +4 -3
- package/src/builders/dev-server/schema.d.ts +8 -1
- package/src/builders/dev-server/schema.js +1 -1
- package/src/builders/dev-server/schema.json +7 -1
- package/src/builders/dev-server/vite-server.d.ts +2 -1
- package/src/builders/dev-server/vite-server.js +30 -5
- package/src/builders/dev-server/webpack-server.js +2 -2
- package/src/builders/extract-i18n/application-extraction.js +3 -3
- package/src/builders/extract-i18n/builder.js +4 -3
- package/src/builders/extract-i18n/options.d.ts +1 -1
- package/src/builders/extract-i18n/options.js +4 -3
- package/src/builders/extract-i18n/schema.d.ts +8 -1
- package/src/builders/extract-i18n/schema.js +1 -1
- package/src/builders/extract-i18n/schema.json +7 -1
- package/src/builders/extract-i18n/webpack-extraction.js +2 -2
- package/src/builders/jest/index.js +2 -2
- package/src/builders/protractor/index.js +2 -2
- package/src/tools/esbuild/angular/compilation/aot-compilation.js +16 -7
- package/src/tools/esbuild/angular/compilation-state.d.ts +15 -0
- package/src/tools/esbuild/angular/compilation-state.js +43 -0
- package/src/tools/esbuild/angular/compiler-plugin.d.ts +2 -12
- package/src/tools/esbuild/angular/compiler-plugin.js +34 -52
- package/src/tools/esbuild/angular/component-stylesheets.d.ts +47 -0
- package/src/tools/esbuild/angular/component-stylesheets.js +147 -0
- package/src/tools/esbuild/angular/jit-plugin-callbacks.d.ts +2 -5
- package/src/tools/esbuild/angular/jit-plugin-callbacks.js +11 -6
- package/src/tools/esbuild/angular/source-file-cache.d.ts +19 -0
- package/src/tools/esbuild/angular/source-file-cache.js +67 -0
- package/src/tools/esbuild/angular/uri.d.ts +1 -1
- package/src/tools/esbuild/application-code-bundle.d.ts +1 -1
- package/src/tools/esbuild/application-code-bundle.js +68 -10
- package/src/tools/esbuild/budget-stats.d.ts +19 -0
- package/src/tools/esbuild/budget-stats.js +55 -0
- package/src/tools/esbuild/bundler-context.d.ts +12 -1
- package/src/tools/esbuild/bundler-context.js +29 -3
- package/src/tools/esbuild/bundler-execution-result.d.ts +9 -6
- package/src/tools/esbuild/bundler-execution-result.js +6 -3
- package/src/tools/esbuild/compiler-plugin-options.d.ts +2 -1
- package/src/tools/esbuild/compiler-plugin-options.js +2 -1
- package/src/tools/esbuild/global-styles.js +2 -1
- package/src/tools/esbuild/i18n-inliner.d.ts +3 -3
- package/src/tools/esbuild/i18n-inliner.js +13 -4
- package/src/tools/esbuild/index-html-generator.d.ts +2 -3
- package/src/tools/esbuild/index-html-generator.js +5 -2
- package/src/tools/esbuild/stylesheets/bundle-options.d.ts +2 -24
- package/src/tools/esbuild/stylesheets/bundle-options.js +3 -105
- package/src/tools/esbuild/utils.d.ts +12 -6
- package/src/tools/esbuild/utils.js +85 -34
- package/src/utils/build-options.d.ts +1 -1
- package/src/utils/build-options.js +1 -1
- package/src/utils/bundle-calculator.d.ts +16 -3
- package/src/utils/bundle-calculator.js +21 -10
- package/src/utils/routes-extractor/extractor.js +3 -4
- package/src/utils/server-rendering/{esm-in-memory-file-loader.d.ts → esm-in-memory-loader/loader-hooks.d.ts} +1 -0
- package/src/utils/server-rendering/esm-in-memory-loader/loader-hooks.js +82 -0
- package/src/utils/server-rendering/esm-in-memory-loader/node-18-utils.d.ts +10 -0
- package/src/utils/server-rendering/esm-in-memory-loader/node-18-utils.js +39 -0
- package/src/utils/server-rendering/esm-in-memory-loader/register-hooks.d.ts +8 -0
- package/src/utils/server-rendering/esm-in-memory-loader/register-hooks.js +16 -0
- package/src/utils/server-rendering/main-bundle-exports.d.ts +1 -0
- package/src/utils/server-rendering/main-bundle-exports.js +1 -1
- package/src/utils/server-rendering/prerender.d.ts +2 -2
- package/src/utils/server-rendering/prerender.js +10 -18
- package/src/utils/server-rendering/render-page.js +6 -2
- package/src/utils/server-rendering/render-worker.d.ts +1 -1
- package/src/utils/server-rendering/render-worker.js +1 -1
- package/src/utils/server-rendering/routes-extractor-worker.d.ts +1 -1
- package/src/utils/server-rendering/routes-extractor-worker.js +1 -1
- package/src/utils/service-worker.d.ts +2 -2
- package/src/utils/service-worker.js +5 -2
- package/src/utils/server-rendering/esm-in-memory-file-loader.js +0 -76
|
@@ -6,9 +6,15 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.io/license
|
|
8
8
|
*/
|
|
9
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
|
+
};
|
|
9
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
13
|
exports.buildEsbuildBrowser = void 0;
|
|
11
14
|
const architect_1 = require("@angular-devkit/architect");
|
|
15
|
+
const node_fs_1 = require("node:fs");
|
|
16
|
+
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
17
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
12
18
|
const application_1 = require("../application");
|
|
13
19
|
const builder_status_warnings_1 = require("./builder-status-warnings");
|
|
14
20
|
/**
|
|
@@ -18,11 +24,20 @@ const builder_status_warnings_1 = require("./builder-status-warnings");
|
|
|
18
24
|
* @param context The Architect builder context object
|
|
19
25
|
* @returns An async iterable with the builder result output
|
|
20
26
|
*/
|
|
21
|
-
function buildEsbuildBrowser(userOptions, context, infrastructureSettings) {
|
|
27
|
+
async function* buildEsbuildBrowser(userOptions, context, infrastructureSettings) {
|
|
22
28
|
// Inform user of status of builder and options
|
|
23
29
|
(0, builder_status_warnings_1.logBuilderStatusWarnings)(userOptions, context);
|
|
24
30
|
const normalizedOptions = normalizeOptions(userOptions);
|
|
25
|
-
|
|
31
|
+
const fullOutputPath = node_path_1.default.join(context.workspaceRoot, normalizedOptions.outputPath);
|
|
32
|
+
for await (const result of (0, application_1.buildApplicationInternal)(normalizedOptions, context, {
|
|
33
|
+
write: false,
|
|
34
|
+
})) {
|
|
35
|
+
if (infrastructureSettings?.write !== false && result.outputFiles) {
|
|
36
|
+
// Write output files
|
|
37
|
+
await writeResultFiles(result.outputFiles, result.assetFiles, fullOutputPath);
|
|
38
|
+
}
|
|
39
|
+
yield result;
|
|
40
|
+
}
|
|
26
41
|
}
|
|
27
42
|
exports.buildEsbuildBrowser = buildEsbuildBrowser;
|
|
28
43
|
function normalizeOptions(options) {
|
|
@@ -34,5 +49,32 @@ function normalizeOptions(options) {
|
|
|
34
49
|
...otherOptions,
|
|
35
50
|
};
|
|
36
51
|
}
|
|
52
|
+
// We write the file directly from this builder to maintain webpack output compatibility
|
|
53
|
+
// and not output browser files into '/browser'.
|
|
54
|
+
async function writeResultFiles(outputFiles, assetFiles, outputPath) {
|
|
55
|
+
const directoryExists = new Set();
|
|
56
|
+
await Promise.all(outputFiles.map(async (file) => {
|
|
57
|
+
// Ensure output subdirectories exist
|
|
58
|
+
const basePath = node_path_1.default.dirname(file.path);
|
|
59
|
+
if (basePath && !directoryExists.has(basePath)) {
|
|
60
|
+
await promises_1.default.mkdir(node_path_1.default.join(outputPath, basePath), { recursive: true });
|
|
61
|
+
directoryExists.add(basePath);
|
|
62
|
+
}
|
|
63
|
+
// Write file contents
|
|
64
|
+
await promises_1.default.writeFile(node_path_1.default.join(outputPath, file.path), file.contents);
|
|
65
|
+
}));
|
|
66
|
+
if (assetFiles?.length) {
|
|
67
|
+
await Promise.all(assetFiles.map(async ({ source, destination }) => {
|
|
68
|
+
// Ensure output subdirectories exist
|
|
69
|
+
const basePath = node_path_1.default.dirname(destination);
|
|
70
|
+
if (basePath && !directoryExists.has(basePath)) {
|
|
71
|
+
await promises_1.default.mkdir(node_path_1.default.join(outputPath, basePath), { recursive: true });
|
|
72
|
+
directoryExists.add(basePath);
|
|
73
|
+
}
|
|
74
|
+
// Copy file contents
|
|
75
|
+
await promises_1.default.copyFile(source, node_path_1.default.join(outputPath), node_fs_1.constants.COPYFILE_FICLONE);
|
|
76
|
+
}));
|
|
77
|
+
}
|
|
78
|
+
}
|
|
37
79
|
exports.default = (0, architect_1.createBuilder)(buildEsbuildBrowser);
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';\nimport { constants as fsConstants } from 'node:fs';\nimport fs from 'node:fs/promises';\nimport path from 'node:path';\nimport { BuildOutputFile } from '../../tools/esbuild/bundler-context';\nimport { buildApplicationInternal } from '../application';\nimport { Schema as ApplicationBuilderOptions } from '../application/schema';\nimport { logBuilderStatusWarnings } from './builder-status-warnings';\nimport { Schema as BrowserBuilderOptions } from './schema';\n\n/**\n * Main execution function for the esbuild-based application builder.\n * The options are compatible with the Webpack-based builder.\n * @param userOptions The browser builder options to use when setting up the application build\n * @param context The Architect builder context object\n * @returns An async iterable with the builder result output\n */\nexport async function* buildEsbuildBrowser(\n  userOptions: BrowserBuilderOptions,\n  context: BuilderContext,\n  infrastructureSettings?: {\n    write?: boolean;\n  },\n): AsyncIterable<\n  BuilderOutput & {\n    outputFiles?: BuildOutputFile[];\n    assetFiles?: { source: string; destination: string }[];\n  }\n> {\n  // Inform user of status of builder and options\n  logBuilderStatusWarnings(userOptions, context);\n  const normalizedOptions = normalizeOptions(userOptions);\n  const fullOutputPath = path.join(context.workspaceRoot, normalizedOptions.outputPath);\n\n  for await (const result of buildApplicationInternal(normalizedOptions, context, {\n    write: false,\n  })) {\n    if (infrastructureSettings?.write !== false && result.outputFiles) {\n      // Write output files\n      await writeResultFiles(result.outputFiles, result.assetFiles, fullOutputPath);\n    }\n\n    yield result;\n  }\n}\n\nfunction normalizeOptions(options: BrowserBuilderOptions): ApplicationBuilderOptions {\n  const { main: browser, ngswConfigPath, serviceWorker, polyfills, ...otherOptions } = options;\n\n  return {\n    browser,\n    serviceWorker: serviceWorker ? ngswConfigPath : false,\n    polyfills: typeof polyfills === 'string' ? [polyfills] : polyfills,\n    ...otherOptions,\n  };\n}\n\n// We write the file directly from this builder to maintain webpack output compatibility\n// and not output browser files into '/browser'.\nasync function writeResultFiles(\n  outputFiles: BuildOutputFile[],\n  assetFiles: { source: string; destination: string }[] | undefined,\n  outputPath: string,\n) {\n  const directoryExists = new Set<string>();\n  await Promise.all(\n    outputFiles.map(async (file) => {\n      // Ensure output subdirectories exist\n      const basePath = path.dirname(file.path);\n      if (basePath && !directoryExists.has(basePath)) {\n        await fs.mkdir(path.join(outputPath, basePath), { recursive: true });\n        directoryExists.add(basePath);\n      }\n      // Write file contents\n      await fs.writeFile(path.join(outputPath, file.path), file.contents);\n    }),\n  );\n\n  if (assetFiles?.length) {\n    await Promise.all(\n      assetFiles.map(async ({ source, destination }) => {\n        // Ensure output subdirectories exist\n        const basePath = path.dirname(destination);\n        if (basePath && !directoryExists.has(basePath)) {\n          await fs.mkdir(path.join(outputPath, basePath), { recursive: true });\n          directoryExists.add(basePath);\n        }\n        // Copy file contents\n        await fs.copyFile(source, path.join(outputPath), fsConstants.COPYFILE_FICLONE);\n      }),\n    );\n  }\n}\n\nexport default createBuilder(buildEsbuildBrowser);\n"]}
|
|
@@ -67,7 +67,7 @@ async function initialize(initialOptions, projectName, context) {
|
|
|
67
67
|
// Purge old build disk cache.
|
|
68
68
|
await (0, purge_cache_1.purgeStaleBuildCache)(context);
|
|
69
69
|
const normalizedOptions = await (0, options_1.normalizeOptions)(context, projectName, initialOptions);
|
|
70
|
-
const builderName = await context.getBuilderNameForTarget(normalizedOptions.
|
|
70
|
+
const builderName = await context.getBuilderNameForTarget(normalizedOptions.buildTarget);
|
|
71
71
|
if (!normalizedOptions.disableHostCheck &&
|
|
72
72
|
!/^127\.\d+\.\d+\.\d+/g.test(normalizedOptions.host) &&
|
|
73
73
|
normalizedOptions.host !== 'localhost') {
|
|
@@ -92,4 +92,4 @@ case.
|
|
|
92
92
|
normalizedOptions.port = await (0, check_port_1.checkPort)(normalizedOptions.port, normalizedOptions.host);
|
|
93
93
|
return { builderName, normalizedOptions };
|
|
94
94
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular_devkit/build_angular/src/builders/dev-server/builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,+BAA2D;AAE3D,uDAAmD;AAEnD,yDAA+D;AAC/D,uCAA6C;AAI7C;;;;;;;;GAQG;AACH,SAAgB,OAAO,CACrB,OAAgC,EAChC,OAAuB,EACvB,aAII,EAAE;IAEN,qDAAqD;IACrD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;QAEpF,OAAO,YAAK,CAAC;KACd;IAED,OAAO,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAChE,IAAA,gBAAS,EAAC,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,EAAE,EAAE;QAC/C,6DAA6D;QAC7D,IACE,WAAW,KAAK,2CAA2C;YAC3D,WAAW,KAAK,+CAA+C;YAC/D,iBAAiB,CAAC,YAAY,EAC9B;YACA,OAAO,IAAA,YAAK,EAAC,GAAG,EAAE,mDAAQ,eAAe,GAAC,CAAC,CAAC,IAAI,CAC9C,IAAA,gBAAS,EAAC,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,iBAAiB,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CACzF,CAAC;SACH;QAED,4CAA4C;QAC5C,OAAO,IAAA,YAAK,EAAC,GAAG,EAAE,mDAAQ,kBAAkB,GAAC,CAAC,CAAC,IAAI,CACjD,IAAA,gBAAS,EAAC,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CACpC,mBAAmB,CAAC,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CACzE,CACF,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAtCD,0BAsCC;AAED,KAAK,UAAU,UAAU,CACvB,cAAuC,EACvC,WAAmB,EACnB,OAAuB;IAEvB,8BAA8B;IAC9B,MAAM,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,iBAAiB,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAO,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;IACvF,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAEzF,IACE,CAAC,iBAAiB,CAAC,gBAAgB;QACnC,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;QACpD,iBAAiB,CAAC,IAAI,KAAK,WAAW,EACtC;QACA,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;;;;;;;;KAQnB,CAAC,CAAC;KACJ;IAED,IAAI,iBAAiB,CAAC,gBAAgB,EAAE;QACtC,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,0EAA0E;YACxE,iHAAiH,CACpH,CAAC;KACH;IAED,IAAI,iBAAiB,CAAC,YAAY,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,gCAAgC,CAAC,EAAE;QAC/F,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,sFAAsF;YACpF,uDAAuD,CAC1D,CAAC;KACH;IAED,iBAAiB,CAAC,IAAI,GAAG,MAAM,IAAA,sBAAS,EAAC,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAEzF,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;AAC5C,CAAC","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport type { BuilderContext } from '@angular-devkit/architect';\nimport { EMPTY, Observable, defer, switchMap } from 'rxjs';\nimport type { ExecutionTransformer } from '../../transforms';\nimport { checkPort } from '../../utils/check-port';\nimport type { IndexHtmlTransform } from '../../utils/index-file/index-html-generator';\nimport { purgeStaleBuildCache } from '../../utils/purge-cache';\nimport { normalizeOptions } from './options';\nimport type { Schema as DevServerBuilderOptions } from './schema';\nimport type { DevServerBuilderOutput } from './webpack-server';\n\n/**\n * A Builder that executes a development server based on the provided browser target option.\n * @param options Dev Server options.\n * @param context The build context.\n * @param transforms A map of transforms that can be used to hook into some logic (such as\n * transforming webpack configuration before passing it to webpack).\n *\n * @experimental Direct usage of this function is considered experimental.\n */\nexport function execute(\n  options: DevServerBuilderOptions,\n  context: BuilderContext,\n  transforms: {\n    webpackConfiguration?: ExecutionTransformer<import('webpack').Configuration>;\n    logging?: import('@angular-devkit/build-webpack').WebpackLoggingCallback;\n    indexHtml?: IndexHtmlTransform;\n  } = {},\n): Observable<DevServerBuilderOutput> {\n  // Determine project name from builder context target\n  const projectName = context.target?.project;\n  if (!projectName) {\n    context.logger.error(`The 'dev-server' builder requires a target to be specified.`);\n\n    return EMPTY;\n  }\n\n  return defer(() => initialize(options, projectName, context)).pipe(\n    switchMap(({ builderName, normalizedOptions }) => {\n      // Use vite-based development server for esbuild-based builds\n      if (\n        builderName === '@angular-devkit/build-angular:application' ||\n        builderName === '@angular-devkit/build-angular:browser-esbuild' ||\n        normalizedOptions.forceEsbuild\n      ) {\n        return defer(() => import('./vite-server')).pipe(\n          switchMap(({ serveWithVite }) => serveWithVite(normalizedOptions, builderName, context)),\n        );\n      }\n\n      // Use Webpack for all other browser targets\n      return defer(() => import('./webpack-server')).pipe(\n        switchMap(({ serveWebpackBrowser }) =>\n          serveWebpackBrowser(normalizedOptions, builderName, context, transforms),\n        ),\n      );\n    }),\n  );\n}\n\nasync function initialize(\n  initialOptions: DevServerBuilderOptions,\n  projectName: string,\n  context: BuilderContext,\n) {\n  // Purge old build disk cache.\n  await purgeStaleBuildCache(context);\n\n  const normalizedOptions = await normalizeOptions(context, projectName, initialOptions);\n  const builderName = await context.getBuilderNameForTarget(normalizedOptions.buildTarget);\n\n  if (\n    !normalizedOptions.disableHostCheck &&\n    !/^127\\.\\d+\\.\\d+\\.\\d+/g.test(normalizedOptions.host) &&\n    normalizedOptions.host !== 'localhost'\n  ) {\n    context.logger.warn(`\nWarning: This is a simple server for use in testing or debugging Angular applications\nlocally. It hasn't been reviewed for security issues.\n\nBinding this server to an open connection can result in compromising your application or\ncomputer. Using a different host than the one passed to the \"--host\" flag might result in\nwebsocket connection issues. You might need to use \"--disable-host-check\" if that's the\ncase.\n    `);\n  }\n\n  if (normalizedOptions.disableHostCheck) {\n    context.logger.warn(\n      'Warning: Running a server with --disable-host-check is a security risk. ' +\n        'See https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a for more information.',\n    );\n  }\n\n  if (normalizedOptions.forceEsbuild && !builderName.startsWith('@angular-devkit/build-angular:')) {\n    context.logger.warn(\n      'Warning: Forcing the use of the esbuild-based build system with third-party builders' +\n        ' may cause unexpected behavior and/or build failures.',\n    );\n  }\n\n  normalizedOptions.port = await checkPort(normalizedOptions.port, normalizedOptions.host);\n\n  return { builderName, normalizedOptions };\n}\n"]}
|
|
@@ -143,7 +143,8 @@ function normalizeProxyConfiguration(proxy) {
|
|
|
143
143
|
}
|
|
144
144
|
// Replace `pathRewrite` field with a `rewrite` function
|
|
145
145
|
for (const proxyEntry of Object.values(normalizedProxy)) {
|
|
146
|
-
if ('
|
|
146
|
+
if (typeof proxyEntry === 'object' &&
|
|
147
|
+
'pathRewrite' in proxyEntry &&
|
|
147
148
|
proxyEntry.pathRewrite &&
|
|
148
149
|
typeof proxyEntry.pathRewrite === 'object') {
|
|
149
150
|
// Preprocess path rewrite entries
|
|
@@ -189,4 +190,4 @@ function getJsonErrorLineColumn(offset, content) {
|
|
|
189
190
|
}
|
|
190
191
|
return { line, column: offset - position + 1 };
|
|
191
192
|
}
|
|
192
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"load-proxy-config.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular_devkit/build_angular/src/builders/dev-server/load-proxy-config.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { isDynamicPattern } from 'fast-glob';\nimport { existsSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport { extname, resolve } from 'node:path';\nimport { pathToFileURL } from 'node:url';\nimport { parse as parseGlob } from 'picomatch';\nimport { assertIsError } from '../../utils/error';\nimport { loadEsmModule } from '../../utils/load-esm';\n\nexport async function loadProxyConfiguration(\n  root: string,\n  proxyConfig: string | undefined,\n  normalize = false,\n) {\n  if (!proxyConfig) {\n    return undefined;\n  }\n\n  const proxyPath = resolve(root, proxyConfig);\n\n  if (!existsSync(proxyPath)) {\n    throw new Error(`Proxy configuration file ${proxyPath} does not exist.`);\n  }\n\n  let proxyConfiguration;\n  switch (extname(proxyPath)) {\n    case '.json': {\n      const content = await readFile(proxyPath, 'utf-8');\n\n      const { parse, printParseErrorCode } = await import('jsonc-parser');\n      const parseErrors: import('jsonc-parser').ParseError[] = [];\n      proxyConfiguration = parse(content, parseErrors, { allowTrailingComma: true });\n\n      if (parseErrors.length > 0) {\n        let errorMessage = `Proxy configuration file ${proxyPath} contains parse errors:`;\n        for (const parseError of parseErrors) {\n          const { line, column } = getJsonErrorLineColumn(parseError.offset, content);\n          errorMessage += `\\n[${line}, ${column}] ${printParseErrorCode(parseError.error)}`;\n        }\n        throw new Error(errorMessage);\n      }\n\n      break;\n    }\n    case '.mjs':\n      // Load the ESM configuration file using the TypeScript dynamic import workaround.\n      // Once TypeScript provides support for keeping the dynamic import this workaround can be\n      // changed to a direct dynamic import.\n      proxyConfiguration = (await loadEsmModule<{ default: unknown }>(pathToFileURL(proxyPath)))\n        .default;\n      break;\n    case '.cjs':\n      proxyConfiguration = require(proxyPath);\n      break;\n    default:\n      // The file could be either CommonJS or ESM.\n      // CommonJS is tried first then ESM if loading fails.\n      try {\n        proxyConfiguration = require(proxyPath);\n        break;\n      } catch (e) {\n        assertIsError(e);\n        if (e.code === 'ERR_REQUIRE_ESM') {\n          // Load the ESM configuration file using the TypeScript dynamic import workaround.\n          // Once TypeScript provides support for keeping the dynamic import this workaround can be\n          // changed to a direct dynamic import.\n          proxyConfiguration = (await loadEsmModule<{ default: unknown }>(pathToFileURL(proxyPath)))\n            .default;\n          break;\n        }\n\n        throw e;\n      }\n  }\n\n  if (normalize) {\n    proxyConfiguration = normalizeProxyConfiguration(proxyConfiguration);\n  }\n\n  return proxyConfiguration;\n}\n\n/**\n * Converts glob patterns to regular expressions to support Vite's proxy option.\n * Also converts the Webpack supported array form to an object form supported by both.\n *\n * @param proxy A proxy configuration object.\n */\nfunction normalizeProxyConfiguration(\n  proxy: Record<string, object> | object[],\n): Record<string, object> {\n  let normalizedProxy: Record<string, object> | undefined;\n\n  if (Array.isArray(proxy)) {\n    // Construct an object-form proxy configuration from the array\n    normalizedProxy = {};\n    for (const proxyEntry of proxy) {\n      if (!('context' in proxyEntry)) {\n        continue;\n      }\n      if (!Array.isArray(proxyEntry.context)) {\n        continue;\n      }\n\n      // Array-form entries contain a context string array with the path(s)\n      // to use for the configuration entry.\n      const context = proxyEntry.context;\n      delete proxyEntry.context;\n      for (const contextEntry of context) {\n        if (typeof contextEntry !== 'string') {\n          continue;\n        }\n\n        normalizedProxy[contextEntry] = proxyEntry;\n      }\n    }\n  } else {\n    normalizedProxy = proxy;\n  }\n\n  // TODO: Consider upstreaming glob support\n  for (const key of Object.keys(normalizedProxy)) {\n    if (isDynamicPattern(key)) {\n      const { output } = parseGlob(key);\n      normalizedProxy[`^${output}$`] = normalizedProxy[key];\n      delete normalizedProxy[key];\n    }\n  }\n\n  // Replace `pathRewrite` field with a `rewrite` function\n  for (const proxyEntry of Object.values(normalizedProxy)) {\n    if (\n      'pathRewrite' in proxyEntry &&\n      proxyEntry.pathRewrite &&\n      typeof proxyEntry.pathRewrite === 'object'\n    ) {\n      // Preprocess path rewrite entries\n      const pathRewriteEntries: [RegExp, string][] = [];\n      for (const [pattern, value] of Object.entries(\n        proxyEntry.pathRewrite as Record<string, string>,\n      )) {\n        pathRewriteEntries.push([new RegExp(pattern), value]);\n      }\n\n      (proxyEntry as Record<string, unknown>).rewrite = pathRewriter.bind(\n        undefined,\n        pathRewriteEntries,\n      );\n\n      delete proxyEntry.pathRewrite;\n    }\n  }\n\n  return normalizedProxy;\n}\n\nfunction pathRewriter(pathRewriteEntries: [RegExp, string][], path: string): string {\n  for (const [pattern, value] of pathRewriteEntries) {\n    const updated = path.replace(pattern, value);\n    if (path !== updated) {\n      return updated;\n    }\n  }\n\n  return path;\n}\n\n/**\n * Calculates the line and column for an error offset in the content of a JSON file.\n * @param location The offset error location from the beginning of the content.\n * @param content The full content of the file containing the error.\n * @returns An object containing the line and column\n */\nfunction getJsonErrorLineColumn(offset: number, content: string) {\n  if (offset === 0) {\n    return { line: 1, column: 1 };\n  }\n\n  let line = 0;\n  let position = 0;\n  // eslint-disable-next-line no-constant-condition\n  while (true) {\n    ++line;\n\n    const nextNewline = content.indexOf('\\n', position);\n    if (nextNewline === -1 || nextNewline > offset) {\n      break;\n    }\n\n    position = nextNewline + 1;\n  }\n\n  return { line, column: offset - position + 1 };\n}\n"]}
|
|
193
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"load-proxy-config.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular_devkit/build_angular/src/builders/dev-server/load-proxy-config.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { isDynamicPattern } from 'fast-glob';\nimport { existsSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport { extname, resolve } from 'node:path';\nimport { pathToFileURL } from 'node:url';\nimport { parse as parseGlob } from 'picomatch';\nimport { assertIsError } from '../../utils/error';\nimport { loadEsmModule } from '../../utils/load-esm';\n\nexport async function loadProxyConfiguration(\n  root: string,\n  proxyConfig: string | undefined,\n  normalize = false,\n) {\n  if (!proxyConfig) {\n    return undefined;\n  }\n\n  const proxyPath = resolve(root, proxyConfig);\n\n  if (!existsSync(proxyPath)) {\n    throw new Error(`Proxy configuration file ${proxyPath} does not exist.`);\n  }\n\n  let proxyConfiguration;\n  switch (extname(proxyPath)) {\n    case '.json': {\n      const content = await readFile(proxyPath, 'utf-8');\n\n      const { parse, printParseErrorCode } = await import('jsonc-parser');\n      const parseErrors: import('jsonc-parser').ParseError[] = [];\n      proxyConfiguration = parse(content, parseErrors, { allowTrailingComma: true });\n\n      if (parseErrors.length > 0) {\n        let errorMessage = `Proxy configuration file ${proxyPath} contains parse errors:`;\n        for (const parseError of parseErrors) {\n          const { line, column } = getJsonErrorLineColumn(parseError.offset, content);\n          errorMessage += `\\n[${line}, ${column}] ${printParseErrorCode(parseError.error)}`;\n        }\n        throw new Error(errorMessage);\n      }\n\n      break;\n    }\n    case '.mjs':\n      // Load the ESM configuration file using the TypeScript dynamic import workaround.\n      // Once TypeScript provides support for keeping the dynamic import this workaround can be\n      // changed to a direct dynamic import.\n      proxyConfiguration = (await loadEsmModule<{ default: unknown }>(pathToFileURL(proxyPath)))\n        .default;\n      break;\n    case '.cjs':\n      proxyConfiguration = require(proxyPath);\n      break;\n    default:\n      // The file could be either CommonJS or ESM.\n      // CommonJS is tried first then ESM if loading fails.\n      try {\n        proxyConfiguration = require(proxyPath);\n        break;\n      } catch (e) {\n        assertIsError(e);\n        if (e.code === 'ERR_REQUIRE_ESM') {\n          // Load the ESM configuration file using the TypeScript dynamic import workaround.\n          // Once TypeScript provides support for keeping the dynamic import this workaround can be\n          // changed to a direct dynamic import.\n          proxyConfiguration = (await loadEsmModule<{ default: unknown }>(pathToFileURL(proxyPath)))\n            .default;\n          break;\n        }\n\n        throw e;\n      }\n  }\n\n  if (normalize) {\n    proxyConfiguration = normalizeProxyConfiguration(proxyConfiguration);\n  }\n\n  return proxyConfiguration;\n}\n\n/**\n * Converts glob patterns to regular expressions to support Vite's proxy option.\n * Also converts the Webpack supported array form to an object form supported by both.\n *\n * @param proxy A proxy configuration object.\n */\nfunction normalizeProxyConfiguration(\n  proxy: Record<string, object> | object[],\n): Record<string, object> {\n  let normalizedProxy: Record<string, object> | undefined;\n\n  if (Array.isArray(proxy)) {\n    // Construct an object-form proxy configuration from the array\n    normalizedProxy = {};\n    for (const proxyEntry of proxy) {\n      if (!('context' in proxyEntry)) {\n        continue;\n      }\n      if (!Array.isArray(proxyEntry.context)) {\n        continue;\n      }\n\n      // Array-form entries contain a context string array with the path(s)\n      // to use for the configuration entry.\n      const context = proxyEntry.context;\n      delete proxyEntry.context;\n      for (const contextEntry of context) {\n        if (typeof contextEntry !== 'string') {\n          continue;\n        }\n\n        normalizedProxy[contextEntry] = proxyEntry;\n      }\n    }\n  } else {\n    normalizedProxy = proxy;\n  }\n\n  // TODO: Consider upstreaming glob support\n  for (const key of Object.keys(normalizedProxy)) {\n    if (isDynamicPattern(key)) {\n      const { output } = parseGlob(key);\n      normalizedProxy[`^${output}$`] = normalizedProxy[key];\n      delete normalizedProxy[key];\n    }\n  }\n\n  // Replace `pathRewrite` field with a `rewrite` function\n  for (const proxyEntry of Object.values(normalizedProxy)) {\n    if (\n      typeof proxyEntry === 'object' &&\n      'pathRewrite' in proxyEntry &&\n      proxyEntry.pathRewrite &&\n      typeof proxyEntry.pathRewrite === 'object'\n    ) {\n      // Preprocess path rewrite entries\n      const pathRewriteEntries: [RegExp, string][] = [];\n      for (const [pattern, value] of Object.entries(\n        proxyEntry.pathRewrite as Record<string, string>,\n      )) {\n        pathRewriteEntries.push([new RegExp(pattern), value]);\n      }\n\n      (proxyEntry as Record<string, unknown>).rewrite = pathRewriter.bind(\n        undefined,\n        pathRewriteEntries,\n      );\n\n      delete proxyEntry.pathRewrite;\n    }\n  }\n\n  return normalizedProxy;\n}\n\nfunction pathRewriter(pathRewriteEntries: [RegExp, string][], path: string): string {\n  for (const [pattern, value] of pathRewriteEntries) {\n    const updated = path.replace(pattern, value);\n    if (path !== updated) {\n      return updated;\n    }\n  }\n\n  return path;\n}\n\n/**\n * Calculates the line and column for an error offset in the content of a JSON file.\n * @param location The offset error location from the beginning of the content.\n * @param content The full content of the file containing the error.\n * @returns An object containing the line and column\n */\nfunction getJsonErrorLineColumn(offset: number, content: string) {\n  if (offset === 0) {\n    return { line: 1, column: 1 };\n  }\n\n  let line = 0;\n  let position = 0;\n  // eslint-disable-next-line no-constant-condition\n  while (true) {\n    ++line;\n\n    const nextNewline = content.indexOf('\\n', position);\n    if (nextNewline === -1 || nextNewline > offset) {\n      break;\n    }\n\n    position = nextNewline + 1;\n  }\n\n  return { line, column: offset - position + 1 };\n}\n"]}
|
|
@@ -19,7 +19,7 @@ export type NormalizedDevServerOptions = Awaited<ReturnType<typeof normalizeOpti
|
|
|
19
19
|
* @returns An object containing normalized options required to perform the build.
|
|
20
20
|
*/
|
|
21
21
|
export declare function normalizeOptions(context: BuilderContext, projectName: string, options: DevServerOptions): Promise<{
|
|
22
|
-
|
|
22
|
+
buildTarget: import("@angular-devkit/architect").Target;
|
|
23
23
|
host: string;
|
|
24
24
|
port: number;
|
|
25
25
|
poll: number | undefined;
|
|
@@ -29,12 +29,13 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
29
29
|
const projectMetadata = await context.getProjectMetadata(projectName);
|
|
30
30
|
const projectRoot = node_path_1.default.join(workspaceRoot, projectMetadata.root ?? '');
|
|
31
31
|
const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
|
|
32
|
-
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
33
|
+
const buildTarget = (0, architect_1.targetFromTargetString)(options.buildTarget ?? options.browserTarget);
|
|
33
34
|
// Initial options to keep
|
|
34
35
|
const { host, port, poll, open, verbose, watch, allowedHosts, disableHostCheck, liveReload, hmr, headers, proxyConfig, servePath, publicHost, ssl, sslCert, sslKey, forceEsbuild, } = options;
|
|
35
36
|
// Return all the normalized options
|
|
36
37
|
return {
|
|
37
|
-
|
|
38
|
+
buildTarget,
|
|
38
39
|
host: host ?? 'localhost',
|
|
39
40
|
port: port ?? 4200,
|
|
40
41
|
poll,
|
|
@@ -59,4 +60,4 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
59
60
|
};
|
|
60
61
|
}
|
|
61
62
|
exports.normalizeOptions = normalizeOptions;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3B0aW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FuZ3VsYXJfZGV2a2l0L2J1aWxkX2FuZ3VsYXIvc3JjL2J1aWxkZXJzL2Rldi1zZXJ2ZXIvb3B0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7Ozs7QUFFSCx5REFBbUY7QUFDbkYsMERBQTZCO0FBQzdCLGlFQUFvRTtBQUtwRTs7Ozs7Ozs7O0dBU0c7QUFDSSxLQUFLLFVBQVUsZ0JBQWdCLENBQ3BDLE9BQXVCLEVBQ3ZCLFdBQW1CLEVBQ25CLE9BQXlCO0lBRXpCLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxhQUFhLENBQUM7SUFDNUMsTUFBTSxlQUFlLEdBQUcsTUFBTSxPQUFPLENBQUMsa0JBQWtCLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDdEUsTUFBTSxXQUFXLEdBQUcsbUJBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxFQUFHLGVBQWUsQ0FBQyxJQUEyQixJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBRWpHLE1BQU0sWUFBWSxHQUFHLElBQUEsdUNBQXFCLEVBQUMsZUFBZSxFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBRTNFLG9FQUFvRTtJQUNwRSxNQUFNLFdBQVcsR0FBRyxJQUFBLGtDQUFzQixFQUFDLE9BQU8sQ0FBQyxXQUFXLElBQUksT0FBTyxDQUFDLGFBQWMsQ0FBQyxDQUFDO0lBRTFGLDBCQUEwQjtJQUMxQixNQUFNLEVBQ0osSUFBSSxFQUNKLElBQUksRUFDSixJQUFJLEVBQ0osSUFBSSxFQUNKLE9BQU8sRUFDUCxLQUFLLEVBQ0wsWUFBWSxFQUNaLGdCQUFnQixFQUNoQixVQUFVLEVBQ1YsR0FBRyxFQUNILE9BQU8sRUFDUCxXQUFXLEVBQ1gsU0FBUyxFQUNULFVBQVUsRUFDVixHQUFHLEVBQ0gsT0FBTyxFQUNQLE1BQU0sRUFDTixZQUFZLEdBQ2IsR0FBRyxPQUFPLENBQUM7SUFFWixvQ0FBb0M7SUFDcEMsT0FBTztRQUNMLFdBQVc7UUFDWCxJQUFJLEVBQUUsSUFBSSxJQUFJLFdBQVc7UUFDekIsSUFBSSxFQUFFLElBQUksSUFBSSxJQUFJO1FBQ2xCLElBQUk7UUFDSixJQUFJO1FBQ0osT0FBTztRQUNQLEtBQUs7UUFDTCxVQUFVO1FBQ1YsR0FBRztRQUNILE9BQU87UUFDUCxhQUFhO1FBQ2IsV0FBVztRQUNYLFlBQVk7UUFDWixZQUFZO1FBQ1osZ0JBQWdCO1FBQ2hCLFdBQVc7UUFDWCxTQUFTO1FBQ1QsVUFBVTtRQUNWLEdBQUc7UUFDSCxPQUFPO1FBQ1AsTUFBTTtRQUNOLFlBQVk7S0FDYixDQUFDO0FBQ0osQ0FBQztBQTdERCw0Q0E2REMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHsgQnVpbGRlckNvbnRleHQsIHRhcmdldEZyb21UYXJnZXRTdHJpbmcgfSBmcm9tICdAYW5ndWxhci1kZXZraXQvYXJjaGl0ZWN0JztcbmltcG9ydCBwYXRoIGZyb20gJ25vZGU6cGF0aCc7XG5pbXBvcnQgeyBub3JtYWxpemVDYWNoZU9wdGlvbnMgfSBmcm9tICcuLi8uLi91dGlscy9ub3JtYWxpemUtY2FjaGUnO1xuaW1wb3J0IHsgU2NoZW1hIGFzIERldlNlcnZlck9wdGlvbnMgfSBmcm9tICcuL3NjaGVtYSc7XG5cbmV4cG9ydCB0eXBlIE5vcm1hbGl6ZWREZXZTZXJ2ZXJPcHRpb25zID0gQXdhaXRlZDxSZXR1cm5UeXBlPHR5cGVvZiBub3JtYWxpemVPcHRpb25zPj47XG5cbi8qKlxuICogTm9ybWFsaXplIHRoZSB1c2VyIHByb3ZpZGVkIG9wdGlvbnMgYnkgY3JlYXRpbmcgZnVsbCBwYXRocyBmb3IgYWxsIHBhdGggYmFzZWQgb3B0aW9uc1xuICogYW5kIGNvbnZlcnRpbmcgbXVsdGktZm9ybSBvcHRpb25zIGludG8gYSBzaW5nbGUgZm9ybSB0aGF0IGNhbiBiZSBkaXJlY3RseSB1c2VkXG4gKiBieSB0aGUgYnVpbGQgcHJvY2Vzcy5cbiAqXG4gKiBAcGFyYW0gY29udGV4dCBUaGUgY29udGV4dCBmb3IgY3VycmVudCBidWlsZGVyIGV4ZWN1dGlvbi5cbiAqIEBwYXJhbSBwcm9qZWN0TmFtZSBUaGUgbmFtZSBvZiB0aGUgcHJvamVjdCBmb3IgdGhlIGN1cnJlbnQgZXhlY3V0aW9uLlxuICogQHBhcmFtIG9wdGlvbnMgQW4gb2JqZWN0IGNvbnRhaW5pbmcgdGhlIG9wdGlvbnMgdG8gdXNlIGZvciB0aGUgYnVpbGQuXG4gKiBAcmV0dXJucyBBbiBvYmplY3QgY29udGFpbmluZyBub3JtYWxpemVkIG9wdGlvbnMgcmVxdWlyZWQgdG8gcGVyZm9ybSB0aGUgYnVpbGQuXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBub3JtYWxpemVPcHRpb25zKFxuICBjb250ZXh0OiBCdWlsZGVyQ29udGV4dCxcbiAgcHJvamVjdE5hbWU6IHN0cmluZyxcbiAgb3B0aW9uczogRGV2U2VydmVyT3B0aW9ucyxcbikge1xuICBjb25zdCB3b3Jrc3BhY2VSb290ID0gY29udGV4dC53b3Jrc3BhY2VSb290O1xuICBjb25zdCBwcm9qZWN0TWV0YWRhdGEgPSBhd2FpdCBjb250ZXh0LmdldFByb2plY3RNZXRhZGF0YShwcm9qZWN0TmFtZSk7XG4gIGNvbnN0IHByb2plY3RSb290ID0gcGF0aC5qb2luKHdvcmtzcGFjZVJvb3QsIChwcm9qZWN0TWV0YWRhdGEucm9vdCBhcyBzdHJpbmcgfCB1bmRlZmluZWQpID8/ICcnKTtcblxuICBjb25zdCBjYWNoZU9wdGlvbnMgPSBub3JtYWxpemVDYWNoZU9wdGlvbnMocHJvamVjdE1ldGFkYXRhLCB3b3Jrc3BhY2VSb290KTtcblxuICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQHR5cGVzY3JpcHQtZXNsaW50L25vLW5vbi1udWxsLWFzc2VydGlvblxuICBjb25zdCBidWlsZFRhcmdldCA9IHRhcmdldEZyb21UYXJnZXRTdHJpbmcob3B0aW9ucy5idWlsZFRhcmdldCA/PyBvcHRpb25zLmJyb3dzZXJUYXJnZXQhKTtcblxuICAvLyBJbml0aWFsIG9wdGlvbnMgdG8ga2VlcFxuICBjb25zdCB7XG4gICAgaG9zdCxcbiAgICBwb3J0LFxuICAgIHBvbGwsXG4gICAgb3BlbixcbiAgICB2ZXJib3NlLFxuICAgIHdhdGNoLFxuICAgIGFsbG93ZWRIb3N0cyxcbiAgICBkaXNhYmxlSG9zdENoZWNrLFxuICAgIGxpdmVSZWxvYWQsXG4gICAgaG1yLFxuICAgIGhlYWRlcnMsXG4gICAgcHJveHlDb25maWcsXG4gICAgc2VydmVQYXRoLFxuICAgIHB1YmxpY0hvc3QsXG4gICAgc3NsLFxuICAgIHNzbENlcnQsXG4gICAgc3NsS2V5LFxuICAgIGZvcmNlRXNidWlsZCxcbiAgfSA9IG9wdGlvbnM7XG5cbiAgLy8gUmV0dXJuIGFsbCB0aGUgbm9ybWFsaXplZCBvcHRpb25zXG4gIHJldHVybiB7XG4gICAgYnVpbGRUYXJnZXQsXG4gICAgaG9zdDogaG9zdCA/PyAnbG9jYWxob3N0JyxcbiAgICBwb3J0OiBwb3J0ID8/IDQyMDAsXG4gICAgcG9sbCxcbiAgICBvcGVuLFxuICAgIHZlcmJvc2UsXG4gICAgd2F0Y2gsXG4gICAgbGl2ZVJlbG9hZCxcbiAgICBobXIsXG4gICAgaGVhZGVycyxcbiAgICB3b3Jrc3BhY2VSb290LFxuICAgIHByb2plY3RSb290LFxuICAgIGNhY2hlT3B0aW9ucyxcbiAgICBhbGxvd2VkSG9zdHMsXG4gICAgZGlzYWJsZUhvc3RDaGVjayxcbiAgICBwcm94eUNvbmZpZyxcbiAgICBzZXJ2ZVBhdGgsXG4gICAgcHVibGljSG9zdCxcbiAgICBzc2wsXG4gICAgc3NsQ2VydCxcbiAgICBzc2xLZXksXG4gICAgZm9yY2VFc2J1aWxkLFxuICB9O1xufVxuIl19
|
|
@@ -10,8 +10,15 @@ export interface Schema {
|
|
|
10
10
|
* A browser builder target to serve in the format of `project:target[:configuration]`. You
|
|
11
11
|
* can also pass in more than one configuration name as a comma-separated list. Example:
|
|
12
12
|
* `project:target:production,staging`.
|
|
13
|
+
* @deprecated Use 'buildTarget' instead.
|
|
13
14
|
*/
|
|
14
|
-
browserTarget
|
|
15
|
+
browserTarget?: string;
|
|
16
|
+
/**
|
|
17
|
+
* A build builder target to serve in the format of `project:target[:configuration]`. You
|
|
18
|
+
* can also pass in more than one configuration name as a comma-separated list. Example:
|
|
19
|
+
* `project:target:production,staging`.
|
|
20
|
+
*/
|
|
21
|
+
buildTarget?: string;
|
|
15
22
|
/**
|
|
16
23
|
* Don't verify connected clients are part of allowed hosts.
|
|
17
24
|
*/
|
|
@@ -2,4 +2,4 @@
|
|
|
2
2
|
// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
|
|
3
3
|
// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYW5ndWxhcl9kZXZraXQvYnVpbGRfYW5ndWxhci9zcmMvYnVpbGRlcnMvZGV2LXNlcnZlci9zY2hlbWEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLG1GQUFtRjtBQUNuRixvRkFBb0YiLCJzb3VyY2VzQ29udGVudCI6WyJcbi8vIFRISVMgRklMRSBJUyBBVVRPTUFUSUNBTExZIEdFTkVSQVRFRC4gVE8gVVBEQVRFIFRISVMgRklMRSBZT1UgTkVFRCBUTyBDSEFOR0UgVEhFXG4vLyBDT1JSRVNQT05ESU5HIEpTT04gU0NIRU1BIEZJTEUsIFRIRU4gUlVOIGRldmtpdC1hZG1pbiBidWlsZCAob3IgYmF6ZWwgYnVpbGQgLi4uKS5cblxuLyoqXG4gKiBEZXYgU2VydmVyIHRhcmdldCBvcHRpb25zIGZvciBCdWlsZCBGYWNhZGUuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgU2NoZW1hIHtcbiAgICAvKipcbiAgICAgKiBMaXN0IG9mIGhvc3RzIHRoYXQgYXJlIGFsbG93ZWQgdG8gYWNjZXNzIHRoZSBkZXYgc2VydmVyLlxuICAgICAqL1xuICAgIGFsbG93ZWRIb3N0cz86IHN0cmluZ1tdO1xuICAgIC8qKlxuICAgICAqIEEgYnJvd3NlciBidWlsZGVyIHRhcmdldCB0byBzZXJ2ZSBpbiB0aGUgZm9ybWF0IG9mIGBwcm9qZWN0OnRhcmdldFs6Y29uZmlndXJhdGlvbl1gLiBZb3VcbiAgICAgKiBjYW4gYWxzbyBwYXNzIGluIG1vcmUgdGhhbiBvbmUgY29uZmlndXJhdGlvbiBuYW1lIGFzIGEgY29tbWEtc2VwYXJhdGVkIGxpc3QuIEV4YW1wbGU6XG4gICAgICogYHByb2plY3Q6dGFyZ2V0OnByb2R1Y3Rpb24sc3RhZ2luZ2AuXG4gICAgICogQGRlcHJlY2F0ZWQgVXNlICdidWlsZFRhcmdldCcgaW5zdGVhZC5cbiAgICAgKi9cbiAgICBicm93c2VyVGFyZ2V0Pzogc3RyaW5nO1xuICAgIC8qKlxuICAgICAqIEEgYnVpbGQgYnVpbGRlciB0YXJnZXQgdG8gc2VydmUgaW4gdGhlIGZvcm1hdCBvZiBgcHJvamVjdDp0YXJnZXRbOmNvbmZpZ3VyYXRpb25dYC4gWW91XG4gICAgICogY2FuIGFsc28gcGFzcyBpbiBtb3JlIHRoYW4gb25lIGNvbmZpZ3VyYXRpb24gbmFtZSBhcyBhIGNvbW1hLXNlcGFyYXRlZCBsaXN0LiBFeGFtcGxlOlxuICAgICAqIGBwcm9qZWN0OnRhcmdldDpwcm9kdWN0aW9uLHN0YWdpbmdgLlxuICAgICAqL1xuICAgIGJ1aWxkVGFyZ2V0Pzogc3RyaW5nO1xuICAgIC8qKlxuICAgICAqIERvbid0IHZlcmlmeSBjb25uZWN0ZWQgY2xpZW50cyBhcmUgcGFydCBvZiBhbGxvd2VkIGhvc3RzLlxuICAgICAqL1xuICAgIGRpc2FibGVIb3N0Q2hlY2s/OiBib29sZWFuO1xuICAgIC8qKlxuICAgICAqIEZvcmNlIHRoZSBkZXZlbG9wbWVudCBzZXJ2ZXIgdG8gdXNlIHRoZSAnYnJvd3Nlci1lc2J1aWxkJyBidWlsZGVyIHdoZW4gYnVpbGRpbmcuIFRoaXMgaXNcbiAgICAgKiBhIGRldmVsb3BlciBwcmV2aWV3IG9wdGlvbiBmb3IgdGhlIGVzYnVpbGQtYmFzZWQgYnVpbGQgc3lzdGVtLlxuICAgICAqL1xuICAgIGZvcmNlRXNidWlsZD86IGJvb2xlYW47XG4gICAgLyoqXG4gICAgICogQ3VzdG9tIEhUVFAgaGVhZGVycyB0byBiZSBhZGRlZCB0byBhbGwgcmVzcG9uc2VzLlxuICAgICAqL1xuICAgIGhlYWRlcnM/OiB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9O1xuICAgIC8qKlxuICAgICAqIEVuYWJsZSBob3QgbW9kdWxlIHJlcGxhY2VtZW50LlxuICAgICAqL1xuICAgIGhtcj86IGJvb2xlYW47XG4gICAgLyoqXG4gICAgICogSG9zdCB0byBsaXN0ZW4gb24uXG4gICAgICovXG4gICAgaG9zdD86IHN0cmluZztcbiAgICAvKipcbiAgICAgKiBXaGV0aGVyIHRvIHJlbG9hZCB0aGUgcGFnZSBvbiBjaGFuZ2UsIHVzaW5nIGxpdmUtcmVsb2FkLlxuICAgICAqL1xuICAgIGxpdmVSZWxvYWQ/OiBib29sZWFuO1xuICAgIC8qKlxuICAgICAqIE9wZW5zIHRoZSB1cmwgaW4gZGVmYXVsdCBicm93c2VyLlxuICAgICAqL1xuICAgIG9wZW4/OiBib29sZWFuO1xuICAgIC8qKlxuICAgICAqIEVuYWJsZSBhbmQgZGVmaW5lIHRoZSBmaWxlIHdhdGNoaW5nIHBvbGwgdGltZSBwZXJpb2QgaW4gbWlsbGlzZWNvbmRzLlxuICAgICAqL1xuICAgIHBvbGw/OiBudW1iZXI7XG4gICAgLyoqXG4gICAgICogUG9ydCB0byBsaXN0ZW4gb24uXG4gICAgICovXG4gICAgcG9ydD86IG51bWJlcjtcbiAgICAvKipcbiAgICAgKiBQcm94eSBjb25maWd1cmF0aW9uIGZpbGUuIEZvciBtb3JlIGluZm9ybWF0aW9uLCBzZWVcbiAgICAgKiBodHRwczovL2FuZ3VsYXIuaW8vZ3VpZGUvYnVpbGQjcHJveHlpbmctdG8tYS1iYWNrZW5kLXNlcnZlci5cbiAgICAgKi9cbiAgICBwcm94eUNvbmZpZz86IHN0cmluZztcbiAgICAvKipcbiAgICAgKiBUaGUgVVJMIHRoYXQgdGhlIGJyb3dzZXIgY2xpZW50IChvciBsaXZlLXJlbG9hZCBjbGllbnQsIGlmIGVuYWJsZWQpIHNob3VsZCB1c2UgdG8gY29ubmVjdFxuICAgICAqIHRvIHRoZSBkZXZlbG9wbWVudCBzZXJ2ZXIuIFVzZSBmb3IgYSBjb21wbGV4IGRldiBzZXJ2ZXIgc2V0dXAsIHN1Y2ggYXMgb25lIHdpdGggcmV2ZXJzZVxuICAgICAqIHByb3hpZXMuXG4gICAgICovXG4gICAgcHVibGljSG9zdD86IHN0cmluZztcbiAgICAvKipcbiAgICAgKiBUaGUgcGF0aG5hbWUgd2hlcmUgdGhlIGFwcGxpY2F0aW9uIHdpbGwgYmUgc2VydmVkLlxuICAgICAqL1xuICAgIHNlcnZlUGF0aD86IHN0cmluZztcbiAgICAvKipcbiAgICAgKiBTZXJ2ZSB1c2luZyBIVFRQUy5cbiAgICAgKi9cbiAgICBzc2w/OiBib29sZWFuO1xuICAgIC8qKlxuICAgICAqIFNTTCBjZXJ0aWZpY2F0ZSB0byB1c2UgZm9yIHNlcnZpbmcgSFRUUFMuXG4gICAgICovXG4gICAgc3NsQ2VydD86IHN0cmluZztcbiAgICAvKipcbiAgICAgKiBTU0wga2V5IHRvIHVzZSBmb3Igc2VydmluZyBIVFRQUy5cbiAgICAgKi9cbiAgICBzc2xLZXk/OiBzdHJpbmc7XG4gICAgLyoqXG4gICAgICogQWRkcyBtb3JlIGRldGFpbHMgdG8gb3V0cHV0IGxvZ2dpbmcuXG4gICAgICovXG4gICAgdmVyYm9zZT86IGJvb2xlYW47XG4gICAgLyoqXG4gICAgICogUmVidWlsZCBvbiBjaGFuZ2UuXG4gICAgICovXG4gICAgd2F0Y2g/OiBib29sZWFuO1xufVxuIl19
|
|
@@ -7,6 +7,12 @@
|
|
|
7
7
|
"browserTarget": {
|
|
8
8
|
"type": "string",
|
|
9
9
|
"description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
|
|
10
|
+
"pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
|
|
11
|
+
"x-deprecated": "Use 'buildTarget' instead."
|
|
12
|
+
},
|
|
13
|
+
"buildTarget": {
|
|
14
|
+
"type": "string",
|
|
15
|
+
"description": "A build builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
|
|
10
16
|
"pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
|
|
11
17
|
},
|
|
12
18
|
"port": {
|
|
@@ -103,5 +109,5 @@
|
|
|
103
109
|
}
|
|
104
110
|
},
|
|
105
111
|
"additionalProperties": false,
|
|
106
|
-
"required": ["browserTarget"]
|
|
112
|
+
"anyOf": [{ "required": ["buildTarget"] }, { "required": ["browserTarget"] }]
|
|
107
113
|
}
|
|
@@ -15,7 +15,8 @@ interface OutputFileRecord {
|
|
|
15
15
|
size: number;
|
|
16
16
|
hash?: Buffer;
|
|
17
17
|
updated: boolean;
|
|
18
|
+
servable: boolean;
|
|
18
19
|
}
|
|
19
20
|
export declare function serveWithVite(serverOptions: NormalizedDevServerOptions, builderName: string, context: BuilderContext): AsyncIterableIterator<DevServerBuilderOutput>;
|
|
20
|
-
export declare function setupServer(serverOptions: NormalizedDevServerOptions, outputFiles: Map<string, OutputFileRecord>, assets: Map<string, string>, preserveSymlinks: boolean | undefined, prebundleExclude: string[] | undefined, ssr: boolean, prebundleTransformer: JavaScriptTransformer): Promise<InlineConfig>;
|
|
21
|
+
export declare function setupServer(serverOptions: NormalizedDevServerOptions, outputFiles: Map<string, OutputFileRecord>, assets: Map<string, string>, preserveSymlinks: boolean | undefined, prebundleExclude: string[] | undefined, ssr: boolean, prebundleTransformer: JavaScriptTransformer, target: string[]): Promise<InlineConfig>;
|
|
21
22
|
export {};
|