Skip to content

feat(@angular-devkit/build-angular): add externalDependencies to the esbuild browser builder #23390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 21, 2022
Merged

feat(@angular-devkit/build-angular): add externalDependencies to the esbuild browser builder #23390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecdb8ec
build: add browser-esbuild test infra
alan-agius4 Jun 17, 2022
77ae540
feat(@angular-devkit/build-angular): add `externalDependencies` to th…
alan-agius4 Jun 17, 2022
80d76ac
fix(@angular/cli): add esbuild browser builder to workspace schema
alan-agius4 Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/angular/cli/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ ts_library(
CLI_SCHEMA_DATA = [
"//packages/angular_devkit/build_angular:src/builders/app-shell/schema.json",
"//packages/angular_devkit/build_angular:src/builders/browser/schema.json",
"//packages/angular_devkit/build_angular:src/builders/browser-esbuild/schema.json",
"//packages/angular_devkit/build_angular:src/builders/dev-server/schema.json",
"//packages/angular_devkit/build_angular:src/builders/extract-i18n/schema.json",
"//packages/angular_devkit/build_angular:src/builders/karma/schema.json",
Expand Down
23 changes: 23 additions & 0 deletions packages/angular/cli/lib/config/workspace-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@
"enum": [
"@angular-devkit/build-angular:app-shell",
"@angular-devkit/build-angular:browser",
"@angular-devkit/build-angular:browser-esbuild",
"@angular-devkit/build-angular:dev-server",
"@angular-devkit/build-angular:extract-i18n",
"@angular-devkit/build-angular:karma",
Expand Down Expand Up @@ -412,6 +413,28 @@
}
}
},
{
"type": "object",
"additionalProperties": false,
"properties": {
"builder": {
"const": "@angular-devkit/build-angular:browser-esbuild"
},
"defaultConfiguration": {
"type": "string",
"description": "A default named configuration to use when a target configuration is not provided."
},
"options": {
"$ref": "../../../../angular_devkit/build_angular/src/builders/browser-esbuild/schema.json"
},
"configurations": {
"type": "object",
"additionalProperties": {
"$ref": "../../../../angular_devkit/build_angular/src/builders/browser-esbuild/schema.json"
}
}
}
},
{
"type": "object",
"additionalProperties": false,
Expand Down
7 changes: 7 additions & 0 deletions packages/angular_devkit/build_angular/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ ts_json_schema(
src = "src/builders/browser/schema.json",
)

ts_json_schema(
name = "browser_esbuild_schema",
src = "src/builders/browser-esbuild/schema.json",
)

ts_json_schema(
name = "dev_server_schema",
src = "src/builders/dev-server/schema.json",
Expand Down Expand Up @@ -70,6 +75,7 @@ ts_library(
) + [
"//packages/angular_devkit/build_angular:src/builders/app-shell/schema.ts",
"//packages/angular_devkit/build_angular:src/builders/browser/schema.ts",
"//packages/angular_devkit/build_angular:src/builders/browser-esbuild/schema.ts",
"//packages/angular_devkit/build_angular:src/builders/dev-server/schema.ts",
"//packages/angular_devkit/build_angular:src/builders/extract-i18n/schema.ts",
"//packages/angular_devkit/build_angular:src/builders/karma/schema.ts",
Expand Down Expand Up @@ -340,6 +346,7 @@ LARGE_SPECS = {
"@npm//popper.js",
],
},
"browser-esbuild": {},
}

[
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/builders.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"browser-esbuild": {
"implementation": "./src/builders/browser-esbuild",
"schema": "./src/builders/browser/schema.json",
"schema": "./src/builders/browser-esbuild/schema.json",
"description": "Build a browser application."
},
"dev-server": {
Expand Down
7 changes: 4 additions & 3 deletions packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import { generateEntryPoints } from '../../utils/package-chunk-sort';
import { augmentAppWithServiceWorker } from '../../utils/service-worker';
import { getIndexInputFile, getIndexOutputFile } from '../../utils/webpack-browser-config';
import { resolveGlobalStyles } from '../../webpack/configs';
import { Schema as BrowserBuilderOptions, SourceMapClass } from '../browser/schema';
import { createCompilerPlugin } from './compiler-plugin';
import { DEFAULT_OUTDIR, bundle, logMessages } from './esbuild';
import { logExperimentalWarnings } from './experimental-warnings';
import { normalizeOptions } from './options';
import { Schema as BrowserBuilderOptions, SourceMapClass } from './schema';
import { bundleStylesheetText } from './stylesheets';

/**
Expand All @@ -35,7 +35,7 @@ import { bundleStylesheetText } from './stylesheets';
* @returns A promise with the builder result output
*/
// eslint-disable-next-line max-lines-per-function
export async function execute(
export async function buildEsbuildBrowser(
options: BrowserBuilderOptions,
context: BuilderContext,
): Promise<BuilderOutput> {
Expand Down Expand Up @@ -312,6 +312,7 @@ async function bundleCode(
sourcemap: sourcemapOptions.scripts && (sourcemapOptions.hidden ? 'external' : true),
splitting: true,
tsconfig,
external: options.externalDependencies,
write: false,
platform: 'browser',
preserveSymlinks: options.preserveSymlinks,
Expand Down Expand Up @@ -339,4 +340,4 @@ async function bundleCode(
});
}

export default createBuilder(execute);
export default createBuilder(buildEsbuildBrowser);
Loading