Skip to content

refactor(@angular-devkit/build-angular): update polyfills option in application builder to be only an array. #25790

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
alan-agius4 merged 1 commit into from
Sep 6, 2023
Merged

refactor(@angular-devkit/build-angular): update polyfills option in application builder to be only an array. #25790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 7 additions & 16 deletions packages/angular_devkit/build_angular/src/builders/application/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,13 @@
"description": "The full path for the server entry point to the application, relative to the current workspace."
},
"polyfills": {
"description": "Polyfills to be included in the build.",
"oneOf": [
{
"type": "array",
"description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
"items": {
"type": "string",
"uniqueItems": true
},
"default": []
},
{
"type": "string",
"description": "The full path for the polyfills file, relative to the current workspace or a module specifier. Example: 'zone.js'."
}
]
"description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
"type": "array",
"items": {
"type": "string",
"uniqueItems": true
},
"default": []
},
"tsConfig": {
"type": "string",
Expand Down
10 changes: 5 additions & 5 deletions ...ngular_devkit/build_angular/src/builders/application/tests/options/output-hashing_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
harness.useTarget('build', {
...BASE_OPTIONS,
styles: ['src/styles.css'],
polyfills: 'src/polyfills.ts',
polyfills: ['src/polyfills.ts'],
outputHashing: OutputHashing.All,
});

Expand All @@ -42,7 +42,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {

harness.useTarget('build', {
...BASE_OPTIONS,
polyfills: 'src/polyfills.ts',
polyfills: ['src/polyfills.ts'],
styles: ['src/styles.css'],
});

Expand All @@ -61,7 +61,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
harness.useTarget('build', {
...BASE_OPTIONS,
styles: ['src/styles.css'],
polyfills: 'src/polyfills.ts',
polyfills: ['src/polyfills.ts'],
outputHashing: OutputHashing.None,
});

Expand All @@ -80,7 +80,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
harness.useTarget('build', {
...BASE_OPTIONS,
styles: ['src/styles.css'],
polyfills: 'src/polyfills.ts',
polyfills: ['src/polyfills.ts'],
outputHashing: OutputHashing.Media,
});

Expand All @@ -99,7 +99,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
harness.useTarget('build', {
...BASE_OPTIONS,
styles: ['src/styles.css'],
polyfills: 'src/polyfills.ts',
polyfills: ['src/polyfills.ts'],
outputHashing: OutputHashing.Bundles,
});

Expand Down
6 changes: 3 additions & 3 deletions ...ges/angular_devkit/build_angular/src/builders/application/tests/options/polyfills_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
it('uses a provided TypeScript file', async () => {
harness.useTarget('build', {
...BASE_OPTIONS,
polyfills: 'src/polyfills.ts',
polyfills: ['src/polyfills.ts'],
});

const { result } = await harness.executeOnce();
Expand All @@ -29,7 +29,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {

harness.useTarget('build', {
...BASE_OPTIONS,
polyfills: 'src/polyfills.js',
polyfills: ['src/polyfills.js'],
});

const { result } = await harness.executeOnce();
Expand All @@ -42,7 +42,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
it('fails and shows an error when file does not exist', async () => {
harness.useTarget('build', {
...BASE_OPTIONS,
polyfills: 'src/missing.ts',
polyfills: ['src/missing.ts'],
});

const { result, logs } = await harness.executeOnce({ outputLogsOnFailure: false });
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -41,11 +41,12 @@ export function buildEsbuildBrowser(
}

function normalizeOptions(options: BrowserBuilderOptions): ApplicationBuilderOptions {
const { main: browser, ngswConfigPath, serviceWorker, ...otherOptions } = options;
const { main: browser, ngswConfigPath, serviceWorker, polyfills, ...otherOptions } = options;

return {
browser,
serviceWorker: serviceWorker ? ngswConfigPath : false,
polyfills: typeof polyfills === 'string' ? [polyfills] : polyfills,
...otherOptions,
};
}
Expand Down
23 changes: 7 additions & 16 deletions packages/angular_devkit/build_angular/src/builders/jest/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,13 @@
"description": "The name of the TypeScript configuration file."
},
"polyfills": {
"description": "Polyfills to be included in the build.",
"oneOf": [
{
"type": "array",
"description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
"items": {
"type": "string",
"uniqueItems": true
},
"default": []
},
{
"type": "string",
"description": "The full path for the polyfills file, relative to the current workspace or a module specifier. Example: 'zone.js'."
}
]
"type": "array",
"description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
"items": {
"type": "string",
"uniqueItems": true
},
"default": []
}
},
"additionalProperties": false,
Expand Down