@@ -111,10 +94,9 @@ This table describes the file layout under `node_modules/@angular/core` annotate
| `README.md` | Package README, used by npmjs web UI. |
| `package.json` | Primary `package.json`, describing the package itself as well as all available entrypoints and code formats. This file contains the "exports" mapping used by runtimes and tools to perform module resolution. |
| `index.d.ts` | Bundled `.d.ts` for the primary entrypoint `@angular/core`. |
-| `esm2020/`
─ `core.mjs`
─ `index.mjs`
─ `public_api.mjs` | Tree of `@angular/core` sources in unflattened ES2020 format. |
-| `esm2020/testing/` | Tree of the `@angular/core/testing` entrypoint in unflattened ES2020 format. |
-| `fesm2015/`
─ `core.mjs`
─ `core.mjs.map`
─ `testing.mjs`
─ `testing.mjs.map` | Code for all entrypoints in a flattened \(FESM\) ES2015 format, along with source maps. |
-| `fesm2020/`
─ `core.mjs`
─ `core.mjs.map`
─ `testing.mjs`
─ `testing.mjs.map` | Code for all entrypoints in flattened \(FESM\) ES2020 format, along with source maps. |
+| `esm2022/`
─ `core.mjs`
─ `index.mjs`
─ `public_api.mjs` | Tree of `@angular/core` sources in unflattened ES2022 format. |
+| `esm2022/testing/` | Tree of the `@angular/core/testing` entrypoint in unflattened ES2022 format. |
+| `fesm2022/`
─ `core.mjs`
─ `core.mjs.map`
─ `testing.mjs`
─ `testing.mjs.map` | Code for all entrypoints in flattened \(FESM\) ES2022 format, along with source maps. |
| `testing/` | Directory representing the "testing" entrypoint. |
| `testing/index.d.ts` | Bundled `.d.ts` for the `@angular/core/testing` entrypoint. |
@@ -158,19 +140,15 @@ The `"exports"` field has the following structure:
},
".": {
"types": "./core.d.ts",
- "esm2020": "./esm2020/core.mjs",
- "es2020": "./fesm2020/core.mjs",
- "es2015": "./fesm2015/core.mjs",
- "node": "./fesm2015/core.mjs",
- "default": "./fesm2020/core.mjs"
+ "esm": "./esm2022/core.mjs",
+ "esm2022": "./esm2022/core.mjs",
+ "default": "./fesm2022/core.mjs"
},
"./testing": {
"types": "./testing/testing.d.ts",
- "esm2020": "./esm2020/testing/testing.mjs",
- "es2020": "./fesm2020/testing.mjs",
- "es2015": "./fesm2015/testing.mjs",
- "node": "./fesm2015/testing.mjs",
- "default": "./fesm2020/testing.mjs"
+ "esm": "./esm2022/testing/testing.mjs",
+ "esm2022": "./esm2022/testing/testing.mjs",
+ "default": "./fesm2022/testing.mjs"
}
}
@@ -182,19 +160,11 @@ For each entrypoint, the available formats are:
| Formats | Details |
|:--- |:--- |
| Typings \(`.d.ts` files\) | `.d.ts` files are used by TypeScript when depending on a given package. |
-| `es2020` | ES2020 code flattened into a single source file. |
-| `es2015` | ES2015 code flattened into a single source file. |
-| `esm2020` | ES2020 code in unflattened source files \(this format is included for experimentation - see [this discussion of defaults](#note-about-the-defaults-in-packagejson) for details\). |
+| `es2022` | ES2022 code flattened into a single source file. |
+| `esm2022` | ES2022 code in unflattened source files \(this format is included for experimentation - see [this discussion of defaults](#note-about-the-defaults-in-packagejson) for details\). |
+| `default` | ES2022 code flattened into a single source.
Tooling that is aware of these keys may preferentially select a desirable code format from `"exports"`.
-The remaining 2 keys control the default behavior of tooling:
-
-* `"node"` selects flattened ES2015 code when the package is loaded in Node.
-
- This format is used due to the requirements of `zone.js`, which does not support native `async`/`await` ES2017 syntax.
- Therefore, Node is instructed to use ES2015 code, where `async`/`await` structures have been downleveled into Promises.
-
-* `"default"` selects flattened ES2020 code for all other consumers.
Libraries may want to expose additional static files which are not captured by the exports of the JavaScript-based entry-points such as Sass mixins or pre-compiled CSS.
@@ -208,26 +178,14 @@ For `@angular/core` these are:
{
- "fesm2020": "./fesm2020/core.mjs",
- "fesm2015": "./fesm2015/core.mjs",
- "esm2020": "./esm2020/core.mjs",
+ "module": "./fesm2022/core.mjs",
"typings": "./core.d.ts",
- "module": "./fesm2015/core.mjs",
- "es2020": "./fesm2020/core.mjs",
}
As shown in the preceding code snippet, a module resolver can use these keys to load a specific code format.
-
-
-**NOTE**:
-
### Side effects
The last function of `package.json` is to declare whether the package has [side effects](#sideeffects-flag).
@@ -323,9 +281,9 @@ The Angular compiler can generate index ES module files. Tools like Rollup can u
FESM is a file format created by flattening all ES Modules accessible from an entrypoint into a single ES Module.
It's formed by following all imports from a package and copying that code into a single file while preserving all public ES exports and removing all private imports.
-The abbreviated name, FESM, pronounced *phe-som*, can be followed by a number such as FESM5 or FESM2015.
+The abbreviated name, FESM, pronounced *phe-som*, can be followed by a number such as FESM2020.
The number refers to the language level of the JavaScript inside the module.
-Accordingly a FESM5 file would be ESM+ES5 and include import/export statements and ES5 source code.
+Accordingly a FESM2022 file would be ESM+ES2022 and include import/export statements and ES2022 source code.
To generate a flattened ES Module index file, use the following configuration options in your tsconfig.json file:
@@ -335,7 +293,7 @@ To generate a flattened ES Module index file, use the following configuration op
"compilerOptions": {
…
"module": "esnext",
- "target": "es2020",
+ "target": "es2022",
…
},
"angularCompilerOptions": {
@@ -353,9 +311,9 @@ Once the index file \(for example, `my-ui-lib.js`\) is generated by ngc, bundler
As of webpack v4, the flattening of ES modules optimization should not be necessary for webpack users. It should be possible to get better code-splitting without flattening of modules in webpack.
In practice, size regressions can still be seen when using unflattened modules as input for webpack v4.
-This is why `module` and `es2020` package.json entries still point to FESM files.
-This issue is being investigated. It is expected to switch the `module` and `es2020` package.json entry points to unflattened files after the size regression issue is resolved.
-The APF currently includes unflattened ESM2020 code for the purpose of validating such a future change.
+This is why `module` and `es2022` package.json entries still point to FESM files.
+This issue is being investigated. It is expected to switch the `module` and `es2022` package.json entry points to unflattened files after the size regression issue is resolved.
+The APF currently includes unflattened ESM2022 code for the purpose of validating such a future change.
### "sideEffects" flag
@@ -370,9 +328,9 @@ The recommendation is for all packages to claim the side-effect free status by s
More info: [webpack docs on side effects](https://github.com/webpack/webpack/tree/master/examples/side-effects)
-### ES2020 language level
+### ES2022 language level
-ES2020 Language level is now the default language level that is consumed by Angular CLI and other tooling.
+ES2022 Language level is now the default language level that is consumed by Angular CLI and other tooling.
The Angular CLI down-levels the bundle to a language level that is supported by all targeted browsers at application build time.
### d.ts bundling / type definition flattening
@@ -440,7 +398,7 @@ Node.js has one that is well specified and widely used, TypeScript supports seve
Specification of the module syntax that covers at minimum the syntax for the importing and exporting from a file.
Common module formats are CommonJS \(CJS, typically used for Node.js applications\) or ECMAScript Modules \(ESM\).
The module format indicates only the packaging of the individual modules, but not the JavaScript language features used to make up the module content.
-Because of this, the Angular team often uses the language level specifier as a suffix to the module format, \(for example, ESM+ES2015 specifies that the module is in ESM format and contains code down-leveled to ES2015\).
+Because of this, the Angular team often uses the language level specifier as a suffix to the module format, \(for example, ESM+ES2022 specifies that the module is in ESM format and contains ES2022 code\).
#### Bundle
@@ -451,7 +409,7 @@ Common bundle formats are UMD and System.register.
#### Language level
-The language of the code \(ES2015 or ES2020\).
+The language of the code \(ES2022\).
Independent of the module format.
#### Entry point
@@ -491,4 +449,4 @@ The bundled TypeScript definitions generated from [API Extractor](https://api-ex
-@reviewed 2022-02-28
+@reviewed 2023-03-06
diff --git a/aio/content/guide/upgrade.md b/aio/content/guide/upgrade.md
index 28916f786278..5af410053384 100644
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@@ -1215,7 +1215,7 @@ If your use case requires the UMD format, use [`rollup`][RollupjsMain] to manual
export default {
- input: 'node_modules/@angular/core/fesm2015/core.js',
+ input: 'node_modules/@angular/core/fesm2022/core.js',
output: {
file: 'bundle.js',
format: 'umd',
diff --git a/aio/package.json b/aio/package.json
index f71d1f7a2222..9b4305133390 100644
--- a/aio/package.json
+++ b/aio/package.json
@@ -12,10 +12,10 @@
"build-prod": "yarn build --config=release",
"build-local": "yarn build --config=aio_local_deps",
"lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint && yarn security-lint",
- "test": "bazel test //aio:test --test_output=streamed",
- "test-and-watch": "ibazel test //aio:test-and-watch --test_output=streamed",
+ "test": "bazel test //aio:test --test_output=streamed --test_tag_filters=-broken",
+ "test-and-watch": "ibazel test //aio:test-and-watch --test_output=streamed --test_tag_filters=-broken",
"test-local": "yarn test --config=aio_local_deps",
- "test:ci": "bazel test //aio/...",
+ "test:ci": "bazel test //aio/... --test_tag_filters=-broken",
"test-local:ci": "yarn test:ci --config=aio_local_deps",
"e2e": "bazel test //aio:e2e",
"e2e-local": "yarn e2e --config=aio_local_deps",
diff --git a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.js b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.js
index 6fd96c637180..251feece15f1 100644
--- a/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.js
+++ b/aio/tools/examples/shared/boilerplate/systemjs/src/systemjs.config.js
@@ -14,20 +14,20 @@
'app': 'app',
// angular bundles
- '@angular/animations': 'npm:@angular/animations/fesm2015/animations.mjs',
- '@angular/animations/browser': 'npm:@angular/animations/fesm2015/browser.mjs',
- '@angular/core': 'npm:@angular/core/fesm2015/core.mjs',
- '@angular/common': 'npm:@angular/common/fesm2015/common.mjs',
- '@angular/common/http': 'npm:@angular/common/fesm2015/http.mjs',
- '@angular/compiler': 'npm:@angular/compiler/fesm2015/compiler.mjs',
- '@angular/platform-browser': 'npm:@angular/platform-browser/fesm2015/platform-browser.mjs',
- '@angular/platform-browser/animations': 'npm:@angular/platform-browser/fesm2015/animations.mjs',
- '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/fesm2015/platform-browser-dynamic.mjs',
- '@angular/router': 'npm:@angular/router/fesm2015/router.mjs',
- '@angular/router/upgrade': 'npm:@angular/router/fesm2015/upgrade.mjs',
- '@angular/forms': 'npm:@angular/forms/fesm2015/forms.mjs',
- '@angular/upgrade': 'npm:@angular/upgrade/fesm2015/upgrade.mjs',
- '@angular/upgrade/static': 'npm:@angular/upgrade/fesm2015/static.mjs',
+ '@angular/animations': 'npm:@angular/animations/fesm2022/animations.mjs',
+ '@angular/animations/browser': 'npm:@angular/animations/fesm2022/browser.mjs',
+ '@angular/core': 'npm:@angular/core/fesm2022/core.mjs',
+ '@angular/common': 'npm:@angular/common/fesm2022/common.mjs',
+ '@angular/common/http': 'npm:@angular/common/fesm2022/http.mjs',
+ '@angular/compiler': 'npm:@angular/compiler/fesm2022/compiler.mjs',
+ '@angular/platform-browser': 'npm:@angular/platform-browser/fesm2022/platform-browser.mjs',
+ '@angular/platform-browser/animations': 'npm:@angular/platform-browser/fesm2022/animations.mjs',
+ '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/fesm2022/platform-browser-dynamic.mjs',
+ '@angular/router': 'npm:@angular/router/fesm2022/router.mjs',
+ '@angular/router/upgrade': 'npm:@angular/router/fesm2022/upgrade.mjs',
+ '@angular/forms': 'npm:@angular/forms/fesm2022/forms.mjs',
+ '@angular/upgrade': 'npm:@angular/upgrade/fesm2022/upgrade.mjs',
+ '@angular/upgrade/static': 'npm:@angular/upgrade/fesm2022/static.mjs',
// other libraries
'rxjs': 'npm:rxjs/dist/cjs',
diff --git a/integration/dynamic-compiler/rollup.config.mjs b/integration/dynamic-compiler/rollup.config.mjs
index 395c67b23e6f..1eefc570fb49 100644
--- a/integration/dynamic-compiler/rollup.config.mjs
+++ b/integration/dynamic-compiler/rollup.config.mjs
@@ -23,7 +23,9 @@ export default {
entryFileNames: '[name].bundle.js',
sourcemap: true,
},
- treeshake: true,
+ // Rollup treeshaking has issues with https://github.com/angular/angular/blob/addd7f6249d54e258109f139fad1db0d0250352c/packages/core/src/linker/query_list.ts#L192
+ // see: https://github.com/rollup/rollup/issues/4895
+ treeshake: false,
plugins: [
nodeResolve(),
babel({plugins: [linkerPlugin]}),
diff --git a/integration/hello_world__closure/BUILD.bazel b/integration/hello_world__closure/BUILD.bazel
deleted file mode 100644
index 905707ba692e..000000000000
--- a/integration/hello_world__closure/BUILD.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-load("//integration:index.bzl", "ng_integration_test")
-
-ng_integration_test(
- name = "test",
- # TODO: Re-enable size-tracking:
- # We should define ngDevMode to false in Closure, but --define only works in the global scope.
- # With ngDevMode not being set to false, this size tracking test provides little value but a lot of
- # headache to continue updating the size.
- # track_payload_size = "hello_world_closure",
- setup_chromium = True,
-)
diff --git a/integration/hello_world__closure/closure.conf b/integration/hello_world__closure/closure.conf
deleted file mode 100644
index 3d2fcdb95c0f..000000000000
--- a/integration/hello_world__closure/closure.conf
+++ /dev/null
@@ -1,20 +0,0 @@
---compilation_level=SIMPLE
---language_in=ECMASCRIPT_2020
---language_out=ECMASCRIPT_2020
---js_output_file=dist/bundle.js
---output_manifest=dist/manifest.MF
---variable_renaming_report=dist/variable_renaming_report
---property_renaming_report=dist/property_renaming_report
---create_source_map=%outname%.map
-
---warning_level=QUIET
---dependency_mode=PRUNE
---rewrite_polyfills=false
-
---module_resolution=node
---package_json_entry_names es2020,module
-
-node_modules/zone.js/zone_externs.js
-
---js built/bundle.js
---entry_point=built/bundle.js
diff --git a/integration/hello_world__closure/e2e/app.e2e-spec.ts b/integration/hello_world__closure/e2e/app.e2e-spec.ts
deleted file mode 100644
index 04fadb25251a..000000000000
--- a/integration/hello_world__closure/e2e/app.e2e-spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { browser, element, by } from 'protractor';
-
-describe('Hello world E2E Tests', function () {
- it('should display: Hello world!', function () {
- browser.get('');
- const div = element(by.css('div'));
- expect(div.getText()).toEqual('Hello world!');
- element(by.css('input')).sendKeys('!');
- expect(div.getText()).toEqual('Hello world!!');
- });
-});
diff --git a/integration/hello_world__closure/e2e/browser.config.json b/integration/hello_world__closure/e2e/browser.config.json
deleted file mode 100644
index d62ba608f475..000000000000
--- a/integration/hello_world__closure/e2e/browser.config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "open": false,
- "logLevel": "silent",
- "port": 4202,
- "server": {
- "baseDir": "src",
- "routes": {
- "/dist": "dist",
- "/node_modules": "node_modules"
- },
- "middleware": {
- "0": null
- }
- }
-}
\ No newline at end of file
diff --git a/integration/hello_world__closure/e2e/protractor.config.js b/integration/hello_world__closure/e2e/protractor.config.js
deleted file mode 100644
index f8ff4a85e6bb..000000000000
--- a/integration/hello_world__closure/e2e/protractor.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
-exports.config = {
- specs: [
- '../built/e2e/*.e2e-spec.js'
- ],
- chromeDriver: process.env.CHROMEDRIVER_BIN,
- capabilities: {
- browserName: 'chrome',
- chromeOptions: {
- binary: process.env.CHROME_BIN,
- // See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
- },
- directConnect: true,
- // Port comes from lite-server config `/e2e/browser.config.json` `"port": 4202`
- baseUrl: 'http://localhost:4202/',
- framework: 'jasmine',
- useAllAngular2AppRoots: true
-};
diff --git a/integration/hello_world__closure/e2e/tsconfig.json b/integration/hello_world__closure/e2e/tsconfig.json
deleted file mode 100644
index b60faa75fdf2..000000000000
--- a/integration/hello_world__closure/e2e/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "compilerOptions": {
- "outDir": "../built/e2e",
- "types": ["jasmine", "jasminewd2"],
- }
-}
diff --git a/integration/hello_world__closure/package.json b/integration/hello_world__closure/package.json
deleted file mode 100644
index ebc5b49b9b21..000000000000
--- a/integration/hello_world__closure/package.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "name": "angular-integration",
- "version": "0.0.0",
- "license": "MIT",
- "dependencies": {
- "@angular/common": "file:../../dist/packages-dist/common",
- "@angular/compiler": "file:../../dist/packages-dist/compiler",
- "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
- "@angular/core": "file:../../dist/packages-dist/core",
- "@angular/elements": "file:../../dist/packages-dist/elements",
- "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
- "rxjs": "file:../../node_modules/rxjs",
- "typescript": "file:../../node_modules/typescript",
- "tslib": "file:../../node_modules/tslib",
- "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
- },
- "devDependencies": {
- "@babel/core": "file:../../node_modules/@babel/core",
- "@rollup/plugin-babel": "file:../../node_modules/@rollup/plugin-babel",
- "@rollup/plugin-node-resolve": "file:../../node_modules/@rollup/plugin-node-resolve",
- "@types/jasmine": "file:../../node_modules/@types/jasmine",
- "@types/jasminewd2": "file:../../node_modules/@types/jasminewd2",
- "concurrently": "3.4.0",
- "google-closure-compiler": "file:../../node_modules/google-closure-compiler",
- "lite-server": "2.2.2",
- "protractor": "file:../../node_modules/protractor",
- "rollup": "file:../../node_modules/rollup",
- "tsickle": "file:../../node_modules/tsickle"
- },
- "scripts": {
- "closure": "google-closure-compiler --flagfile closure.conf",
- "build": "yarn ngc && yarn rollup -c rollup.config.mjs && yarn closure",
- "test": "yarn build && concurrently \"yarn run serve\" \"yarn run protractor\" --kill-others --success first",
- "serve": "lite-server -c e2e/browser.config.json",
- "preprotractor": "tsc -p e2e",
- "protractor": "protractor e2e/protractor.config.js"
- }
-}
diff --git a/integration/hello_world__closure/rollup.config.mjs b/integration/hello_world__closure/rollup.config.mjs
deleted file mode 100644
index 2ddcb493475d..000000000000
--- a/integration/hello_world__closure/rollup.config.mjs
+++ /dev/null
@@ -1,27 +0,0 @@
-import {nodeResolve} from '@rollup/plugin-node-resolve';
-import {babel} from '@rollup/plugin-babel';
-import {ConsoleLogger, NodeJSFileSystem, LogLevel} from '@angular/compiler-cli';
-import {createEs2015LinkerPlugin} from '@angular/compiler-cli/linker/babel';
-
-/** File system used by the Angular linker plugin. */
-const fileSystem = new NodeJSFileSystem();
-/** Logger used by the Angular linker plugin. */
-const logger = new ConsoleLogger(LogLevel.info);
-/** Linker babel plugin. */
-const linkerPlugin = createEs2015LinkerPlugin({
- fileSystem,
- logger,
- linkerJitMode: false,
-});
-
-export default {
- input: './built/src/main.js',
- output: {
- file: './built/bundle.js',
- format: 'iife'
- },
- plugins: [
- nodeResolve(),
- babel({plugins: [linkerPlugin]}),
- ]
-}
\ No newline at end of file
diff --git a/integration/hello_world__closure/src/app.ts b/integration/hello_world__closure/src/app.ts
deleted file mode 100644
index 31ecac712b0d..000000000000
--- a/integration/hello_world__closure/src/app.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {HelloWorldComponent} from './hello-world.component';
-
-import {NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-
-@NgModule({
- declarations: [HelloWorldComponent],
- bootstrap: [HelloWorldComponent],
- imports: [BrowserModule],
-})
-export class AppModule {}
diff --git a/integration/hello_world__closure/src/hello-world.component.ts b/integration/hello_world__closure/src/hello-world.component.ts
deleted file mode 100644
index 87b9ca39de84..000000000000
--- a/integration/hello_world__closure/src/hello-world.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'hello-world-app',
- template: `
- Hello {{ name }}!
- Hello World
- Loading...
-
-
-
-
-
-
-
diff --git a/integration/hello_world__closure/src/main.ts b/integration/hello_world__closure/src/main.ts
deleted file mode 100644
index 1870d726a819..000000000000
--- a/integration/hello_world__closure/src/main.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import {platformBrowser} from '@angular/platform-browser';
-import {AppModule} from './app';
-
-platformBrowser().bootstrapModule(AppModule);
diff --git a/integration/hello_world__closure/tsconfig.json b/integration/hello_world__closure/tsconfig.json
deleted file mode 100644
index f9590ec2c35d..000000000000
--- a/integration/hello_world__closure/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "angularCompilerOptions": {
- "annotationsAs": "static fields",
- "annotateForClosureCompiler": true,
- },
- "compilerOptions": {
- "module": "es2015",
- "moduleResolution": "node",
- "target": "es6",
- "noImplicitAny": false,
- "sourceMap": false,
- "experimentalDecorators": true,
- "outDir": "built",
- "rootDir": ".",
- "declaration": true,
- "types": []
- },
- "exclude": [
- "vendor",
- "node_modules",
- "built",
- "dist",
- "e2e"
- ]
-}
diff --git a/integration/i18n/BUILD.bazel b/integration/i18n/BUILD.bazel
deleted file mode 100644
index 45298ffe0143..000000000000
--- a/integration/i18n/BUILD.bazel
+++ /dev/null
@@ -1,6 +0,0 @@
-load("//integration:index.bzl", "ng_integration_test")
-
-ng_integration_test(
- name = "test",
- setup_chromium = True,
-)
diff --git a/integration/i18n/closure.conf b/integration/i18n/closure.conf
deleted file mode 100644
index 3d2fcdb95c0f..000000000000
--- a/integration/i18n/closure.conf
+++ /dev/null
@@ -1,20 +0,0 @@
---compilation_level=SIMPLE
---language_in=ECMASCRIPT_2020
---language_out=ECMASCRIPT_2020
---js_output_file=dist/bundle.js
---output_manifest=dist/manifest.MF
---variable_renaming_report=dist/variable_renaming_report
---property_renaming_report=dist/property_renaming_report
---create_source_map=%outname%.map
-
---warning_level=QUIET
---dependency_mode=PRUNE
---rewrite_polyfills=false
-
---module_resolution=node
---package_json_entry_names es2020,module
-
-node_modules/zone.js/zone_externs.js
-
---js built/bundle.js
---entry_point=built/bundle.js
diff --git a/integration/i18n/e2e/app.e2e-spec.ts b/integration/i18n/e2e/app.e2e-spec.ts
deleted file mode 100644
index afcc36025a61..000000000000
--- a/integration/i18n/e2e/app.e2e-spec.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { browser, element, by } from 'protractor';
-
-describe('i18n E2E Tests', function () {
- it('remove i18n attributes', function () {
- browser.get('');
- const div = element(by.css('div'));
- expect(div.getAttribute('title')).not.toBe(null);
- expect(div.getAttribute('i18n')).toBe(null);
- });
-});
diff --git a/integration/i18n/e2e/browser.config.json b/integration/i18n/e2e/browser.config.json
deleted file mode 100644
index 1c4310b25277..000000000000
--- a/integration/i18n/e2e/browser.config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "open": false,
- "logLevel": "silent",
- "port": 4204,
- "server": {
- "baseDir": "src",
- "routes": {
- "/dist": "dist",
- "/node_modules": "node_modules"
- },
- "middleware": {
- "0": null
- }
- }
-}
\ No newline at end of file
diff --git a/integration/i18n/e2e/protractor.config.js b/integration/i18n/e2e/protractor.config.js
deleted file mode 100644
index cd2fb657131a..000000000000
--- a/integration/i18n/e2e/protractor.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Protractor configuration file, see link for more information
-// https://github.com/angular/protractor/blob/master/lib/config.ts
-exports.config = {
- specs: [
- '../built/e2e/*.e2e-spec.js'
- ],
- chromeDriver: process.env.CHROMEDRIVER_BIN,
- capabilities: {
- browserName: 'chrome',
- chromeOptions: {
- binary: process.env.CHROME_BIN,
- // See /integration/README.md#browser-tests for more info on these args
- args: ['--no-sandbox', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--hide-scrollbars', '--mute-audio']
- }
- },
- directConnect: true,
- // Port comes from lite-server config `/e2e/browser.config.json` `"port": 4204`
- baseUrl: 'http://localhost:4204/',
- framework: 'jasmine',
- useAllAngular2AppRoots: true
-};
diff --git a/integration/i18n/e2e/tsconfig.json b/integration/i18n/e2e/tsconfig.json
deleted file mode 100644
index b60faa75fdf2..000000000000
--- a/integration/i18n/e2e/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "compilerOptions": {
- "outDir": "../built/e2e",
- "types": ["jasmine", "jasminewd2"],
- }
-}
diff --git a/integration/i18n/package.json b/integration/i18n/package.json
deleted file mode 100644
index d48d30f4e0ec..000000000000
--- a/integration/i18n/package.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "name": "angular-integration",
- "version": "0.0.0",
- "license": "MIT",
- "dependencies": {
- "@angular/common": "file:../../dist/packages-dist/common",
- "@angular/compiler": "file:../../dist/packages-dist/compiler",
- "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
- "@angular/core": "file:../../dist/packages-dist/core",
- "@angular/localize": "file:../../dist/packages-dist/localize",
- "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
- "rxjs": "file:../../node_modules/rxjs",
- "tslib": "file:../../node_modules/tslib",
- "typescript": "file:../../node_modules/typescript",
- "zone.js": "file:../../dist/zone.js-dist/archive/zone.js.tgz"
- },
- "devDependencies": {
- "@babel/core": "file:../../node_modules/@babel/core",
- "@rollup/plugin-babel": "file:../../node_modules/@rollup/plugin-babel",
- "@rollup/plugin-node-resolve": "file:../../node_modules/@rollup/plugin-node-resolve",
- "@types/jasmine": "file:../../node_modules/@types/jasmine",
- "@types/jasminewd2": "file:../../node_modules/@types/jasminewd2",
- "concurrently": "3.4.0",
- "google-closure-compiler": "file:../../node_modules/google-closure-compiler",
- "lite-server": "2.2.2",
- "protractor": "file:../../node_modules/protractor",
- "rollup": "file:../../node_modules/rollup",
- "tsickle": "file:../../node_modules/tsickle"
- },
- "scripts": {
- "build": "yarn ngc && yarn rollup -c rollup.config.mjs && yarn closure",
- "closure": "google-closure-compiler --flagfile closure.conf",
- "test": "yarn build && concurrently \"yarn run serve\" \"yarn run protractor\" --kill-others --success first && yarn test-locale-folder",
- "test-locale-folder": "node test-locale-folder.js",
- "serve": "lite-server -c e2e/browser.config.json",
- "preprotractor": "tsc -p e2e",
- "protractor": "protractor e2e/protractor.config.js"
- }
-}
diff --git a/integration/i18n/rollup.config.mjs b/integration/i18n/rollup.config.mjs
deleted file mode 100644
index 2ddcb493475d..000000000000
--- a/integration/i18n/rollup.config.mjs
+++ /dev/null
@@ -1,27 +0,0 @@
-import {nodeResolve} from '@rollup/plugin-node-resolve';
-import {babel} from '@rollup/plugin-babel';
-import {ConsoleLogger, NodeJSFileSystem, LogLevel} from '@angular/compiler-cli';
-import {createEs2015LinkerPlugin} from '@angular/compiler-cli/linker/babel';
-
-/** File system used by the Angular linker plugin. */
-const fileSystem = new NodeJSFileSystem();
-/** Logger used by the Angular linker plugin. */
-const logger = new ConsoleLogger(LogLevel.info);
-/** Linker babel plugin. */
-const linkerPlugin = createEs2015LinkerPlugin({
- fileSystem,
- logger,
- linkerJitMode: false,
-});
-
-export default {
- input: './built/src/main.js',
- output: {
- file: './built/bundle.js',
- format: 'iife'
- },
- plugins: [
- nodeResolve(),
- babel({plugins: [linkerPlugin]}),
- ]
-}
\ No newline at end of file
diff --git a/integration/i18n/src/app.ts b/integration/i18n/src/app.ts
deleted file mode 100644
index 31ecac712b0d..000000000000
--- a/integration/i18n/src/app.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {HelloWorldComponent} from './hello-world.component';
-
-import {NgModule} from '@angular/core';
-import {BrowserModule} from '@angular/platform-browser';
-
-@NgModule({
- declarations: [HelloWorldComponent],
- bootstrap: [HelloWorldComponent],
- imports: [BrowserModule],
-})
-export class AppModule {}
diff --git a/integration/i18n/src/hello-world.component.ts b/integration/i18n/src/hello-world.component.ts
deleted file mode 100644
index 5aabbddd9309..000000000000
--- a/integration/i18n/src/hello-world.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'hello-world-app',
- template: `Hello {{ name }}!
`,
-})
-export class HelloWorldComponent {
- name: string = 'world';
-}
diff --git a/integration/i18n/src/index.html b/integration/i18n/src/index.html
deleted file mode 100644
index 5a1c1afc2df3..000000000000
--- a/integration/i18n/src/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- Hello World
- Loading...
-
-
-
-
-
-
-
diff --git a/integration/i18n/src/main.ts b/integration/i18n/src/main.ts
deleted file mode 100644
index e7bf284bc875..000000000000
--- a/integration/i18n/src/main.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import '@angular/localize/init'
-
-import {platformBrowser} from '@angular/platform-browser';
-import {AppModule} from './app';
-
-platformBrowser().bootstrapModule(AppModule);
diff --git a/integration/i18n/test-locale-folder.js b/integration/i18n/test-locale-folder.js
deleted file mode 100644
index 13eef35f121e..000000000000
--- a/integration/i18n/test-locale-folder.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const packageJson = require('@angular/common/package.json');
-const localesFolder = packageJson['locales'];
-if (!localesFolder) {
- throw new Error(`@angular/common/package.json does not contain 'locales' entry.`)
-}
-const enLocalePath = `@angular/common/${localesFolder}/en`;
-try {
- require.resolve(enLocalePath);
-} catch (err) {
- throw new Error(`@angular/common does not contain 'en' locale in ${enLocalePath}.`)
-}
diff --git a/integration/i18n/tsconfig.json b/integration/i18n/tsconfig.json
deleted file mode 100644
index 150751592dcb..000000000000
--- a/integration/i18n/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "angularCompilerOptions": {
- "annotationsAs": "static fields",
- "annotateForClosureCompiler": true,
- },
- "compilerOptions": {
- "module": "es2020",
- "moduleResolution": "node",
- "target": "es2020",
- "noImplicitAny": false,
- "sourceMap": false,
- "experimentalDecorators": true,
- "outDir": "built",
- "rootDir": ".",
- "declaration": true,
- "types": []
- },
-
- "exclude": [
- "vendor",
- "node_modules",
- "built",
- "dist",
- "e2e"
- ]
-}
diff --git a/integration/ng_elements/closure.conf b/integration/ng_elements/closure.conf
deleted file mode 100644
index 3d2fcdb95c0f..000000000000
--- a/integration/ng_elements/closure.conf
+++ /dev/null
@@ -1,20 +0,0 @@
---compilation_level=SIMPLE
---language_in=ECMASCRIPT_2020
---language_out=ECMASCRIPT_2020
---js_output_file=dist/bundle.js
---output_manifest=dist/manifest.MF
---variable_renaming_report=dist/variable_renaming_report
---property_renaming_report=dist/property_renaming_report
---create_source_map=%outname%.map
-
---warning_level=QUIET
---dependency_mode=PRUNE
---rewrite_polyfills=false
-
---module_resolution=node
---package_json_entry_names es2020,module
-
-node_modules/zone.js/zone_externs.js
-
---js built/bundle.js
---entry_point=built/bundle.js
diff --git a/integration/ng_elements/package.json b/integration/ng_elements/package.json
index f39c27427fd3..09d1e834f86d 100644
--- a/integration/ng_elements/package.json
+++ b/integration/ng_elements/package.json
@@ -21,15 +21,13 @@
"@types/jasmine": "file:../../node_modules/@types/jasmine",
"@types/jasminewd2": "file:../../node_modules/@types/jasminewd2",
"concurrently": "3.4.0",
- "google-closure-compiler": "file:../../node_modules/google-closure-compiler",
"lite-server": "2.2.2",
"protractor": "file:../../node_modules/protractor",
"rollup": "file:../../node_modules/rollup",
"tsickle": "file:../../node_modules/tsickle"
},
"scripts": {
- "closure": "google-closure-compiler --flagfile closure.conf",
- "build": "yarn ngc && yarn rollup -c rollup.config.mjs && yarn closure",
+ "build": "yarn ngc && yarn rollup -c rollup.config.mjs",
"test": "yarn build && concurrently \"yarn run serve\" \"yarn run protractor\" --kill-others --success first",
"serve": "lite-server -c e2e/browser.config.json",
"preprotractor": "tsc -p e2e",
diff --git a/integration/ng_elements/rollup.config.mjs b/integration/ng_elements/rollup.config.mjs
index 2ddcb493475d..2ec8e7b9354b 100644
--- a/integration/ng_elements/rollup.config.mjs
+++ b/integration/ng_elements/rollup.config.mjs
@@ -17,11 +17,13 @@ const linkerPlugin = createEs2015LinkerPlugin({
export default {
input: './built/src/main.js',
output: {
- file: './built/bundle.js',
- format: 'iife'
+ file: './dist/bundle.js',
},
+ // Rollup treeshaking has issues with https://github.com/angular/angular/blob/addd7f6249d54e258109f139fad1db0d0250352c/packages/core/src/linker/query_list.ts#L192
+ // see: https://github.com/rollup/rollup/issues/4895
+ treeshake: false,
plugins: [
nodeResolve(),
babel({plugins: [linkerPlugin]}),
]
-}
\ No newline at end of file
+}
diff --git a/integration/npm_package_archives.bzl b/integration/npm_package_archives.bzl
index a0783370257b..90723bd2a08d 100644
--- a/integration/npm_package_archives.bzl
+++ b/integration/npm_package_archives.bzl
@@ -6,7 +6,6 @@ NPM_PACKAGE_ARCHIVES = [
"@rollup/plugin-node-resolve",
"@rollup/plugin-commonjs",
"check-side-effects",
- "google-closure-compiler",
"jasmine",
"typescript",
"rxjs",
diff --git a/integration/side-effects/side-effects.json b/integration/side-effects/side-effects.json
index c22ac39d5eb2..0b705f26a1ad 100644
--- a/integration/side-effects/side-effects.json
+++ b/integration/side-effects/side-effects.json
@@ -1,68 +1,68 @@
{
"tests": [
{
- "esModules": "./node_modules/@angular/animations/esm2015/animations.js",
- "expectedOutput": "./snapshots/animations/esm2015.js"
+ "esModules": "./node_modules/@angular/animations/esm2022/animations.js",
+ "expectedOutput": "./snapshots/animations/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/animations/fesm2015/animations.js",
- "expectedOutput": "./snapshots/animations/esm2015.js"
+ "esModules": "./node_modules/@angular/animations/fesm2022/animations.js",
+ "expectedOutput": "./snapshots/animations/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/animations/esm2015/browser/browser.js",
- "expectedOutput": "./snapshots/animations-browser/esm2015.js"
+ "esModules": "./node_modules/@angular/animations/esm2022/browser/browser.js",
+ "expectedOutput": "./snapshots/animations-browser/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/animations/fesm2015/browser.js",
- "expectedOutput": "./snapshots/animations-browser/esm2015.js"
+ "esModules": "./node_modules/@angular/animations/fesm2022/browser.js",
+ "expectedOutput": "./snapshots/animations-browser/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/common/esm2015/common.js",
- "expectedOutput": "./snapshots/common/esm2015.js"
+ "esModules": "./node_modules/@angular/common/esm2022/common.js",
+ "expectedOutput": "./snapshots/common/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/common/fesm2015/common.js",
- "expectedOutput": "./snapshots/common/esm2015.js"
+ "esModules": "./node_modules/@angular/common/fesm2022/common.js",
+ "expectedOutput": "./snapshots/common/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/core/esm2015/core.js",
- "expectedOutput": "./snapshots/core/esm2015.js"
+ "esModules": "./node_modules/@angular/core/esm2022/core.js",
+ "expectedOutput": "./snapshots/core/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/core/fesm2015/core.js",
- "expectedOutput": "./snapshots/core/esm2015.js"
+ "esModules": "./node_modules/@angular/core/fesm2022/core.js",
+ "expectedOutput": "./snapshots/core/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/elements/esm2015/elements.js",
- "expectedOutput": "./snapshots/elements/esm2015.js"
+ "esModules": "./node_modules/@angular/elements/esm2022/elements.js",
+ "expectedOutput": "./snapshots/elements/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/elements/fesm2015/elements.js",
- "expectedOutput": "./snapshots/elements/esm2015.js"
+ "esModules": "./node_modules/@angular/elements/fesm2022/elements.js",
+ "expectedOutput": "./snapshots/elements/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/forms/esm2015/forms.js",
- "expectedOutput": "./snapshots/forms/esm2015.js"
+ "esModules": "./node_modules/@angular/forms/esm2022/forms.js",
+ "expectedOutput": "./snapshots/forms/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/forms/fesm2015/forms.js",
- "expectedOutput": "./snapshots/forms/esm2015.js"
+ "esModules": "./node_modules/@angular/forms/fesm2022/forms.js",
+ "expectedOutput": "./snapshots/forms/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/platform-browser/esm2015/platform-browser.js",
- "expectedOutput": "./snapshots/platform-browser/esm2015.js"
+ "esModules": "./node_modules/@angular/platform-browser/esm2022/platform-browser.js",
+ "expectedOutput": "./snapshots/platform-browser/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/platform-browser/fesm2015/platform-browser.js",
- "expectedOutput": "./snapshots/platform-browser/esm2015.js"
+ "esModules": "./node_modules/@angular/platform-browser/fesm2022/platform-browser.js",
+ "expectedOutput": "./snapshots/platform-browser/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/router/esm2015/router.js",
- "expectedOutput": "./snapshots/router/esm2015.js"
+ "esModules": "./node_modules/@angular/router/esm2022/router.js",
+ "expectedOutput": "./snapshots/router/esm2022.js"
},
{
- "esModules": "./node_modules/@angular/router/fesm2015/router.js",
- "expectedOutput": "./snapshots/router/esm2015.js"
+ "esModules": "./node_modules/@angular/router/fesm2022/router.js",
+ "expectedOutput": "./snapshots/router/esm2022.js"
}
]
}
diff --git a/integration/side-effects/snapshots/animations-browser/esm2015.js b/integration/side-effects/snapshots/animations-browser/esm2022.js
similarity index 100%
rename from integration/side-effects/snapshots/animations-browser/esm2015.js
rename to integration/side-effects/snapshots/animations-browser/esm2022.js
diff --git a/integration/side-effects/snapshots/animations/esm2015.js b/integration/side-effects/snapshots/animations/esm2022.js
similarity index 100%
rename from integration/side-effects/snapshots/animations/esm2015.js
rename to integration/side-effects/snapshots/animations/esm2022.js
diff --git a/integration/side-effects/snapshots/common/esm2015.js b/integration/side-effects/snapshots/common/esm2022.js
similarity index 100%
rename from integration/side-effects/snapshots/common/esm2015.js
rename to integration/side-effects/snapshots/common/esm2022.js
diff --git a/integration/side-effects/snapshots/core/esm2015.js b/integration/side-effects/snapshots/core/esm2022.js
similarity index 100%
rename from integration/side-effects/snapshots/core/esm2015.js
rename to integration/side-effects/snapshots/core/esm2022.js
diff --git a/integration/side-effects/snapshots/elements/esm2015.js b/integration/side-effects/snapshots/elements/esm2022.js
similarity index 100%
rename from integration/side-effects/snapshots/elements/esm2015.js
rename to integration/side-effects/snapshots/elements/esm2022.js
diff --git a/integration/side-effects/snapshots/forms/esm2015.js b/integration/side-effects/snapshots/forms/esm2022.js
similarity index 100%
rename from integration/side-effects/snapshots/forms/esm2015.js
rename to integration/side-effects/snapshots/forms/esm2022.js
diff --git a/integration/side-effects/snapshots/platform-browser/esm2015.js b/integration/side-effects/snapshots/platform-browser/esm2022.js
similarity index 100%
rename from integration/side-effects/snapshots/platform-browser/esm2015.js
rename to integration/side-effects/snapshots/platform-browser/esm2022.js
diff --git a/integration/side-effects/snapshots/router/esm2015.js b/integration/side-effects/snapshots/router/esm2022.js
similarity index 100%
rename from integration/side-effects/snapshots/router/esm2015.js
rename to integration/side-effects/snapshots/router/esm2022.js
diff --git a/integration/terser/test.js b/integration/terser/test.js
index eb86345ed02b..782afb4334ed 100644
--- a/integration/terser/test.js
+++ b/integration/terser/test.js
@@ -6,8 +6,8 @@ const Terser = require('terser');
async function test() {
const outputPath = resolve(__dirname, './core.min.js');
- const pathToCoreFesm2020 = resolve(__dirname, './node_modules/@angular/core/fesm2020/core.mjs');
- const coreFesm2020Content = readFileSync(pathToCoreFesm2020, 'utf8');
+ const pathToCoreFesm2020 = resolve(__dirname, './node_modules/@angular/core/fesm2022/core.mjs');
+ const coreFesm2022Content = readFileSync(pathToCoreFesm2020, 'utf8');
const GLOBAL_DEFS_FOR_TERSER = (await import('@angular/compiler-cli')).GLOBAL_DEFS_FOR_TERSER;
@@ -18,7 +18,7 @@ async function test() {
global_defs: GLOBAL_DEFS_FOR_TERSER
}
};
- const result = await Terser.minify(coreFesm2020Content, terserOpts);
+ const result = await Terser.minify(coreFesm2022Content, terserOpts);
writeFileSync(outputPath, result.code);
for (const def of Object.keys(GLOBAL_DEFS_FOR_TERSER)) {
diff --git a/package.json b/package.json
index b990cf458d21..da22d1fb4e95 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,6 @@
"diff": "^5.0.0",
"document-register-element": "^1.7.2",
"domino": "https://github.com/angular/domino.git#4280d0380df839d97b81e7680877ad5b55500e77",
- "google-closure-compiler": "20230206.0.0",
"graceful-fs": "4.2.10",
"hammerjs": "~2.0.8",
"http-server": "^14.0.0",
diff --git a/packages/bazel/src/ng_module/ng_module.bzl b/packages/bazel/src/ng_module/ng_module.bzl
index e693c3f8fdab..5e2e35895ee7 100644
--- a/packages/bazel/src/ng_module/ng_module.bzl
+++ b/packages/bazel/src/ng_module/ng_module.bzl
@@ -202,13 +202,17 @@ def _ngc_tsconfig(ctx, files, srcs, **kwargs):
"angularCompilerOptions": angular_compiler_options,
})
- # For prodmode, the compilation target is set to `ES2020`. `@bazel/typecript`
+ # For prodmode, the compilation target is set to `ES2022`. `@bazel/typecript`
# using the `create_tsconfig` function sets `ES2015` by default for prodmode
- # and uses ES5 with UMD for devmode. We want to consistenly use ES2020 ESM.
+ # and uses ES5 with UMD for devmode. We want to consistenly use ES2022 ESM.
# https://github.com/bazelbuild/rules_nodejs/blob/901df3868e3ceda177d3ed181205e8456a5592ea/third_party/github.com/bazelbuild/rules_typescript/internal/common/tsconfig.bzl#L195
# TODO(devversion): In the future, combine prodmode and devmode so we can get rid of the
# ambiguous terminology and concept that can result in slow-down for development workflows.
- tsconfig["compilerOptions"]["target"] = "es2020"
+ # TODO(alanagius): The below causes a drastic size increase when enabled (4Kb in the //integration/forms:test). This is mainly due to Babel transforms for Safari 15.
+ # https://github.com/angular/angular-cli/blob/3e8bdf72d6b7e2925d2822da807b726f88a77e1a/packages/angular_devkit/build_angular/src/babel/presets/application.ts#L199-L204
+ # https://www.diffchecker.com/9Ge3pexk
+ tsconfig["compilerOptions"]["useDefineForClassFields"] = False
+ tsconfig["compilerOptions"]["target"] = "es2022"
tsconfig["compilerOptions"]["module"] = "esnext"
return tsconfig
diff --git a/packages/bazel/src/ng_package/ng_package.bzl b/packages/bazel/src/ng_package/ng_package.bzl
index 8b179393835a..f0d85896f673 100644
--- a/packages/bazel/src/ng_package/ng_package.bzl
+++ b/packages/bazel/src/ng_package/ng_package.bzl
@@ -132,8 +132,7 @@ def _compute_node_modules_root(ctx):
def _write_rollup_config(
ctx,
root_dir,
- filename = "_%s.rollup.conf.js",
- downlevel_to_es2015 = False):
+ filename = "_%s.rollup.conf.js"):
"""Generate a rollup config file.
Args:
@@ -172,7 +171,6 @@ def _write_rollup_config(
"TMPL_root_dir": root_dir,
"TMPL_workspace_name": ctx.workspace_name,
"TMPL_external": ", ".join(["'%s'" % e for e in externals]),
- "TMPL_downlevel_to_es2015": "true" if downlevel_to_es2015 else "false",
},
)
@@ -248,13 +246,13 @@ def _filter_esm_files_to_include(files, owning_package):
for file in files:
# We skip all `.externs.js` files as those should not be shipped as part of
- # the ESM2020 output. The externs are empty because `ngc-wrapped` disables
+ # the ESM2022 output. The externs are empty because `ngc-wrapped` disables
# externs generation in prodmode for workspaces other than `google3`.
if file.path.endswith("externs.js"):
continue
# We omit all non-JavaScript files. These are not required for the FESM bundle
- # generation and are not expected to be put into the `esm2020` output.
+ # generation and are not expected to be put into the `esm2022` output.
if not file.path.endswith(".js") and not file.path.endswith(".mjs"):
continue
@@ -287,13 +285,12 @@ def _ng_package_impl(ctx):
# These accumulators match the directory names where the files live in the
# Angular package format.
- fesm2020 = []
- fesm2015 = []
+ fesm2022 = []
type_files = []
# List of unscoped direct and transitive ESM sources that are provided
# by all entry-points.
- unscoped_all_entry_point_esm2020 = []
+ unscoped_all_entry_point_esm2022 = []
# We infer the entry points to be:
# - ng_module rules in the deps (they have an "angular" provider)
@@ -321,18 +318,18 @@ def _ng_package_impl(ctx):
# Whether this dependency is for the primary entry-point of the package.
is_primary_entry_point = entry_point == ""
- # Collect ESM2020 and type definition source files from the dependency, including
+ # Collect ESM2022 and type definition source files from the dependency, including
# transitive sources which are not directly defined in the entry-point. This is
# necessary to allow for entry-points to rely on sub-targets (as a perf improvement).
- unscoped_esm2020_depset = dep[JSEcmaScriptModuleInfo].sources
+ unscoped_esm2022_depset = dep[JSEcmaScriptModuleInfo].sources
unscoped_types_depset = dep[DeclarationInfo].transitive_declarations
# Note: Using `to_list()` is expensive but we cannot get around this here as
# we need to filter out generated files and need to be able to iterate through
- # JavaScript files in order to capture the `esm2020/` in the APF, and to be able
+ # JavaScript files in order to capture the `esm2022/` in the APF, and to be able
# to detect entry-point index files when no flat module metadata is available.
- unscoped_esm2020 = unscoped_esm2020_depset.to_list()
- unscoped_all_entry_point_esm2020.extend(unscoped_esm2020)
+ unscoped_esm2022 = unscoped_esm2022_depset.to_list()
+ unscoped_all_entry_point_esm2022.extend(unscoped_esm2022)
# Extract the "module_name" from either "ts_library" or "ng_module". Both
# set the "module_name" in the provider struct.
@@ -349,14 +346,14 @@ def _ng_package_impl(ctx):
# the "ng_module" rule.
ng_module_metadata = dep.angular.flat_module_metadata
module_name = ng_module_metadata.module_name
- es2020_entry_point = ng_module_metadata.flat_module_out_prodmode_file
+ es2022_entry_point = ng_module_metadata.flat_module_out_prodmode_file
typings_entry_point = ng_module_metadata.typings_file
guessed_paths = False
_debug(
ctx.var,
"entry-point %s is built using a flat module bundle." % dep,
- "using %s as main file of the entry-point" % es2020_entry_point,
+ "using %s as main file of the entry-point" % es2022_entry_point,
)
else:
_debug(
@@ -373,13 +370,12 @@ def _ng_package_impl(ctx):
# In case the dependency is built through the "ts_library" rule, or the "ng_module"
# rule does not generate a flat module bundle, we determine the index file and
# typings entry-point through the most reasonable defaults (i.e. "package/index").
- es2020_entry_point = _find_matching_file(unscoped_esm2020, "%s/index.mjs" % entry_point_package)
+ es2022_entry_point = _find_matching_file(unscoped_esm2022, "%s/index.mjs" % entry_point_package)
typings_entry_point = _find_matching_file(unscoped_types, "%s/index.d.ts" % entry_point_package)
guessed_paths = True
bundle_name = "%s.mjs" % (primary_bundle_name if is_primary_entry_point else entry_point)
- fesm2020_file = ctx.actions.declare_file("fesm2020/%s" % bundle_name)
- fesm2015_file = ctx.actions.declare_file("fesm2015/%s" % bundle_name)
+ fesm2022_file = ctx.actions.declare_file("fesm2022/%s" % bundle_name)
# By default, we will bundle the typings entry-point, unless explicitly opted-out
# through the `skip_type_bundling` rule attribute.
@@ -408,52 +404,38 @@ def _ng_package_impl(ctx):
# can be later passed to the packager as a manifest.
collected_entry_points.append(struct(
module_name = module_name,
- es2020_entry_point = es2020_entry_point,
- fesm2020_file = fesm2020_file,
- fesm2015_file = fesm2015_file,
+ es2022_entry_point = es2022_entry_point,
+ fesm2022_file = fesm2022_file,
typings_file = typings_file,
guessed_paths = guessed_paths,
))
- # Note: For creating the bundles, we use all the ESM2020 sources that have been
+ # Note: For creating the bundles, we use all the ESM2022 sources that have been
# collected from the dependencies. This allows for bundling of code that is not
# necessarily part of the owning package (with respect to the `externals` attribute)
- rollup_inputs = unscoped_esm2020_depset
- esm2020_config = _write_rollup_config(ctx, ctx.bin_dir.path, filename = "_%s.rollup_esm2020.conf.js")
- esm2015_config = _write_rollup_config(ctx, ctx.bin_dir.path, filename = "_%s.rollup_esm2015.conf.js", downlevel_to_es2015 = True)
+ rollup_inputs = unscoped_esm2022_depset
+ esm2022_config = _write_rollup_config(ctx, ctx.bin_dir.path, filename = "_%s.rollup_esm2022.conf.js")
- fesm2020.extend(
+ fesm2022.extend(
_run_rollup(
ctx,
- "fesm2020",
- esm2020_config,
- es2020_entry_point,
+ "fesm2022",
+ esm2022_config,
+ es2022_entry_point,
rollup_inputs,
- fesm2020_file,
+ fesm2022_file,
format = "esm",
),
)
- fesm2015.extend(
- _run_rollup(
- ctx,
- "fesm2015",
- esm2015_config,
- es2020_entry_point,
- rollup_inputs,
- fesm2015_file,
- format = "esm",
- ),
- )
-
- # Filter ESM2020 JavaScript inputs to files which are part of the owning package. The
+ # Filter ESM2022 JavaScript inputs to files which are part of the owning package. The
# packager should not copy external files into the package.
- esm2020 = _filter_esm_files_to_include(unscoped_all_entry_point_esm2020, owning_package)
+ esm2022 = _filter_esm_files_to_include(unscoped_all_entry_point_esm2022, owning_package)
packager_inputs = (
static_files +
type_files +
- fesm2020 + esm2020 + fesm2015
+ fesm2022 + esm2022
)
packager_args = ctx.actions.args()
@@ -470,9 +452,8 @@ def _ng_package_impl(ctx):
# The captured properties need to match the `EntryPointInfo` interface
# in the packager executable tool.
metadata_arg[m.module_name] = {
- "index": _serialize_file(m.es2020_entry_point),
- "fesm2020Bundle": _serialize_file(m.fesm2020_file),
- "fesm2015Bundle": _serialize_file(m.fesm2015_file),
+ "index": _serialize_file(m.es2022_entry_point),
+ "fesm2022Bundle": _serialize_file(m.fesm2022_file),
"typings": _serialize_file(m.typings_file),
# If the paths for that entry-point were guessed (e.g. "ts_library" rule or
# "ng_module" without flat module bundle), we pass this information to the packager.
@@ -494,9 +475,8 @@ def _ng_package_impl(ctx):
# placeholder
packager_args.add("")
- packager_args.add(_serialize_files_for_arg(fesm2020))
- packager_args.add(_serialize_files_for_arg(esm2020))
- packager_args.add(_serialize_files_for_arg(fesm2015))
+ packager_args.add(_serialize_files_for_arg(fesm2022))
+ packager_args.add(_serialize_files_for_arg(esm2022))
packager_args.add(_serialize_files_for_arg(static_files))
packager_args.add(_serialize_files_for_arg(type_files))
@@ -540,7 +520,7 @@ _NG_PACKAGE_DEPS_ASPECTS = [ng_package_module_mappings_aspect, node_modules_aspe
_NG_PACKAGE_ATTRS = dict(PKG_NPM_ATTRS, **{
"srcs": attr.label_list(
doc = """JavaScript source files from the workspace.
- These can use ES2020 syntax and ES Modules (import/export)""",
+ These can use ES2022 syntax and ES Modules (import/export)""",
cfg = partial_compilation_transition,
allow_files = True,
),
diff --git a/packages/bazel/src/ng_package/packager.ts b/packages/bazel/src/ng_package/packager.ts
index e45fe6a9b7f6..991784b7ded3 100644
--- a/packages/bazel/src/ng_package/packager.ts
+++ b/packages/bazel/src/ng_package/packager.ts
@@ -22,12 +22,10 @@ interface BazelFileInfo {
/** Interface describing an entry-point. */
interface EntryPointInfo {
- /** ES2020 index file for the APF entry-point. */
+ /** ES2022 index file for the APF entry-point. */
index: BazelFileInfo;
- /** Flat ES2020 ES module bundle file. */
- fesm2020Bundle: BazelFileInfo;
- /** Flat ES2015 ES module bundle file. */
- fesm2015Bundle: BazelFileInfo;
+ /** Flat ES2022 ES module bundle file. */
+ fesm2022Bundle: BazelFileInfo;
/** Index type definition file for the APF entry-point. */
typings: BazelFileInfo;
/**
@@ -52,12 +50,10 @@ interface PackageMetadata {
*/
const knownFormatPackageJsonFormatFields = [
'main',
- 'fesm2020',
- 'esm2020',
- 'es2020',
+ 'esm2022',
+ 'esm',
'typings',
'module',
- 'fesm2015',
] as const;
/** Union type matching known `package.json` format fields. */
@@ -68,11 +64,9 @@ type KnownPackageJsonFormatFields = typeof knownFormatPackageJsonFormatFields[nu
* https://nodejs.org/api/packages.html#packages_conditional_exports
*/
type ConditionalExport = {
- node?: string;
types?: string;
- esm2020?: string;
- es2020?: string;
- es2015?: string;
+ esm2022?: string;
+ esm?: string;
default?: string;
};
@@ -114,14 +108,11 @@ function main(args: string[]): void {
// Path to the package's README.md.
readmeMd,
- // List of rolled-up flat ES2020 modules
- fesm2020Arg,
+ // List of rolled-up flat ES2022 modules
+ fesm2022Arg,
- // List of individual ES2020 modules
- esm2020Arg,
-
- // List of rolled-up flat ES2015 modules
- fesm2015Arg,
+ // List of individual ES2022 modules
+ esm2022Arg,
// List of static files that should be copied into the package.
staticFilesArg,
@@ -130,9 +121,8 @@ function main(args: string[]): void {
typeDefinitionsArg,
] = params;
- const fesm2020 = JSON.parse(fesm2020Arg) as BazelFileInfo[];
- const esm2020 = JSON.parse(esm2020Arg) as BazelFileInfo[];
- const fesm2015 = JSON.parse(fesm2015Arg) as BazelFileInfo[];
+ const fesm2022 = JSON.parse(fesm2022Arg) as BazelFileInfo[];
+ const esm2022 = JSON.parse(esm2022Arg) as BazelFileInfo[];
const typeDefinitions = JSON.parse(typeDefinitionsArg) as BazelFileInfo[];
const staticFiles = JSON.parse(staticFilesArg) as BazelFileInfo[];
const metadata = JSON.parse(metadataArg) as PackageMetadata;
@@ -178,31 +168,31 @@ function main(args: string[]): void {
return path.relative(owningPackageName, file.shortPath);
}
- /** Writes an ESM file into the `esm2020` output directory. */
- function writeEsm2020File(file: BazelFileInfo) {
+ /** Writes an ESM file into the `esm2022` output directory. */
+ function writeEsm2022File(file: BazelFileInfo) {
// Note: files which do not belong to the owning package of this `ng_package` are omitted.
// this prevents us from accidentally bringing in transitive node module dependencies.
const packageRelativePath = getOwningPackageRelativePath(file);
if (!packageRelativePath.startsWith('..')) {
- copyFile(file.path, getEsm2020OutputRelativePath(file));
+ copyFile(file.path, getEsm2022OutputRelativePath(file));
}
}
/** Gets the output-relative path where the given flat ESM file should be written to. */
function getFlatEsmOutputRelativePath(file: BazelFileInfo) {
// Flat ESM files should be put into their owning package relative sub-path. e.g. if
- // there is a bundle in `packages/animations/fesm2020/browser/testing.mjs` then we
- // want the bundle to be stored in `fesm2020/browser/testing.mjs`. Same thing applies
- // for the `fesm2015` bundles. The directory name for `fesm` is already declared as
+ // there is a bundle in `packages/animations/fesm2022/browser/testing.mjs` then we
+ // want the bundle to be stored in `fesm2022/browser/testing.mjs`. Same thing applies
+ // for the `fesm2022` bundles. The directory name for `fesm` is already declared as
// part of the Bazel action generating these files. See `ng_package.bzl`.
return getOwningPackageRelativePath(file);
}
- /** Gets the output-relative path where a non-flat ESM2020 file should be written to. */
- function getEsm2020OutputRelativePath(file: BazelFileInfo) {
- // Path computed relative to the current package in bazel-bin. e.g. a ES2020 output file
- // in `bazel-out/<..>/packages/core/src/di.mjs` should be stored in `esm2020/src/di.mjs`.
- return path.join('esm2020', getOwningPackageRelativePath(file));
+ /** Gets the output-relative path where a non-flat ESM2022 file should be written to. */
+ function getEsm2022OutputRelativePath(file: BazelFileInfo) {
+ // Path computed relative to the current package in bazel-bin. e.g. a ES2022 output file
+ // in `bazel-out/<..>/packages/core/src/di.mjs` should be stored in `esm2022/src/di.mjs`.
+ return path.join('esm2022', getOwningPackageRelativePath(file));
}
/** Gets the output-relative path where the typing file is being written to. */
@@ -232,11 +222,10 @@ function main(args: string[]): void {
return getEntryPointSubpath(moduleName) !== '';
}
- esm2020.forEach(file => writeEsm2020File(file));
+ esm2022.forEach(file => writeEsm2022File(file));
// Copy all FESM files into the package output.
- fesm2020.forEach(f => copyFile(f.path, getFlatEsmOutputRelativePath(f)));
- fesm2015.forEach(f => copyFile(f.path, getFlatEsmOutputRelativePath(f)));
+ fesm2022.forEach(f => copyFile(f.path, getFlatEsmOutputRelativePath(f)));
// Copy all type definitions into the package, preserving the sub-path from the
// owning package. e.g. a file like `packages/animations/browser/__index.d.ts` will
@@ -330,25 +319,14 @@ function main(args: string[]): void {
return packageJson;
}
- const fesm2020RelativeOutPath = getFlatEsmOutputRelativePath(entryPointInfo.fesm2020Bundle);
- const fesm2015RelativeOutPath = getFlatEsmOutputRelativePath(entryPointInfo.fesm2015Bundle);
- const esm2020RelativeOutPath = getEsm2020OutputRelativePath(entryPointInfo.index);
+ const fesm2022RelativeOutPath = getFlatEsmOutputRelativePath(entryPointInfo.fesm2022Bundle);
const typingsRelativeOutPath = getTypingOutputRelativePath(entryPointInfo.typings);
- packageJson.fesm2020 =
- normalizePath(path.relative(packageJsonContainingDir, fesm2020RelativeOutPath));
- packageJson.fesm2015 =
- normalizePath(path.relative(packageJsonContainingDir, fesm2015RelativeOutPath));
- packageJson.esm2020 =
- normalizePath(path.relative(packageJsonContainingDir, esm2020RelativeOutPath));
+ packageJson.module =
+ normalizePath(path.relative(packageJsonContainingDir, fesm2022RelativeOutPath));
packageJson.typings =
normalizePath(path.relative(packageJsonContainingDir, typingsRelativeOutPath));
- // For now, we point the primary entry points at the fesm files, because of Webpack
- // performance issues with a large number of individual files.
- packageJson.module = packageJson.fesm2015;
- packageJson.es2020 = packageJson.fesm2020;
-
return packageJson;
}
@@ -376,29 +354,19 @@ function main(args: string[]): void {
for (const [moduleName, entryPoint] of Object.entries(metadata.entryPoints)) {
const subpath =
isSecondaryEntryPoint(moduleName) ? `./${getEntryPointSubpath(moduleName)}` : '.';
- const esm2020IndexOutRelativePath = getEsm2020OutputRelativePath(entryPoint.index);
- const fesm2020OutRelativePath = getFlatEsmOutputRelativePath(entryPoint.fesm2020Bundle);
- const fesm2015OutRelativePath = getFlatEsmOutputRelativePath(entryPoint.fesm2015Bundle);
+ const esmIndexOutRelativePath = getEsm2022OutputRelativePath(entryPoint.index);
+ const fesm2022OutRelativePath = getFlatEsmOutputRelativePath(entryPoint.fesm2022Bundle);
const typesOutRelativePath = getTypingOutputRelativePath(entryPoint.typings);
- // Insert the export mapping for the entry-point. We set `default` to the FESM 2020
+ // Insert the export mapping for the entry-point. We set `default` to the FESM 2022
// output, and also set the `types` condition which will be respected by TS 4.5.
// https://github.com/microsoft/TypeScript/pull/45884.
insertExportMappingOrError(newPackageJson, subpath, {
types: normalizePath(typesOutRelativePath),
- esm2020: normalizePath(esm2020IndexOutRelativePath),
- es2020: normalizePath(fesm2020OutRelativePath),
- // We also expose a non-standard condition that would allow consumers to resolve
- // to the `ES2015` output outside of NodeJS, if desired.
- // TODO(devversion): remove/replace this if NodeJS v12 is no longer supported.
- es2015: normalizePath(fesm2015OutRelativePath),
- // We declare the `node` condition and point to the ES2015 output as we currently still
- // support NodeJS v12 which does not fully support ES2020 output. We chose ES2015 over
- // ES2020 because we wan async/await downleveled as this allows for patching withZoneJS.
- // TODO(devversion): remove/replace this if NodeJS v12 is no longer supported.
- node: normalizePath(fesm2015OutRelativePath),
+ esm2022: normalizePath(esmIndexOutRelativePath),
+ esm: normalizePath(esmIndexOutRelativePath),
// Note: The default conditions needs to be the last one.
- default: normalizePath(fesm2020OutRelativePath),
+ default: normalizePath(fesm2022OutRelativePath),
});
}
diff --git a/packages/bazel/src/ng_package/rollup.config.js b/packages/bazel/src/ng_package/rollup.config.js
index 75aba638577a..122a9cef0599 100644
--- a/packages/bazel/src/ng_package/rollup.config.js
+++ b/packages/bazel/src/ng_package/rollup.config.js
@@ -15,7 +15,6 @@ const MagicString = require('magic-string');
const sourcemaps = require('rollup-plugin-sourcemaps');
const path = require('path');
const fs = require('fs');
-const ts = require('typescript');
function log_verbose(...m) {
// This is a template file so we use __filename to output the actual filename
@@ -26,7 +25,6 @@ const workspaceName = 'TMPL_workspace_name';
const rootDir = 'TMPL_root_dir';
const bannerFile = TMPL_banner_file;
const moduleMappings = TMPL_module_mappings;
-const downlevelToES2015 = TMPL_downlevel_to_es2015;
const nodeModulesRoot = 'TMPL_node_modules_root';
log_verbose(`running with
@@ -136,28 +134,6 @@ if (bannerFile) {
bannerContent = fs.readFileSync(bannerFile, {encoding: 'utf-8'});
}
-// Transform that is enabled for ES2015 FESM generation. It transforms existing ES2020
-// prodmode output to ES2015 so that we can generate the ES2015 flat ESM bundle.
-const downlevelToES2015Plugin = {
- name: 'downlevel-to-es2015',
- transform: (code, filePath) => {
- const compilerOptions = {
- target: ts.ScriptTarget.ES2015,
- module: ts.ModuleKind.ES2015,
- allowJs: true,
- sourceMap: true,
- downlevelIteration: true,
- importHelpers: true,
- mapRoot: path.dirname(filePath),
- };
- const {outputText, sourceMapText} = ts.transpileModule(code, {compilerOptions});
- return {
- code: outputText,
- map: JSON.parse(sourceMapText),
- };
- },
-};
-
/** Removed license banners from input files. */
const stripBannerPlugin = {
name: 'strip-license-banner',
@@ -196,11 +172,6 @@ const plugins = [
sourcemaps(),
];
-// If downleveling to ES2015 is enabled, set up the downlevel rollup plugin.
-if (downlevelToES2015) {
- plugins.push(downlevelToES2015Plugin);
-}
-
const config = {
plugins,
external: [TMPL_external],
diff --git a/packages/bazel/test/ng_package/common_package.spec.ts b/packages/bazel/test/ng_package/common_package.spec.ts
index 26c81e1066be..cb7706ef8435 100644
--- a/packages/bazel/test/ng_package/common_package.spec.ts
+++ b/packages/bazel/test/ng_package/common_package.spec.ts
@@ -46,28 +46,26 @@ describe('@angular/common ng_package', () => {
'upgrade.mjs',
'upgrade.mjs.map',
];
- expect(shx.ls('-R', 'fesm2015').stdout.split('\n').filter(n => !!n).sort()).toEqual(expected);
- expect(shx.ls('-R', 'fesm2020').stdout.split('\n').filter(n => !!n).sort()).toEqual(expected);
+ expect(shx.ls('-R', 'fesm2022').stdout.split('\n').filter(n => !!n).sort()).toEqual(expected);
});
it('should have the correct source map paths', () => {
- expect(shx.grep('sourceMappingURL', 'fesm2020/common.mjs'))
+ expect(shx.grep('sourceMappingURL', 'fesm2022/common.mjs'))
.toMatch('//# sourceMappingURL=common.mjs.map');
- expect(shx.grep('sourceMappingURL', 'fesm2020/http.mjs'))
+ expect(shx.grep('sourceMappingURL', 'fesm2022/http.mjs'))
.toMatch('//# sourceMappingURL=http.mjs.map');
- expect(shx.grep('sourceMappingURL', 'fesm2020/http/testing.mjs'))
+ expect(shx.grep('sourceMappingURL', 'fesm2022/http/testing.mjs'))
.toMatch('//# sourceMappingURL=testing.mjs.map');
- expect(shx.grep('sourceMappingURL', 'fesm2020/testing.mjs'))
+ expect(shx.grep('sourceMappingURL', 'fesm2022/testing.mjs'))
.toMatch('//# sourceMappingURL=testing.mjs.map');
- expect(shx.grep('sourceMappingURL', 'fesm2020/upgrade.mjs'))
+ expect(shx.grep('sourceMappingURL', 'fesm2022/upgrade.mjs'))
.toMatch('//# sourceMappingURL=upgrade.mjs.map');
});
describe('should have module resolution properties in the package.json file for', () => {
interface PackageJson {
main: string;
- fesm2015: string;
- es2020: string;
+ es2022: string;
module: string;
typings: string;
exports: object;
@@ -78,11 +76,7 @@ describe('@angular/common ng_package', () => {
JSON.parse(fs.readFileSync('package.json', {encoding: 'utf-8'})) as PackageJson;
expect(actual).toEqual(jasmine.objectContaining({
- module: `./fesm2015/common.mjs`,
- es2020: `./fesm2020/common.mjs`,
- esm2020: `./esm2020/common.mjs`,
- fesm2020: `./fesm2020/common.mjs`,
- fesm2015: `./fesm2015/common.mjs`,
+ module: `./fesm2022/common.mjs`,
typings: `./index.d.ts`,
exports: matchesObjectWithOrder({
'./locales/global/*': {default: './locales/global/*.js'},
@@ -90,43 +84,33 @@ describe('@angular/common ng_package', () => {
'./package.json': {default: './package.json'},
'.': {
types: './index.d.ts',
- esm2020: './esm2020/common.mjs',
- es2020: './fesm2020/common.mjs',
- es2015: './fesm2015/common.mjs',
- node: './fesm2015/common.mjs',
- default: './fesm2020/common.mjs'
+ esm2022: './esm2022/common.mjs',
+ esm: './esm2022/common.mjs',
+ default: './fesm2022/common.mjs'
},
'./http': {
types: './http/index.d.ts',
- esm2020: './esm2020/http/http.mjs',
- es2020: './fesm2020/http.mjs',
- es2015: './fesm2015/http.mjs',
- node: './fesm2015/http.mjs',
- default: './fesm2020/http.mjs'
+ esm2022: './esm2022/http/http.mjs',
+ esm: './esm2022/http/http.mjs',
+ default: './fesm2022/http.mjs'
},
'./http/testing': {
types: './http/testing/index.d.ts',
- esm2020: './esm2020/http/testing/testing.mjs',
- es2020: './fesm2020/http/testing.mjs',
- es2015: './fesm2015/http/testing.mjs',
- node: './fesm2015/http/testing.mjs',
- default: './fesm2020/http/testing.mjs'
+ esm2022: './esm2022/http/testing/testing.mjs',
+ esm: './esm2022/http/testing/testing.mjs',
+ default: './fesm2022/http/testing.mjs'
},
'./testing': {
types: './testing/index.d.ts',
- esm2020: './esm2020/testing/testing.mjs',
- es2020: './fesm2020/testing.mjs',
- es2015: './fesm2015/testing.mjs',
- node: './fesm2015/testing.mjs',
- default: './fesm2020/testing.mjs'
+ esm2022: './esm2022/testing/testing.mjs',
+ esm: './esm2022/testing/testing.mjs',
+ default: './fesm2022/testing.mjs'
},
'./upgrade': {
types: './upgrade/index.d.ts',
- esm2020: './esm2020/upgrade/upgrade.mjs',
- es2020: './fesm2020/upgrade.mjs',
- es2015: './fesm2015/upgrade.mjs',
- node: './fesm2015/upgrade.mjs',
- default: './fesm2020/upgrade.mjs'
+ esm2022: './esm2022/upgrade/upgrade.mjs',
+ esm: './esm2022/upgrade/upgrade.mjs',
+ default: './fesm2022/upgrade.mjs'
}
}),
}));
diff --git a/packages/bazel/test/ng_package/core_package.spec.ts b/packages/bazel/test/ng_package/core_package.spec.ts
index 1c4f4b021137..7ed7e3d5bc6c 100644
--- a/packages/bazel/test/ng_package/core_package.spec.ts
+++ b/packages/bazel/test/ng_package/core_package.spec.ts
@@ -54,30 +54,22 @@ describe('@angular/core ng_package', () => {
it('should contain module resolution mappings', () => {
const data = JSON.parse(shx.cat(packageJson)) as any;
expect(data).toEqual(jasmine.objectContaining({
- module: `./fesm2015/core.mjs`,
- es2020: `./fesm2020/core.mjs`,
- esm2020: `./esm2020/core.mjs`,
- fesm2020: `./fesm2020/core.mjs`,
- fesm2015: `./fesm2015/core.mjs`,
+ module: `./fesm2022/core.mjs`,
typings: `./index.d.ts`,
exports: matchesObjectWithOrder({
'./schematics/*': {default: './schematics/*.js'},
'./package.json': {default: './package.json'},
'.': {
types: './index.d.ts',
- esm2020: './esm2020/core.mjs',
- es2020: './fesm2020/core.mjs',
- es2015: './fesm2015/core.mjs',
- node: './fesm2015/core.mjs',
- default: './fesm2020/core.mjs'
+ esm2022: './esm2022/core.mjs',
+ esm: './esm2022/core.mjs',
+ default: './fesm2022/core.mjs'
},
'./testing': {
types: './testing/index.d.ts',
- esm2020: './esm2020/testing/testing.mjs',
- es2020: './fesm2020/testing.mjs',
- es2015: './fesm2015/testing.mjs',
- node: './fesm2015/testing.mjs',
- default: './fesm2020/testing.mjs'
+ esm2022: './esm2022/testing/testing.mjs',
+ esm: './esm2022/testing/testing.mjs',
+ default: './fesm2022/testing.mjs'
}
}),
}));
@@ -109,45 +101,29 @@ describe('@angular/core ng_package', () => {
});
});
- describe('fesm2020', () => {
- it('should have a fesm2020 file in the /fesm2020 directory', () => {
- expect(shx.cat('fesm2020/core.mjs')).toContain(`export {`);
+ describe('fesm2022', () => {
+ it('should have a fesm2022 file in the /fesm2022 directory', () => {
+ expect(shx.cat('fesm2022/core.mjs')).toContain(`export {`);
});
it('should have a source map', () => {
- expect(shx.cat('fesm2020/core.mjs.map'))
+ expect(shx.cat('fesm2022/core.mjs.map'))
.toContain(`{"version":3,"file":"core.mjs","sources":`);
});
it('should have the version info in the header', () => {
- expect(shx.cat('fesm2020/core.mjs'))
+ expect(shx.cat('fesm2022/core.mjs'))
.toMatch(/@license Angular v\d+\.\d+\.\d+(?!-PLACEHOLDER)/);
});
});
- describe('fesm2015', () => {
- it('should have a fesm2015 file in the /fesm2015 directory', () => {
- expect(shx.cat('fesm2015/core.mjs')).toContain(`export {`);
- });
-
- it('should have a source map', () => {
- expect(shx.cat('fesm2015/core.mjs.map'))
- .toContain(`{"version":3,"file":"core.mjs","sources":`);
- });
-
- it('should have the version info in the header', () => {
- expect(shx.cat('fesm2015/core.mjs'))
- .toMatch(/@license Angular v\d+\.\d+\.\d+(?!-PLACEHOLDER)/);
- });
- });
-
- describe('esm2020', () => {
+ describe('esm2022', () => {
it('should not contain any *.ngfactory.js files', () => {
- expect(shx.find('esm2020').filter(f => f.includes('.ngfactory'))).toEqual([]);
+ expect(shx.find('esm2022').filter(f => f.includes('.ngfactory'))).toEqual([]);
});
it('should not contain any *.ngsummary.js files', () => {
- expect(shx.find('esm2020').filter(f => f.includes('.ngsummary'))).toEqual([]);
+ expect(shx.find('esm2022').filter(f => f.includes('.ngsummary'))).toEqual([]);
});
});
});
@@ -160,34 +136,18 @@ describe('@angular/core ng_package', () => {
});
});
- describe('fesm2020', () => {
- it('should have a fesm2020 file in the /fesm2020 directory', () => {
- expect(shx.cat('fesm2020/testing.mjs')).toContain(`export {`);
- });
-
- it('should have a source map', () => {
- expect(shx.cat('fesm2020/testing.mjs.map'))
- .toContain(`{"version":3,"file":"testing.mjs","sources":`);
- });
-
- it('should have the version info in the header', () => {
- expect(shx.cat('fesm2020/testing.mjs'))
- .toMatch(/@license Angular v\d+\.\d+\.\d+(?!-PLACEHOLDER)/);
- });
- });
-
- describe('fesm2015', () => {
- it('should have a fesm105 file in the /fesm2015 directory', () => {
- expect(shx.cat('fesm2015/testing.mjs')).toContain(`export {`);
+ describe('fesm2022', () => {
+ it('should have a fesm2022 file in the /fesm2022 directory', () => {
+ expect(shx.cat('fesm2022/testing.mjs')).toContain(`export {`);
});
it('should have a source map', () => {
- expect(shx.cat('fesm2015/testing.mjs.map'))
+ expect(shx.cat('fesm2022/testing.mjs.map'))
.toContain(`{"version":3,"file":"testing.mjs","sources":`);
});
it('should have the version info in the header', () => {
- expect(shx.cat('fesm2015/testing.mjs'))
+ expect(shx.cat('fesm2022/testing.mjs'))
.toMatch(/@license Angular v\d+\.\d+\.\d+(?!-PLACEHOLDER)/);
});
});
diff --git a/packages/bazel/test/ng_package/example_package.golden b/packages/bazel/test/ng_package/example_package.golden
index f7c780ba5955..c93883f85b0a 100644
--- a/packages/bazel/test/ng_package/example_package.golden
+++ b/packages/bazel/test/ng_package/example_package.golden
@@ -5,42 +5,33 @@ a11y
arbitrary-npm-package-main.js
arbitrary_bin.txt
arbitrary_genfiles.txt
-esm2020
- esm2020/a11y
- esm2020/a11y/a11y.mjs
- esm2020/a11y/index.mjs
- esm2020/a11y/public-api.mjs
- esm2020/example.mjs
- esm2020/imports
- esm2020/imports/imports.mjs
- esm2020/imports/index.mjs
- esm2020/imports/public-api.mjs
- esm2020/imports/second.mjs
- esm2020/index.mjs
- esm2020/mymodule.mjs
- esm2020/secondary
- esm2020/secondary/index.mjs
- esm2020/secondary/secondary.mjs
- esm2020/secondary/secondarymodule.mjs
+esm2022
+ esm2022/a11y
+ esm2022/a11y/a11y.mjs
+ esm2022/a11y/index.mjs
+ esm2022/a11y/public-api.mjs
+ esm2022/example.mjs
+ esm2022/imports
+ esm2022/imports/imports.mjs
+ esm2022/imports/index.mjs
+ esm2022/imports/public-api.mjs
+ esm2022/imports/second.mjs
+ esm2022/index.mjs
+ esm2022/mymodule.mjs
+ esm2022/secondary
+ esm2022/secondary/index.mjs
+ esm2022/secondary/secondary.mjs
+ esm2022/secondary/secondarymodule.mjs
extra-styles.css
-fesm2015
- fesm2015/a11y.mjs
- fesm2015/a11y.mjs.map
- fesm2015/imports.mjs
- fesm2015/imports.mjs.map
- fesm2015/secondary.mjs
- fesm2015/secondary.mjs.map
- fesm2015/waffels.mjs
- fesm2015/waffels.mjs.map
-fesm2020
- fesm2020/a11y.mjs
- fesm2020/a11y.mjs.map
- fesm2020/imports.mjs
- fesm2020/imports.mjs.map
- fesm2020/secondary.mjs
- fesm2020/secondary.mjs.map
- fesm2020/waffels.mjs
- fesm2020/waffels.mjs.map
+fesm2022
+ fesm2022/a11y.mjs
+ fesm2022/a11y.mjs.map
+ fesm2022/imports.mjs
+ fesm2022/imports.mjs.map
+ fesm2022/secondary.mjs
+ fesm2022/secondary.mjs.map
+ fesm2022/waffels.mjs
+ fesm2022/waffels.mjs.map
imports
imports/index.d.ts
index.d.ts
@@ -109,7 +100,7 @@ World
Hello
---- esm2020/a11y/a11y.mjs ---
+--- esm2022/a11y/a11y.mjs ---
/**
* Generated bundle index. Do not edit.
@@ -117,7 +108,7 @@ Hello
export * from './index';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYTExeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlL2ExMXkvYTExeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUVILGNBQWMsU0FBUyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBHZW5lcmF0ZWQgYnVuZGxlIGluZGV4LiBEbyBub3QgZWRpdC5cbiAqL1xuXG5leHBvcnQgKiBmcm9tICcuL2luZGV4JztcbiJdfQ==
---- esm2020/a11y/index.mjs ---
+--- esm2022/a11y/index.mjs ---
/**
* @license
@@ -129,7 +120,7 @@ export * from './index';
export * from './public-api';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9iYXplbC90ZXN0L25nX3BhY2thZ2UvZXhhbXBsZS9hMTF5L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILGNBQWMsY0FBYyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmV4cG9ydCAqIGZyb20gJy4vcHVibGljLWFwaSc7XG4iXX0=
---- esm2020/a11y/public-api.mjs ---
+--- esm2022/a11y/public-api.mjs ---
/**
* @license
@@ -141,18 +132,18 @@ export * from './public-api';
import { NgModule } from '@angular/core';
import * as i0 from "@angular/core";
class A11yModule {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: A11yModule }); }
+ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule }); }
}
-A11yModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-A11yModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: A11yModule });
-A11yModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule });
export { A11yModule };
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule, decorators: [{
type: NgModule,
args: [{}]
}] });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljLWFwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlL2ExMXkvcHVibGljLWFwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDOztBQUV2QyxNQUNhLFVBQVU7O2tIQUFWLFVBQVU7bUhBQVYsVUFBVTttSEFBVixVQUFVO1NBQVYsVUFBVTtzR0FBVixVQUFVO2tCQUR0QixRQUFRO21CQUFDLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtOZ01vZHVsZX0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbkBOZ01vZHVsZSh7fSlcbmV4cG9ydCBjbGFzcyBBMTF5TW9kdWxlIHtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljLWFwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlL2ExMXkvcHVibGljLWFwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDOztBQUV2QyxNQUNhLFVBQVU7eUhBQVYsVUFBVTswSEFBVixVQUFVOzBIQUFWLFVBQVU7O1NBQVYsVUFBVTtzR0FBVixVQUFVO2tCQUR0QixRQUFRO21CQUFDLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtOZ01vZHVsZX0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbkBOZ01vZHVsZSh7fSlcbmV4cG9ydCBjbGFzcyBBMTF5TW9kdWxlIHtcbn1cbiJdfQ==
---- esm2020/example.mjs ---
+--- esm2022/example.mjs ---
/**
* Generated bundle index. Do not edit.
@@ -160,7 +151,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport
export * from './index';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhhbXBsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlL2V4YW1wbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFFSCxjQUFjLFNBQVMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogR2VuZXJhdGVkIGJ1bmRsZSBpbmRleC4gRG8gbm90IGVkaXQuXG4gKi9cblxuZXhwb3J0ICogZnJvbSAnLi9pbmRleCc7XG4iXX0=
---- esm2020/imports/imports.mjs ---
+--- esm2022/imports/imports.mjs ---
/**
* Generated bundle index. Do not edit.
@@ -168,7 +159,7 @@ export * from './index';
export * from './index';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1wb3J0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlL2ltcG9ydHMvaW1wb3J0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUVILGNBQWMsU0FBUyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBHZW5lcmF0ZWQgYnVuZGxlIGluZGV4LiBEbyBub3QgZWRpdC5cbiAqL1xuXG5leHBvcnQgKiBmcm9tICcuL2luZGV4JztcbiJdfQ==
---- esm2020/imports/index.mjs ---
+--- esm2022/imports/index.mjs ---
/**
* @license
@@ -180,7 +171,7 @@ export * from './index';
export * from './public-api';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9iYXplbC90ZXN0L25nX3BhY2thZ2UvZXhhbXBsZS9pbXBvcnRzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILGNBQWMsY0FBYyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmV4cG9ydCAqIGZyb20gJy4vcHVibGljLWFwaSc7XG4iXX0=
---- esm2020/imports/public-api.mjs ---
+--- esm2022/imports/public-api.mjs ---
/**
* @license
@@ -197,17 +188,17 @@ class MyService {
constructor(secondService) {
this.secondService = secondService;
}
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, deps: [{ token: i1.MySecondService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, providedIn: 'root' }); }
}
-MyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, deps: [{ token: i1.MySecondService }], target: i0.ɵɵFactoryTarget.Injectable });
-MyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, providedIn: 'root' });
export { MyService };
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, decorators: [{
type: Injectable,
args: [{ providedIn: 'root' }]
}], ctorParameters: function () { return [{ type: i1.MySecondService }]; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljLWFwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlL2ltcG9ydHMvcHVibGljLWFwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sRUFBQyxlQUFlLEVBQUMsTUFBTSxVQUFVLENBQUM7OztBQUV6QyxNQUNhLFNBQVM7SUFDcEIsWUFBbUIsYUFBOEI7UUFBOUIsa0JBQWEsR0FBYixhQUFhLENBQWlCO0lBQUcsQ0FBQzs7aUhBRDFDLFNBQVM7cUhBQVQsU0FBUyxjQURHLE1BQU07U0FDbEIsU0FBUztzR0FBVCxTQUFTO2tCQURyQixVQUFVO21CQUFDLEVBQUMsVUFBVSxFQUFFLE1BQU0sRUFBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge0luamVjdGFibGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtNeVNlY29uZFNlcnZpY2V9IGZyb20gJy4vc2Vjb25kJztcblxuQEluamVjdGFibGUoe3Byb3ZpZGVkSW46ICdyb290J30pXG5leHBvcnQgY2xhc3MgTXlTZXJ2aWNlIHtcbiAgY29uc3RydWN0b3IocHVibGljIHNlY29uZFNlcnZpY2U6IE15U2Vjb25kU2VydmljZSkge31cbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljLWFwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlL2ltcG9ydHMvcHVibGljLWFwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBQ3pDLE9BQU8sRUFBQyxlQUFlLEVBQUMsTUFBTSxVQUFVLENBQUM7OztBQUV6QyxNQUNhLFNBQVM7SUFDcEIsWUFBbUIsYUFBOEI7UUFBOUIsa0JBQWEsR0FBYixhQUFhLENBQWlCO0lBQUcsQ0FBQzt5SEFEMUMsU0FBUzs2SEFBVCxTQUFTLGNBREcsTUFBTTs7U0FDbEIsU0FBUztzR0FBVCxTQUFTO2tCQURyQixVQUFVO21CQUFDLEVBQUMsVUFBVSxFQUFFLE1BQU0sRUFBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge0luamVjdGFibGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtNeVNlY29uZFNlcnZpY2V9IGZyb20gJy4vc2Vjb25kJztcblxuQEluamVjdGFibGUoe3Byb3ZpZGVkSW46ICdyb290J30pXG5leHBvcnQgY2xhc3MgTXlTZXJ2aWNlIHtcbiAgY29uc3RydWN0b3IocHVibGljIHNlY29uZFNlcnZpY2U6IE15U2Vjb25kU2VydmljZSkge31cbn1cbiJdfQ==
---- esm2020/imports/second.mjs ---
+--- esm2022/imports/second.mjs ---
/**
* @license
@@ -219,17 +210,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport
import { Injectable } from '@angular/core';
import * as i0 from "@angular/core";
class MySecondService {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, providedIn: 'root' }); }
}
-MySecondService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-MySecondService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, providedIn: 'root' });
export { MySecondService };
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, decorators: [{
type: Injectable,
args: [{ providedIn: 'root' }]
}] });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vjb25kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYmF6ZWwvdGVzdC9uZ19wYWNrYWdlL2V4YW1wbGUvaW1wb3J0cy9zZWNvbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsT0FBTyxFQUFDLFVBQVUsRUFBQyxNQUFNLGVBQWUsQ0FBQzs7QUFFekMsTUFDYSxlQUFlOzt1SEFBZixlQUFlOzJIQUFmLGVBQWUsY0FESCxNQUFNO1NBQ2xCLGVBQWU7c0dBQWYsZUFBZTtrQkFEM0IsVUFBVTttQkFBQyxFQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQEluamVjdGFibGUoe3Byb3ZpZGVkSW46ICdyb290J30pXG5leHBvcnQgY2xhc3MgTXlTZWNvbmRTZXJ2aWNlIHtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vjb25kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYmF6ZWwvdGVzdC9uZ19wYWNrYWdlL2V4YW1wbGUvaW1wb3J0cy9zZWNvbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsT0FBTyxFQUFDLFVBQVUsRUFBQyxNQUFNLGVBQWUsQ0FBQzs7QUFFekMsTUFDYSxlQUFlO3lIQUFmLGVBQWU7NkhBQWYsZUFBZSxjQURILE1BQU07O1NBQ2xCLGVBQWU7c0dBQWYsZUFBZTtrQkFEM0IsVUFBVTttQkFBQyxFQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQEluamVjdGFibGUoe3Byb3ZpZGVkSW46ICdyb290J30pXG5leHBvcnQgY2xhc3MgTXlTZWNvbmRTZXJ2aWNlIHtcbn1cbiJdfQ==
---- esm2020/index.mjs ---
+--- esm2022/index.mjs ---
/**
* @license
@@ -241,7 +232,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport
export * from './mymodule';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9iYXplbC90ZXN0L25nX3BhY2thZ2UvZXhhbXBsZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxjQUFjLFlBQVksQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5leHBvcnQgKiBmcm9tICcuL215bW9kdWxlJztcbiJdfQ==
---- esm2020/mymodule.mjs ---
+--- esm2022/mymodule.mjs ---
/**
* @license
@@ -253,18 +244,18 @@ export * from './mymodule';
import { NgModule } from '@angular/core';
import * as i0 from "@angular/core";
class MyModule {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: MyModule }); }
+ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule }); }
}
-MyModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-MyModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: MyModule });
-MyModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule });
export { MyModule };
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule, decorators: [{
type: NgModule,
args: [{}]
}] });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXltb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9iYXplbC90ZXN0L25nX3BhY2thZ2UvZXhhbXBsZS9teW1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDOztBQUd2QyxNQUNhLFFBQVE7O2dIQUFSLFFBQVE7aUhBQVIsUUFBUTtpSEFBUixRQUFRO1NBQVIsUUFBUTtzR0FBUixRQUFRO2tCQURwQixRQUFRO21CQUFDLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtOZ01vZHVsZX0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge2F9IGZyb20gJy4vc2Vjb25kYXJ5L3NlY29uZGFyeW1vZHVsZSc7XG5cbkBOZ01vZHVsZSh7fSlcbmV4cG9ydCBjbGFzcyBNeU1vZHVsZSB7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXltb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9iYXplbC90ZXN0L25nX3BhY2thZ2UvZXhhbXBsZS9teW1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDOztBQUd2QyxNQUNhLFFBQVE7eUhBQVIsUUFBUTswSEFBUixRQUFROzBIQUFSLFFBQVE7O1NBQVIsUUFBUTtzR0FBUixRQUFRO2tCQURwQixRQUFRO21CQUFDLEVBQUUiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHtOZ01vZHVsZX0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge2F9IGZyb20gJy4vc2Vjb25kYXJ5L3NlY29uZGFyeW1vZHVsZSc7XG5cbkBOZ01vZHVsZSh7fSlcbmV4cG9ydCBjbGFzcyBNeU1vZHVsZSB7XG59XG4iXX0=
---- esm2020/secondary/index.mjs ---
+--- esm2022/secondary/index.mjs ---
/**
* @license
@@ -276,7 +267,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport
export * from './secondarymodule';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9iYXplbC90ZXN0L25nX3BhY2thZ2UvZXhhbXBsZS9zZWNvbmRhcnkvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsY0FBYyxtQkFBbUIsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5leHBvcnQgKiBmcm9tICcuL3NlY29uZGFyeW1vZHVsZSc7XG4iXX0=
---- esm2020/secondary/secondary.mjs ---
+--- esm2022/secondary/secondary.mjs ---
/**
* Generated bundle index. Do not edit.
@@ -284,7 +275,7 @@ export * from './secondarymodule';
export * from './index';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vjb25kYXJ5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYmF6ZWwvdGVzdC9uZ19wYWNrYWdlL2V4YW1wbGUvc2Vjb25kYXJ5L3NlY29uZGFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUVILGNBQWMsU0FBUyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBHZW5lcmF0ZWQgYnVuZGxlIGluZGV4LiBEbyBub3QgZWRpdC5cbiAqL1xuXG5leHBvcnQgKiBmcm9tICcuL2luZGV4JztcbiJdfQ==
---- esm2020/secondary/secondarymodule.mjs ---
+--- esm2022/secondary/secondarymodule.mjs ---
/**
* @license
@@ -296,17 +287,17 @@ export * from './index';
import { NgModule } from '@angular/core';
import * as i0 from "@angular/core";
class SecondaryModule {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule }); }
+ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule }); }
}
-SecondaryModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-SecondaryModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule });
-SecondaryModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule });
export { SecondaryModule };
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule, decorators: [{
type: NgModule,
args: [{}]
}] });
export const a = 1;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vjb25kYXJ5bW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYmF6ZWwvdGVzdC9uZ19wYWNrYWdlL2V4YW1wbGUvc2Vjb25kYXJ5L3NlY29uZGFyeW1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDOztBQUV2QyxNQUNhLGVBQWU7O3VIQUFmLGVBQWU7d0hBQWYsZUFBZTt3SEFBZixlQUFlO1NBQWYsZUFBZTtzR0FBZixlQUFlO2tCQUQzQixRQUFRO21CQUFDLEVBQUU7O0FBSVosTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge05nTW9kdWxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQE5nTW9kdWxlKHt9KVxuZXhwb3J0IGNsYXNzIFNlY29uZGFyeU1vZHVsZSB7XG59XG5cbmV4cG9ydCBjb25zdCBhID0gMTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vjb25kYXJ5bW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYmF6ZWwvdGVzdC9uZ19wYWNrYWdlL2V4YW1wbGUvc2Vjb25kYXJ5L3NlY29uZGFyeW1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDOztBQUV2QyxNQUNhLGVBQWU7eUhBQWYsZUFBZTswSEFBZixlQUFlOzBIQUFmLGVBQWU7O1NBQWYsZUFBZTtzR0FBZixlQUFlO2tCQUQzQixRQUFRO21CQUFDLEVBQUU7O0FBSVosTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge05nTW9kdWxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQE5nTW9kdWxlKHt9KVxuZXhwb3J0IGNsYXNzIFNlY29uZGFyeU1vZHVsZSB7XG59XG5cbmV4cG9ydCBjb25zdCBhID0gMTtcbiJdfQ==
--- extra-styles.css ---
@@ -315,7 +306,7 @@ export const a = 1;
}
---- fesm2015/a11y.mjs ---
+--- fesm2022/a11y.mjs ---
/**
* @license Angular v0.0.0
@@ -327,10 +318,10 @@ import * as i0 from '@angular/core';
import { NgModule } from '@angular/core';
class A11yModule {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: A11yModule }); }
+ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule }); }
}
-A11yModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-A11yModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: A11yModule });
-A11yModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule });
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule, decorators: [{
type: NgModule,
args: [{}]
@@ -344,7 +335,7 @@ export { A11yModule };
//# sourceMappingURL=a11y.mjs.map
---- fesm2015/imports.mjs ---
+--- fesm2022/imports.mjs ---
/**
* @license Angular v0.0.0
@@ -356,9 +347,9 @@ import * as i0 from '@angular/core';
import { Injectable } from '@angular/core';
class MySecondService {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, providedIn: 'root' }); }
}
-MySecondService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-MySecondService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, providedIn: 'root' });
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, decorators: [{
type: Injectable,
args: [{ providedIn: 'root' }]
@@ -368,9 +359,9 @@ class MyService {
constructor(secondService) {
this.secondService = secondService;
}
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, deps: [{ token: MySecondService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, providedIn: 'root' }); }
}
-MyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, deps: [{ token: MySecondService }], target: i0.ɵɵFactoryTarget.Injectable });
-MyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, providedIn: 'root' });
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, decorators: [{
type: Injectable,
args: [{ providedIn: 'root' }]
@@ -384,7 +375,7 @@ export { MyService };
//# sourceMappingURL=imports.mjs.map
---- fesm2015/secondary.mjs ---
+--- fesm2022/secondary.mjs ---
/**
* @license Angular v0.0.0
@@ -396,10 +387,10 @@ import * as i0 from '@angular/core';
import { NgModule } from '@angular/core';
class SecondaryModule {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule }); }
+ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule }); }
}
-SecondaryModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-SecondaryModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule });
-SecondaryModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule });
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule, decorators: [{
type: NgModule,
args: [{}]
@@ -414,7 +405,7 @@ export { SecondaryModule, a };
//# sourceMappingURL=secondary.mjs.map
---- fesm2015/waffels.mjs ---
+--- fesm2022/waffels.mjs ---
/**
* @license Angular v0.0.0
@@ -426,138 +417,10 @@ import * as i0 from '@angular/core';
import { NgModule } from '@angular/core';
class MyModule {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: MyModule }); }
+ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule }); }
}
-MyModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-MyModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: MyModule });
-MyModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule, decorators: [{
- type: NgModule,
- args: [{}]
- }] });
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { MyModule };
-//# sourceMappingURL=waffels.mjs.map
-
-
---- fesm2020/a11y.mjs ---
-
-/**
- * @license Angular v0.0.0
- * (c) 2010-2022 Google LLC. https://angular.io/
- * License: MIT
- */
-
-import * as i0 from '@angular/core';
-import { NgModule } from '@angular/core';
-
-class A11yModule {
-}
-A11yModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-A11yModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: A11yModule });
-A11yModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: A11yModule, decorators: [{
- type: NgModule,
- args: [{}]
- }] });
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { A11yModule };
-//# sourceMappingURL=a11y.mjs.map
-
-
---- fesm2020/imports.mjs ---
-
-/**
- * @license Angular v0.0.0
- * (c) 2010-2022 Google LLC. https://angular.io/
- * License: MIT
- */
-
-import * as i0 from '@angular/core';
-import { Injectable } from '@angular/core';
-
-class MySecondService {
-}
-MySecondService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-MySecondService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MySecondService, decorators: [{
- type: Injectable,
- args: [{ providedIn: 'root' }]
- }] });
-
-class MyService {
- constructor(secondService) {
- this.secondService = secondService;
- }
-}
-MyService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, deps: [{ token: MySecondService }], target: i0.ɵɵFactoryTarget.Injectable });
-MyService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyService, decorators: [{
- type: Injectable,
- args: [{ providedIn: 'root' }]
- }], ctorParameters: function () { return [{ type: MySecondService }]; } });
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { MyService };
-//# sourceMappingURL=imports.mjs.map
-
-
---- fesm2020/secondary.mjs ---
-
-/**
- * @license Angular v0.0.0
- * (c) 2010-2022 Google LLC. https://angular.io/
- * License: MIT
- */
-
-import * as i0 from '@angular/core';
-import { NgModule } from '@angular/core';
-
-class SecondaryModule {
-}
-SecondaryModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-SecondaryModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule });
-SecondaryModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: SecondaryModule, decorators: [{
- type: NgModule,
- args: [{}]
- }] });
-const a = 1;
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { SecondaryModule, a };
-//# sourceMappingURL=secondary.mjs.map
-
-
---- fesm2020/waffels.mjs ---
-
-/**
- * @license Angular v0.0.0
- * (c) 2010-2022 Google LLC. https://angular.io/
- * License: MIT
- */
-
-import * as i0 from '@angular/core';
-import { NgModule } from '@angular/core';
-
-class MyModule {
-}
-MyModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-MyModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: MyModule });
-MyModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule });
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: MyModule, decorators: [{
type: NgModule,
args: [{}]
@@ -630,46 +493,34 @@ export { }
".": {
"sass": "./_index.scss",
"types": "./index.d.ts",
- "esm2020": "./esm2020/example.mjs",
- "es2020": "./fesm2020/waffels.mjs",
- "es2015": "./fesm2015/waffels.mjs",
- "node": "./fesm2015/waffels.mjs",
- "default": "./fesm2020/waffels.mjs"
+ "esm2022": "./esm2022/example.mjs",
+ "esm": "./esm2022/example.mjs",
+ "default": "./fesm2022/waffels.mjs"
},
"./package.json": {
"default": "./package.json"
},
"./a11y": {
"types": "./a11y/index.d.ts",
- "esm2020": "./esm2020/a11y/a11y.mjs",
- "es2020": "./fesm2020/a11y.mjs",
- "es2015": "./fesm2015/a11y.mjs",
- "node": "./fesm2015/a11y.mjs",
- "default": "./fesm2020/a11y.mjs"
+ "esm2022": "./esm2022/a11y/a11y.mjs",
+ "esm": "./esm2022/a11y/a11y.mjs",
+ "default": "./fesm2022/a11y.mjs"
},
"./imports": {
"types": "./imports/index.d.ts",
- "esm2020": "./esm2020/imports/imports.mjs",
- "es2020": "./fesm2020/imports.mjs",
- "es2015": "./fesm2015/imports.mjs",
- "node": "./fesm2015/imports.mjs",
- "default": "./fesm2020/imports.mjs"
+ "esm2022": "./esm2022/imports/imports.mjs",
+ "esm": "./esm2022/imports/imports.mjs",
+ "default": "./fesm2022/imports.mjs"
},
"./secondary": {
"types": "./secondary/index.d.ts",
- "esm2020": "./esm2020/secondary/secondary.mjs",
- "es2020": "./fesm2020/secondary.mjs",
- "es2015": "./fesm2015/secondary.mjs",
- "node": "./fesm2015/secondary.mjs",
- "default": "./fesm2020/secondary.mjs"
+ "esm2022": "./esm2022/secondary/secondary.mjs",
+ "esm": "./esm2022/secondary/secondary.mjs",
+ "default": "./fesm2022/secondary.mjs"
}
},
- "fesm2020": "./fesm2020/waffels.mjs",
- "fesm2015": "./fesm2015/waffels.mjs",
- "esm2020": "./esm2020/example.mjs",
+ "module": "./fesm2022/waffels.mjs",
"typings": "./index.d.ts",
- "module": "./fesm2015/waffels.mjs",
- "es2020": "./fesm2020/waffels.mjs",
"type": "module"
}
diff --git a/packages/bazel/test/ng_package/example_with_ts_library_package.golden b/packages/bazel/test/ng_package/example_with_ts_library_package.golden
index 4cafc9d62a0d..af4491462491 100644
--- a/packages/bazel/test/ng_package/example_with_ts_library_package.golden
+++ b/packages/bazel/test/ng_package/example_with_ts_library_package.golden
@@ -1,27 +1,20 @@
README.md
-esm2020
- esm2020/index.mjs
- esm2020/portal
- esm2020/portal/index.mjs
- esm2020/portal/portal-module.mjs
- esm2020/portal/portal.mjs
- esm2020/utils
- esm2020/utils/index.mjs
- esm2020/utils/testing.mjs
-fesm2015
- fesm2015/example-with-ts-library.mjs
- fesm2015/example-with-ts-library.mjs.map
- fesm2015/portal.mjs
- fesm2015/portal.mjs.map
- fesm2015/utils.mjs
- fesm2015/utils.mjs.map
-fesm2020
- fesm2020/example-with-ts-library.mjs
- fesm2020/example-with-ts-library.mjs.map
- fesm2020/portal.mjs
- fesm2020/portal.mjs.map
- fesm2020/utils.mjs
- fesm2020/utils.mjs.map
+esm2022
+ esm2022/index.mjs
+ esm2022/portal
+ esm2022/portal/index.mjs
+ esm2022/portal/portal-module.mjs
+ esm2022/portal/portal.mjs
+ esm2022/utils
+ esm2022/utils/index.mjs
+ esm2022/utils/testing.mjs
+fesm2022
+ fesm2022/example-with-ts-library.mjs
+ fesm2022/example-with-ts-library.mjs.map
+ fesm2022/portal.mjs
+ fesm2022/portal.mjs.map
+ fesm2022/utils.mjs
+ fesm2022/utils.mjs.map
index.d.ts
package.json
portal
@@ -40,7 +33,7 @@ Usage information and reference details can be found in [Angular documentation](
License: MIT
---- esm2020/index.mjs ---
+--- esm2022/index.mjs ---
/**
* @license
@@ -52,7 +45,7 @@ License: MIT
export const VERSION = '0.0.0';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9iYXplbC90ZXN0L25nX3BhY2thZ2UvZXhhbXBsZS13aXRoLXRzLWxpYnJhcnkvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5leHBvcnQgY29uc3QgVkVSU0lPTiA9ICcwLjAuMCc7XG4iXX0=
---- esm2020/portal/index.mjs ---
+--- esm2022/portal/index.mjs ---
/**
* @license
@@ -64,7 +57,7 @@ export const VERSION = '0.0.0';
export * from './portal-module';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9iYXplbC90ZXN0L25nX3BhY2thZ2UvZXhhbXBsZS13aXRoLXRzLWxpYnJhcnkvcG9ydGFsL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILGNBQWMsaUJBQWlCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuZXhwb3J0ICogZnJvbSAnLi9wb3J0YWwtbW9kdWxlJztcbiJdfQ==
---- esm2020/portal/portal-module.mjs ---
+--- esm2022/portal/portal-module.mjs ---
/**
* @license
@@ -76,19 +69,19 @@ export * from './portal-module';
import { NgModule } from '@angular/core';
import * as i0 from "@angular/core";
class PortalModule {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: PortalModule }); }
+ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule }); }
}
-PortalModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-PortalModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: PortalModule });
-PortalModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule });
export { PortalModule };
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule, decorators: [{
type: NgModule,
args: [{}]
}] });
export const a = 1;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9ydGFsLW1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlLXdpdGgtdHMtbGlicmFyeS9wb3J0YWwvcG9ydGFsLW1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDOztBQUV2QyxNQUNhLFlBQVk7O29IQUFaLFlBQVk7cUhBQVosWUFBWTtxSEFBWixZQUFZO1NBQVosWUFBWTtzR0FBWixZQUFZO2tCQUR4QixRQUFRO21CQUFDLEVBQUU7O0FBSVosTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge05nTW9kdWxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQE5nTW9kdWxlKHt9KVxuZXhwb3J0IGNsYXNzIFBvcnRhbE1vZHVsZSB7XG59XG5cbmV4cG9ydCBjb25zdCBhID0gMTtcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9ydGFsLW1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlLXdpdGgtdHMtbGlicmFyeS9wb3J0YWwvcG9ydGFsLW1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDOztBQUV2QyxNQUNhLFlBQVk7eUhBQVosWUFBWTswSEFBWixZQUFZOzBIQUFaLFlBQVk7O1NBQVosWUFBWTtzR0FBWixZQUFZO2tCQUR4QixRQUFRO21CQUFDLEVBQUU7O0FBSVosTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQGxpY2Vuc2VcbiAqIENvcHlyaWdodCBHb29nbGUgTExDIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG4gKlxuICogVXNlIG9mIHRoaXMgc291cmNlIGNvZGUgaXMgZ292ZXJuZWQgYnkgYW4gTUlULXN0eWxlIGxpY2Vuc2UgdGhhdCBjYW4gYmVcbiAqIGZvdW5kIGluIHRoZSBMSUNFTlNFIGZpbGUgYXQgaHR0cHM6Ly9hbmd1bGFyLmlvL2xpY2Vuc2VcbiAqL1xuXG5pbXBvcnQge05nTW9kdWxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuQE5nTW9kdWxlKHt9KVxuZXhwb3J0IGNsYXNzIFBvcnRhbE1vZHVsZSB7XG59XG5cbmV4cG9ydCBjb25zdCBhID0gMTtcbiJdfQ==
---- esm2020/portal/portal.mjs ---
+--- esm2022/portal/portal.mjs ---
/**
* Generated bundle index. Do not edit.
@@ -96,7 +89,7 @@ export const a = 1;
export * from './index';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9ydGFsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYmF6ZWwvdGVzdC9uZ19wYWNrYWdlL2V4YW1wbGUtd2l0aC10cy1saWJyYXJ5L3BvcnRhbC9wb3J0YWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFFSCxjQUFjLFNBQVMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogR2VuZXJhdGVkIGJ1bmRsZSBpbmRleC4gRG8gbm90IGVkaXQuXG4gKi9cblxuZXhwb3J0ICogZnJvbSAnLi9pbmRleCc7XG4iXX0=
---- esm2020/utils/index.mjs ---
+--- esm2022/utils/index.mjs ---
/**
* @license
@@ -108,7 +101,7 @@ export * from './index';
export * from './testing';
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9iYXplbC90ZXN0L25nX3BhY2thZ2UvZXhhbXBsZS13aXRoLXRzLWxpYnJhcnkvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7OztHQU1HO0FBRUgsY0FBYyxXQUFXLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuZXhwb3J0ICogZnJvbSAnLi90ZXN0aW5nJztcbiJdfQ==
---- esm2020/utils/testing.mjs ---
+--- esm2022/utils/testing.mjs ---
/**
* @license
@@ -122,7 +115,7 @@ export function dispatchFakeEvent(el, ev) {
}
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2JhemVsL3Rlc3QvbmdfcGFja2FnZS9leGFtcGxlLXdpdGgtdHMtbGlicmFyeS91dGlscy90ZXN0aW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7R0FNRztBQUVILE1BQU0sVUFBVSxpQkFBaUIsQ0FBQyxFQUFlLEVBQUUsRUFBUztJQUMxRCxFQUFFLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQ3ZCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuZXhwb3J0IGZ1bmN0aW9uIGRpc3BhdGNoRmFrZUV2ZW50KGVsOiBIVE1MRWxlbWVudCwgZXY6IEV2ZW50KSB7XG4gIGVsLmRpc3BhdGNoRXZlbnQoZXYpO1xufVxuIl19
---- fesm2015/example-with-ts-library.mjs ---
+--- fesm2022/example-with-ts-library.mjs ---
/**
* @license Angular v0.0.0
@@ -136,7 +129,7 @@ export { VERSION };
//# sourceMappingURL=example-with-ts-library.mjs.map
---- fesm2015/portal.mjs ---
+--- fesm2022/portal.mjs ---
/**
* @license Angular v0.0.0
@@ -148,10 +141,10 @@ import * as i0 from '@angular/core';
import { NgModule } from '@angular/core';
class PortalModule {
+ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: PortalModule }); }
+ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule }); }
}
-PortalModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-PortalModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: PortalModule });
-PortalModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule });
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule, decorators: [{
type: NgModule,
args: [{}]
@@ -166,67 +159,7 @@ export { PortalModule, a };
//# sourceMappingURL=portal.mjs.map
---- fesm2015/utils.mjs ---
-
-/**
- * @license Angular v0.0.0
- * (c) 2010-2022 Google LLC. https://angular.io/
- * License: MIT
- */
-
-function dispatchFakeEvent(el, ev) {
- el.dispatchEvent(ev);
-}
-
-export { dispatchFakeEvent };
-//# sourceMappingURL=utils.mjs.map
-
-
---- fesm2020/example-with-ts-library.mjs ---
-
-/**
- * @license Angular v0.0.0
- * (c) 2010-2022 Google LLC. https://angular.io/
- * License: MIT
- */
-
-const VERSION = '0.0.0';
-
-export { VERSION };
-//# sourceMappingURL=example-with-ts-library.mjs.map
-
-
---- fesm2020/portal.mjs ---
-
-/**
- * @license Angular v0.0.0
- * (c) 2010-2022 Google LLC. https://angular.io/
- * License: MIT
- */
-
-import * as i0 from '@angular/core';
-import { NgModule } from '@angular/core';
-
-class PortalModule {
-}
-PortalModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-PortalModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "0.0.0", ngImport: i0, type: PortalModule });
-PortalModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0", ngImport: i0, type: PortalModule, decorators: [{
- type: NgModule,
- args: [{}]
- }] });
-const a = 1;
-
-/**
- * Generated bundle index. Do not edit.
- */
-
-export { PortalModule, a };
-//# sourceMappingURL=portal.mjs.map
-
-
---- fesm2020/utils.mjs ---
+--- fesm2022/utils.mjs ---
/**
* @license Angular v0.0.0
@@ -263,12 +196,8 @@ export { }
"name": "example-with-ts-library",
"version": "0.0.0",
"schematics": "Custom property that should be preserved.",
- "fesm2020": "./fesm2020/example-with-ts-library.mjs",
- "fesm2015": "./fesm2015/example-with-ts-library.mjs",
- "esm2020": "./esm2020/index.mjs",
+ "module": "./fesm2022/example-with-ts-library.mjs",
"typings": "./index.d.ts",
- "module": "./fesm2015/example-with-ts-library.mjs",
- "es2020": "./fesm2020/example-with-ts-library.mjs",
"type": "module",
"exports": {
"./package.json": {
@@ -276,27 +205,21 @@ export { }
},
".": {
"types": "./index.d.ts",
- "esm2020": "./esm2020/index.mjs",
- "es2020": "./fesm2020/example-with-ts-library.mjs",
- "es2015": "./fesm2015/example-with-ts-library.mjs",
- "node": "./fesm2015/example-with-ts-library.mjs",
- "default": "./fesm2020/example-with-ts-library.mjs"
+ "esm2022": "./esm2022/index.mjs",
+ "esm": "./esm2022/index.mjs",
+ "default": "./fesm2022/example-with-ts-library.mjs"
},
"./portal": {
"types": "./portal/index.d.ts",
- "esm2020": "./esm2020/portal/portal.mjs",
- "es2020": "./fesm2020/portal.mjs",
- "es2015": "./fesm2015/portal.mjs",
- "node": "./fesm2015/portal.mjs",
- "default": "./fesm2020/portal.mjs"
+ "esm2022": "./esm2022/portal/portal.mjs",
+ "esm": "./esm2022/portal/portal.mjs",
+ "default": "./fesm2022/portal.mjs"
},
"./utils": {
"types": "./utils/index.d.ts",
- "esm2020": "./esm2020/utils/index.mjs",
- "es2020": "./fesm2020/utils.mjs",
- "es2015": "./fesm2015/utils.mjs",
- "node": "./fesm2015/utils.mjs",
- "default": "./fesm2020/utils.mjs"
+ "esm2022": "./esm2022/utils/index.mjs",
+ "esm": "./esm2022/utils/index.mjs",
+ "default": "./fesm2022/utils.mjs"
}
}
}
diff --git a/packages/bazel/test/ngc-wrapped/ivy_enabled/ng_module_ivy_test.ts b/packages/bazel/test/ngc-wrapped/ivy_enabled/ng_module_ivy_test.ts
index 80c821bb9cf9..bec13badfce2 100644
--- a/packages/bazel/test/ngc-wrapped/ivy_enabled/ng_module_ivy_test.ts
+++ b/packages/bazel/test/ngc-wrapped/ivy_enabled/ng_module_ivy_test.ts
@@ -14,6 +14,6 @@ describe('ng_module with ivy enabled', () => {
const outputFile = runfiles.resolveWorkspaceRelative(
'packages/bazel/test/ngc-wrapped/ivy_enabled/test_module_default_compilation.mjs');
const fileContent = readFileSync(outputFile, 'utf8');
- expect(fileContent).toContain(`TestComponent.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent(`);
+ expect(fileContent).toContain(`static { this.ɵcmp = /*@__PURE__*/ i0.ɵɵdefineComponent`);
});
});
diff --git a/packages/benchpress/BUILD.bazel b/packages/benchpress/BUILD.bazel
index dd207fbce4eb..9378ac34eed2 100644
--- a/packages/benchpress/BUILD.bazel
+++ b/packages/benchpress/BUILD.bazel
@@ -10,6 +10,9 @@ ts_library(
"src/**/*.ts",
],
),
+ # TODO(alanagius) fix benchpress to compile with es2022
+ devmode_target = "es2020",
+ prodmode_target = "es2020",
deps = [
"//packages:types",
"//packages/core",
diff --git a/packages/benchpress/test/BUILD.bazel b/packages/benchpress/test/BUILD.bazel
index 7449f4f9d6bf..0642530a1a71 100644
--- a/packages/benchpress/test/BUILD.bazel
+++ b/packages/benchpress/test/BUILD.bazel
@@ -4,6 +4,9 @@ ts_library(
name = "test_lib",
testonly = True,
srcs = glob(["**/*.ts"]),
+ # TODO(alanagius) fix benchpress to compile with es2022
+ devmode_target = "es2020",
+ prodmode_target = "es2020",
deps = [
"//packages:types",
"//packages/benchpress",
diff --git a/packages/compiler-cli/src/ngtsc/annotations/component/src/handler.ts b/packages/compiler-cli/src/ngtsc/annotations/component/src/handler.ts
index f7aecf4f1da1..4796d26e109e 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/component/src/handler.ts
+++ b/packages/compiler-cli/src/ngtsc/annotations/component/src/handler.ts
@@ -60,7 +60,13 @@ export class ComponentDecoratorHandler implements
private injectableRegistry: InjectableClassRegistry,
private semanticDepGraphUpdater: SemanticDepGraphUpdater|null,
private annotateForClosureCompiler: boolean, private perf: PerfRecorder,
- private hostDirectivesResolver: HostDirectivesResolver) {}
+ private hostDirectivesResolver: HostDirectivesResolver) {
+ this.extractTemplateOptions = {
+ enableI18nLegacyMessageIdFormat: this.enableI18nLegacyMessageIdFormat,
+ i18nNormalizeLineEndingsInICUs: this.i18nNormalizeLineEndingsInICUs,
+ usePoisonedData: this.usePoisonedData,
+ };
+ }
private literalCache = new Map();
private elementSchemaRegistry = new DomElementSchemaRegistry();
@@ -73,10 +79,9 @@ export class ComponentDecoratorHandler implements
private preanalyzeTemplateCache = new Map();
private preanalyzeStylesCache = new Map();
- private extractTemplateOptions = {
- enableI18nLegacyMessageIdFormat: this.enableI18nLegacyMessageIdFormat,
- i18nNormalizeLineEndingsInICUs: this.i18nNormalizeLineEndingsInICUs,
- usePoisonedData: this.usePoisonedData,
+ private extractTemplateOptions: {
+ enableI18nLegacyMessageIdFormat: boolean; i18nNormalizeLineEndingsInICUs: boolean;
+ usePoisonedData: boolean;
};
readonly precedence = HandlerPrecedence.PRIMARY;
diff --git a/packages/compiler-cli/src/ngtsc/core/src/compiler.ts b/packages/compiler-cli/src/ngtsc/core/src/compiler.ts
index 59294edcee5f..b0c4c34dff0a 100644
--- a/packages/compiler-cli/src/ngtsc/core/src/compiler.ts
+++ b/packages/compiler-cli/src/ngtsc/core/src/compiler.ts
@@ -1265,8 +1265,12 @@ class ReferenceGraphAdapter implements ReferencesRegistry {
}
class NotifyingProgramDriverWrapper implements ProgramDriver {
+ getSourceFileVersion: ProgramDriver['getSourceFileVersion'];
+
constructor(
- private delegate: ProgramDriver, private notifyNewProgram: (program: ts.Program) => void) {}
+ private delegate: ProgramDriver, private notifyNewProgram: (program: ts.Program) => void) {
+ this.getSourceFileVersion = this.delegate.getSourceFileVersion?.bind(this);
+ }
get supportsInlineOperations() {
return this.delegate.supportsInlineOperations;
@@ -1280,8 +1284,6 @@ class NotifyingProgramDriverWrapper implements ProgramDriver {
this.delegate.updateFiles(contents, updateMode);
this.notifyNewProgram(this.delegate.getProgram());
}
-
- getSourceFileVersion = this.delegate.getSourceFileVersion?.bind(this);
}
function versionMapFromProgram(
diff --git a/packages/compiler-cli/src/ngtsc/core/src/host.ts b/packages/compiler-cli/src/ngtsc/core/src/host.ts
index 2856686ebae7..a9df5743fb6e 100644
--- a/packages/compiler-cli/src/ngtsc/core/src/host.ts
+++ b/packages/compiler-cli/src/ngtsc/core/src/host.ts
@@ -32,50 +32,81 @@ import {ExtendedTsCompilerHost, NgCompilerAdapter, NgCompilerOptions, UnifiedMod
*/
export class DelegatingCompilerHost implements
Omit, 'getSourceFile'|'fileExists'> {
- constructor(protected delegate: ExtendedTsCompilerHost) {}
+ createHash;
+ directoryExists;
+ fileNameToModuleName;
+ getCancellationToken;
+ getCanonicalFileName;
+ getCurrentDirectory;
+ getDefaultLibFileName;
+ getDefaultLibLocation;
+ getDirectories;
+ getEnvironmentVariable;
+ getModifiedResourceFiles;
+ getNewLine;
+ getParsedCommandLine;
+ getSourceFileByPath;
+ readDirectory;
+ readFile;
+ readResource;
+ transformResource;
+ realpath;
+ resolveModuleNames;
+ resolveTypeReferenceDirectives;
+ resourceNameToFileName;
+ trace;
+ useCaseSensitiveFileNames;
+ writeFile;
+ getModuleResolutionCache;
+ hasInvalidatedResolutions;
+ resolveModuleNameLiterals;
+ resolveTypeReferenceDirectiveReferences;
+
+ constructor(protected delegate: ExtendedTsCompilerHost) {
+ // Excluded are 'getSourceFile' and 'fileExists', which are actually implemented by
+ // NgCompilerHost
+ // below.
+ this.createHash = this.delegateMethod('createHash');
+ this.directoryExists = this.delegateMethod('directoryExists');
+ this.fileNameToModuleName = this.delegateMethod('fileNameToModuleName');
+ this.getCancellationToken = this.delegateMethod('getCancellationToken');
+ this.getCanonicalFileName = this.delegateMethod('getCanonicalFileName');
+ this.getCurrentDirectory = this.delegateMethod('getCurrentDirectory');
+ this.getDefaultLibFileName = this.delegateMethod('getDefaultLibFileName');
+ this.getDefaultLibLocation = this.delegateMethod('getDefaultLibLocation');
+ this.getDirectories = this.delegateMethod('getDirectories');
+ this.getEnvironmentVariable = this.delegateMethod('getEnvironmentVariable');
+ this.getModifiedResourceFiles = this.delegateMethod('getModifiedResourceFiles');
+ this.getNewLine = this.delegateMethod('getNewLine');
+ this.getParsedCommandLine = this.delegateMethod('getParsedCommandLine');
+ this.getSourceFileByPath = this.delegateMethod('getSourceFileByPath');
+ this.readDirectory = this.delegateMethod('readDirectory');
+ this.readFile = this.delegateMethod('readFile');
+ this.readResource = this.delegateMethod('readResource');
+ this.transformResource = this.delegateMethod('transformResource');
+ this.realpath = this.delegateMethod('realpath');
+ this.resolveModuleNames = this.delegateMethod('resolveModuleNames');
+ this.resolveTypeReferenceDirectives = this.delegateMethod('resolveTypeReferenceDirectives');
+ this.resourceNameToFileName = this.delegateMethod('resourceNameToFileName');
+ this.trace = this.delegateMethod('trace');
+ this.useCaseSensitiveFileNames = this.delegateMethod('useCaseSensitiveFileNames');
+ this.writeFile = this.delegateMethod('writeFile');
+ this.getModuleResolutionCache = this.delegateMethod('getModuleResolutionCache');
+ this.hasInvalidatedResolutions = this.delegateMethod('hasInvalidatedResolutions');
+ // The following methods are required in TS 5.0+, but they don't exist in earlier versions.
+ // TODO(crisbeto): remove the `ts-ignore` when dropping support for TypeScript 4.9.
+ // @ts-ignore
+ this.resolveModuleNameLiterals = this.delegateMethod('resolveModuleNameLiterals');
+ this.resolveTypeReferenceDirectiveReferences =
+ // @ts-ignore
+ this.delegateMethod('resolveTypeReferenceDirectiveReferences');
+ }
private delegateMethod(name: M):
ExtendedTsCompilerHost[M] {
return this.delegate[name] !== undefined ? (this.delegate[name] as any).bind(this.delegate) :
undefined;
}
-
- // Excluded are 'getSourceFile' and 'fileExists', which are actually implemented by NgCompilerHost
- // below.
- createHash = this.delegateMethod('createHash');
- directoryExists = this.delegateMethod('directoryExists');
- fileNameToModuleName = this.delegateMethod('fileNameToModuleName');
- getCancellationToken = this.delegateMethod('getCancellationToken');
- getCanonicalFileName = this.delegateMethod('getCanonicalFileName');
- getCurrentDirectory = this.delegateMethod('getCurrentDirectory');
- getDefaultLibFileName = this.delegateMethod('getDefaultLibFileName');
- getDefaultLibLocation = this.delegateMethod('getDefaultLibLocation');
- getDirectories = this.delegateMethod('getDirectories');
- getEnvironmentVariable = this.delegateMethod('getEnvironmentVariable');
- getModifiedResourceFiles = this.delegateMethod('getModifiedResourceFiles');
- getNewLine = this.delegateMethod('getNewLine');
- getParsedCommandLine = this.delegateMethod('getParsedCommandLine');
- getSourceFileByPath = this.delegateMethod('getSourceFileByPath');
- readDirectory = this.delegateMethod('readDirectory');
- readFile = this.delegateMethod('readFile');
- readResource = this.delegateMethod('readResource');
- transformResource = this.delegateMethod('transformResource');
- realpath = this.delegateMethod('realpath');
- resolveModuleNames = this.delegateMethod('resolveModuleNames');
- resolveTypeReferenceDirectives = this.delegateMethod('resolveTypeReferenceDirectives');
- resourceNameToFileName = this.delegateMethod('resourceNameToFileName');
- trace = this.delegateMethod('trace');
- useCaseSensitiveFileNames = this.delegateMethod('useCaseSensitiveFileNames');
- writeFile = this.delegateMethod('writeFile');
- getModuleResolutionCache = this.delegateMethod('getModuleResolutionCache');
- hasInvalidatedResolutions = this.delegateMethod('hasInvalidatedResolutions');
- // The following methods are required in TS 5.0+, but they don't exist in earlier versions.
- // TODO(crisbeto): remove the `ts-ignore` when dropping support for TypeScript 4.9.
- // @ts-ignore
- resolveModuleNameLiterals = this.delegateMethod('resolveModuleNameLiterals');
- resolveTypeReferenceDirectiveReferences =
- // @ts-ignore
- this.delegateMethod('resolveTypeReferenceDirectiveReferences');
}
/**
diff --git a/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts b/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts
index e65dc762e294..85e080b0c322 100644
--- a/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts
+++ b/packages/compiler-cli/src/ngtsc/imports/src/emitter.ts
@@ -367,9 +367,11 @@ export class AbsoluteModuleStrategy implements ReferenceEmitStrategy {
* Instead, `LogicalProjectPath`s are used.
*/
export class LogicalProjectStrategy implements ReferenceEmitStrategy {
- private relativePathStrategy = new RelativePathStrategy(this.reflector);
+ private relativePathStrategy: RelativePathStrategy;
- constructor(private reflector: ReflectionHost, private logicalFs: LogicalFileSystem) {}
+ constructor(private reflector: ReflectionHost, private logicalFs: LogicalFileSystem) {
+ this.relativePathStrategy = new RelativePathStrategy(this.reflector);
+ }
emit(ref: Reference, context: ts.SourceFile, importFlags: ImportFlags): ReferenceEmitResult|null {
const destSf = getSourceFile(ref.node);
diff --git a/packages/compiler-cli/src/ngtsc/perf/src/recorder.ts b/packages/compiler-cli/src/ngtsc/perf/src/recorder.ts
index 223a46ef5c70..a8dd832a2381 100644
--- a/packages/compiler-cli/src/ngtsc/perf/src/recorder.ts
+++ b/packages/compiler-cli/src/ngtsc/perf/src/recorder.ts
@@ -28,7 +28,7 @@ export class ActivePerfRecorder implements PerfRecorder {
private bytes: number[];
private currentPhase = PerfPhase.Unaccounted;
- private currentPhaseEntered = this.zeroTime;
+ private currentPhaseEntered: HrTime;
/**
* Creates an `ActivePerfRecorder` with its zero point set to the current time.
@@ -38,6 +38,7 @@ export class ActivePerfRecorder implements PerfRecorder {
}
private constructor(private zeroTime: HrTime) {
+ this.currentPhaseEntered = this.zeroTime;
this.counters = Array(PerfEvent.LAST).fill(0);
this.phaseTime = Array(PerfPhase.LAST).fill(0);
this.bytes = Array(PerfCheckpoint.LAST).fill(0);
diff --git a/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts b/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts
index 90010fc96476..a054199b2591 100644
--- a/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts
+++ b/packages/compiler-cli/src/ngtsc/program_driver/src/ts_create_program_driver.ts
@@ -23,43 +23,68 @@ import {FileUpdate, MaybeSourceFileWithOriginalFile, NgOriginalFile, ProgramDriv
*/
export class DelegatingCompilerHost implements
Omit, 'getSourceFile'|'fileExists'|'writeFile'> {
- constructor(protected delegate: ts.CompilerHost) {}
+ createHash;
+ directoryExists;
+ getCancellationToken;
+ getCanonicalFileName;
+ getCurrentDirectory;
+ getDefaultLibFileName;
+ getDefaultLibLocation;
+ getDirectories;
+ getEnvironmentVariable;
+ getNewLine;
+ getParsedCommandLine;
+ getSourceFileByPath;
+ readDirectory;
+ readFile;
+ realpath;
+ resolveModuleNames;
+ resolveTypeReferenceDirectives;
+ trace;
+ useCaseSensitiveFileNames;
+ getModuleResolutionCache;
+ hasInvalidatedResolutions;
+ resolveModuleNameLiterals;
+ resolveTypeReferenceDirectiveReferences;
+
+ constructor(protected delegate: ts.CompilerHost) {
+ // Excluded are 'getSourceFile', 'fileExists' and 'writeFile', which are actually implemented by
+ // `TypeCheckProgramHost` below.
+
+ this.createHash = this.delegateMethod('createHash');
+ this.directoryExists = this.delegateMethod('directoryExists');
+ this.getCancellationToken = this.delegateMethod('getCancellationToken');
+ this.getCanonicalFileName = this.delegateMethod('getCanonicalFileName');
+ this.getCurrentDirectory = this.delegateMethod('getCurrentDirectory');
+ this.getDefaultLibFileName = this.delegateMethod('getDefaultLibFileName');
+ this.getDefaultLibLocation = this.delegateMethod('getDefaultLibLocation');
+ this.getDirectories = this.delegateMethod('getDirectories');
+ this.getEnvironmentVariable = this.delegateMethod('getEnvironmentVariable');
+ this.getNewLine = this.delegateMethod('getNewLine');
+ this.getParsedCommandLine = this.delegateMethod('getParsedCommandLine');
+ this.getSourceFileByPath = this.delegateMethod('getSourceFileByPath');
+ this.readDirectory = this.delegateMethod('readDirectory');
+ this.readFile = this.delegateMethod('readFile');
+ this.realpath = this.delegateMethod('realpath');
+ this.resolveModuleNames = this.delegateMethod('resolveModuleNames');
+ this.resolveTypeReferenceDirectives = this.delegateMethod('resolveTypeReferenceDirectives');
+ this.trace = this.delegateMethod('trace');
+ this.useCaseSensitiveFileNames = this.delegateMethod('useCaseSensitiveFileNames');
+ this.getModuleResolutionCache = this.delegateMethod('getModuleResolutionCache');
+ this.hasInvalidatedResolutions = this.delegateMethod('hasInvalidatedResolutions');
+ // The following methods are required in TS 5.0+, but they don't exist in earlier versions.
+ // TODO(crisbeto): remove the `ts-ignore` when dropping support for TypeScript 4.9.
+ // @ts-ignore
+ this.resolveModuleNameLiterals = this.delegateMethod('resolveModuleNameLiterals');
+ this.resolveTypeReferenceDirectiveReferences =
+ // @ts-ignore
+ this.delegateMethod('resolveTypeReferenceDirectiveReferences');
+ }
private delegateMethod(name: M): ts.CompilerHost[M] {
return this.delegate[name] !== undefined ? (this.delegate[name] as any).bind(this.delegate) :
undefined;
}
-
- // Excluded are 'getSourceFile', 'fileExists' and 'writeFile', which are actually implemented by
- // `TypeCheckProgramHost` below.
- createHash = this.delegateMethod('createHash');
- directoryExists = this.delegateMethod('directoryExists');
- getCancellationToken = this.delegateMethod('getCancellationToken');
- getCanonicalFileName = this.delegateMethod('getCanonicalFileName');
- getCurrentDirectory = this.delegateMethod('getCurrentDirectory');
- getDefaultLibFileName = this.delegateMethod('getDefaultLibFileName');
- getDefaultLibLocation = this.delegateMethod('getDefaultLibLocation');
- getDirectories = this.delegateMethod('getDirectories');
- getEnvironmentVariable = this.delegateMethod('getEnvironmentVariable');
- getNewLine = this.delegateMethod('getNewLine');
- getParsedCommandLine = this.delegateMethod('getParsedCommandLine');
- getSourceFileByPath = this.delegateMethod('getSourceFileByPath');
- readDirectory = this.delegateMethod('readDirectory');
- readFile = this.delegateMethod('readFile');
- realpath = this.delegateMethod('realpath');
- resolveModuleNames = this.delegateMethod('resolveModuleNames');
- resolveTypeReferenceDirectives = this.delegateMethod('resolveTypeReferenceDirectives');
- trace = this.delegateMethod('trace');
- useCaseSensitiveFileNames = this.delegateMethod('useCaseSensitiveFileNames');
- getModuleResolutionCache = this.delegateMethod('getModuleResolutionCache');
- hasInvalidatedResolutions = this.delegateMethod('hasInvalidatedResolutions');
- // The following methods are required in TS 5.0+, but they don't exist in earlier versions.
- // TODO(crisbeto): remove the `ts-ignore` when dropping support for TypeScript 4.9.
- // @ts-ignore
- resolveModuleNameLiterals = this.delegateMethod('resolveModuleNameLiterals');
- resolveTypeReferenceDirectiveReferences =
- // @ts-ignore
- this.delegateMethod('resolveTypeReferenceDirectiveReferences');
}
/**
@@ -81,12 +106,13 @@ class UpdatedProgramHost extends DelegatingCompilerHost {
* order for those shims to be loaded, and then cleaned up afterwards. Thus the
* `UpdatedProgramHost` has its own `ShimReferenceTagger` to perform this function.
*/
- private shimTagger = new ShimReferenceTagger(this.shimExtensionPrefixes);
+ private shimTagger: ShimReferenceTagger;
constructor(
sfMap: Map, private originalProgram: ts.Program,
delegate: ts.CompilerHost, private shimExtensionPrefixes: string[]) {
super(delegate);
+ this.shimTagger = new ShimReferenceTagger(this.shimExtensionPrefixes);
this.sfMap = sfMap;
}
@@ -150,11 +176,13 @@ export class TsCreateProgramDriver implements ProgramDriver {
*/
private sfMap = new Map();
- private program: ts.Program = this.originalProgram;
+ private program: ts.Program;
constructor(
private originalProgram: ts.Program, private originalHost: ts.CompilerHost,
- private options: ts.CompilerOptions, private shimExtensionPrefixes: string[]) {}
+ private options: ts.CompilerOptions, private shimExtensionPrefixes: string[]) {
+ this.program = this.originalProgram;
+ }
readonly supportsInlineOperations = true;
diff --git a/packages/compiler-cli/src/ngtsc/resource/src/loader.ts b/packages/compiler-cli/src/ngtsc/resource/src/loader.ts
index c3013c325b8b..3aeeee240ca1 100644
--- a/packages/compiler-cli/src/ngtsc/resource/src/loader.ts
+++ b/packages/compiler-cli/src/ngtsc/resource/src/loader.ts
@@ -24,12 +24,16 @@ const RESOURCE_MARKER_TS = RESOURCE_MARKER + '.ts';
export class AdapterResourceLoader implements ResourceLoader {
private cache = new Map();
private fetching = new Map>();
- private lookupResolutionHost = createLookupResolutionHost(this.adapter);
+ private lookupResolutionHost: RequiredDelegations;
- canPreload = !!this.adapter.readResource;
- canPreprocess = !!this.adapter.transformResource;
+ canPreload: boolean;
+ canPreprocess: boolean;
- constructor(private adapter: NgCompilerAdapter, private options: ts.CompilerOptions) {}
+ constructor(private adapter: NgCompilerAdapter, private options: ts.CompilerOptions) {
+ this.lookupResolutionHost = createLookupResolutionHost(this.adapter);
+ this.canPreload = !!this.adapter.readResource;
+ this.canPreprocess = !!this.adapter.transformResource;
+ }
/**
* Resolve the url of a resource relative to the file that contains the reference to it.
diff --git a/packages/compiler/src/i18n/i18n_ast.ts b/packages/compiler/src/i18n/i18n_ast.ts
index 4443c3d0a4f9..a09229f1c1bd 100644
--- a/packages/compiler/src/i18n/i18n_ast.ts
+++ b/packages/compiler/src/i18n/i18n_ast.ts
@@ -22,11 +22,11 @@ export interface MessagePlaceholder {
export class Message {
sources: MessageSpan[];
- id: string = this.customId;
+ id: string;
/** The ids to use if there are no custom id and if `i18nLegacyMessageIdFormat` is not empty */
legacyIds: string[] = [];
- messageString = serializeMessage(this.nodes);
+ messageString: string;
/**
* @param nodes message AST
@@ -40,6 +40,9 @@ export class Message {
public nodes: Node[], public placeholders: {[phName: string]: MessagePlaceholder},
public placeholderToMessage: {[phName: string]: Message}, public meaning: string,
public description: string, public customId: string) {
+ this.id = this.customId;
+ this.messageString = serializeMessage(this.nodes);
+
if (nodes.length) {
this.sources = [{
filePath: nodes[0].sourceSpan.start.file.url,
diff --git a/packages/compiler/src/render3/view/i18n/meta.ts b/packages/compiler/src/render3/view/i18n/meta.ts
index 3958f29079f5..250c7a96a097 100644
--- a/packages/compiler/src/render3/view/i18n/meta.ts
+++ b/packages/compiler/src/render3/view/i18n/meta.ts
@@ -8,7 +8,7 @@
import {computeDecimalDigest, computeDigest, decimalDigest} from '../../../i18n/digest';
import * as i18n from '../../../i18n/i18n_ast';
-import {createI18nMessageFactory, VisitNodeFn} from '../../../i18n/i18n_parser';
+import {createI18nMessageFactory, I18nMessageFactory, VisitNodeFn} from '../../../i18n/i18n_parser';
import {I18nError} from '../../../i18n/parse_util';
import * as html from '../../../ml_parser/ast';
import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '../../../ml_parser/interpolation_config';
@@ -51,9 +51,6 @@ export class I18nMetaVisitor implements html.Visitor {
public hasI18nMeta: boolean = false;
private _errors: I18nError[] = [];
- // i18n message generation factory
- private _createI18nMessage = createI18nMessageFactory(this.interpolationConfig);
-
constructor(
private interpolationConfig: InterpolationConfig = DEFAULT_INTERPOLATION_CONFIG,
private keepI18nAttrs = false, private enableI18nLegacyMessageIdFormat = false) {}
@@ -62,7 +59,8 @@ export class I18nMetaVisitor implements html.Visitor {
nodes: html.Node[], meta: string|i18n.I18nMeta = '',
visitNodeFn?: VisitNodeFn): i18n.Message {
const {meaning, description, customId} = this._parseMetadata(meta);
- const message = this._createI18nMessage(nodes, meaning, description, customId, visitNodeFn);
+ const createI18nMessage = createI18nMessageFactory(this.interpolationConfig);
+ const message = createI18nMessage(nodes, meaning, description, customId, visitNodeFn);
this._setMessageId(message, meta);
this._setLegacyIds(message, meta);
return message;
diff --git a/packages/core/schematics/tsconfig.json b/packages/core/schematics/tsconfig.json
index dbeb0be6f638..450689783aaa 100644
--- a/packages/core/schematics/tsconfig.json
+++ b/packages/core/schematics/tsconfig.json
@@ -6,7 +6,7 @@
"esModuleInterop": true,
"strict": true,
"moduleResolution": "node",
- "target": "es2019",
+ "target": "es2022",
"lib": [
"es2019"
],
@@ -32,4 +32,4 @@
"bazelOptions": {
"suppressTsconfigOverrideWarnings": true
}
-}
\ No newline at end of file
+}
diff --git a/packages/core/schematics/utils/change_tracker.ts b/packages/core/schematics/utils/change_tracker.ts
index a3364c310a1d..30c9c04ef4b9 100644
--- a/packages/core/schematics/utils/change_tracker.ts
+++ b/packages/core/schematics/utils/change_tracker.ts
@@ -32,15 +32,17 @@ export interface PendingChange {
/** Tracks changes that have to be made for specific files. */
export class ChangeTracker {
private readonly _changes = new Map();
- private readonly _importManager = new ImportManager(
- currentFile => ({
- addNewImport: (start, text) => this.insertText(currentFile, start, text),
- updateExistingImport: (namedBindings, text) =>
- this.replaceText(currentFile, namedBindings.getStart(), namedBindings.getWidth(), text),
- }),
- this._printer);
-
- constructor(private _printer: ts.Printer, private _importRemapper?: ImportRemapper) {}
+ private readonly _importManager: ImportManager;
+
+ constructor(private _printer: ts.Printer, private _importRemapper?: ImportRemapper) {
+ this._importManager = new ImportManager(
+ currentFile => ({
+ addNewImport: (start, text) => this.insertText(currentFile, start, text),
+ updateExistingImport: (namedBindings, text) => this.replaceText(
+ currentFile, namedBindings.getStart(), namedBindings.getWidth(), text),
+ }),
+ this._printer);
+ }
/**
* Tracks the insertion of some text.
diff --git a/packages/elements/src/component-factory-strategy.ts b/packages/elements/src/component-factory-strategy.ts
index 0d013c26b5c0..da7d734fd04c 100644
--- a/packages/elements/src/component-factory-strategy.ts
+++ b/packages/elements/src/component-factory-strategy.ts
@@ -81,17 +81,21 @@ export class ComponentNgElementStrategy implements NgElementStrategy {
* fired.
* (This helps detect the first change of an input, even if it is explicitly set to `undefined`.)
*/
- private readonly unchangedInputs =
- new Set(this.componentFactory.inputs.map(({propName}) => propName));
+ private readonly unchangedInputs: Set;
/** Service for setting zone context. */
- private readonly ngZone = this.injector.get(NgZone);
+ private readonly ngZone: NgZone;
/** The zone the element was created in or `null` if Zone.js is not loaded. */
- private readonly elementZone =
- (typeof Zone === 'undefined') ? null : this.ngZone.run(() => Zone.current);
+ private readonly elementZone: Zone|null;
- constructor(private componentFactory: ComponentFactory, private injector: Injector) {}
+
+ constructor(private componentFactory: ComponentFactory, private injector: Injector) {
+ this.unchangedInputs =
+ new Set(this.componentFactory.inputs.map(({propName}) => propName));
+ this.ngZone = this.injector.get(NgZone);
+ this.elementZone = (typeof Zone === 'undefined') ? null : this.ngZone.run(() => Zone.current);
+ }
/**
* Initializes a new component if one has not yet been created and cancels any scheduled
diff --git a/packages/forms/src/directives/ng_model.ts b/packages/forms/src/directives/ng_model.ts
index 710d4786f65c..c9bdc5c26e14 100644
--- a/packages/forms/src/directives/ng_model.ts
+++ b/packages/forms/src/directives/ng_model.ts
@@ -162,8 +162,7 @@ export class NgModel extends NgControl implements OnChanges, OnDestroy {
* Tracks the name bound to the directive. If a parent form exists, it
* uses this name as a key to retrieve this control's value.
*/
- // TODO(issue/24571): remove '!'.
- @Input() override name!: string;
+ @Input() override name: string = '';
/**
* @description
diff --git a/packages/forms/src/directives/ng_model_group.ts b/packages/forms/src/directives/ng_model_group.ts
index bd2cdccca181..f50400595156 100644
--- a/packages/forms/src/directives/ng_model_group.ts
+++ b/packages/forms/src/directives/ng_model_group.ts
@@ -54,8 +54,7 @@ export class NgModelGroup extends AbstractFormGroupDirective implements OnInit,
* Tracks the name of the `NgModelGroup` bound to the directive. The name corresponds
* to a key in the parent `NgForm`.
*/
- // TODO(issue/24571): remove '!'.
- @Input('ngModelGroup') override name!: string;
+ @Input('ngModelGroup') override name: string = '';
constructor(
@Host() @SkipSelf() parent: ControlContainer,
diff --git a/packages/forms/src/directives/reactive_directives/form_control_name.ts b/packages/forms/src/directives/reactive_directives/form_control_name.ts
index 8d4dc9650540..02b3754d10df 100644
--- a/packages/forms/src/directives/reactive_directives/form_control_name.ts
+++ b/packages/forms/src/directives/reactive_directives/form_control_name.ts
@@ -86,8 +86,7 @@ export class FormControlName extends NgControl implements OnChanges, OnDestroy {
* while the numerical form allows for form controls to be bound
* to indices when iterating over controls in a `FormArray`.
*/
- // TODO(issue/24571): remove '!'.
- @Input('formControlName') override name!: string|number|null;
+ @Input('formControlName') override name: string|number|null = null;
/**
* @description
diff --git a/packages/forms/src/directives/reactive_directives/form_group_name.ts b/packages/forms/src/directives/reactive_directives/form_group_name.ts
index 46caaebd0e5f..3d52c9353800 100644
--- a/packages/forms/src/directives/reactive_directives/form_group_name.ts
+++ b/packages/forms/src/directives/reactive_directives/form_group_name.ts
@@ -81,8 +81,7 @@ export class FormGroupName extends AbstractFormGroupDirective implements OnInit,
* while the numerical form allows for form groups to be bound
* to indices when iterating over groups in a `FormArray`.
*/
- // TODO(issue/24571): remove '!'.
- @Input('formGroupName') override name!: string|number|null;
+ @Input('formGroupName') override name: string|number|null = null;
constructor(
@Optional() @Host() @SkipSelf() parent: ControlContainer,
@@ -146,8 +145,7 @@ export class FormArrayName extends ControlContainer implements OnInit, OnDestroy
* while the numerical form allows for form arrays to be bound
* to indices when iterating over arrays in a `FormArray`.
*/
- // TODO(issue/24571): remove '!'.
- @Input('formArrayName') override name!: string|number|null;
+ @Input('formArrayName') override name: string|number|null = null;
constructor(
@Optional() @Host() @SkipSelf() parent: ControlContainer,
diff --git a/packages/localize/package.json b/packages/localize/package.json
index 623d716d3b2f..7a0c917a7ebd 100644
--- a/packages/localize/package.json
+++ b/packages/localize/package.json
@@ -30,9 +30,8 @@
"save": "devDependencies"
},
"sideEffects": [
- "./esm2020/init/**",
- "./fesm2015/init.mjs",
- "./fesm2020/init.mjs"
+ "./esm2022/init/**",
+ "./fesm2022/init.mjs"
],
"dependencies": {
"@babel/core": "7.19.3",
diff --git a/packages/platform-server/package.json b/packages/platform-server/package.json
index 3aa06a1f3ad6..ec1fb0c47c7f 100644
--- a/packages/platform-server/package.json
+++ b/packages/platform-server/package.json
@@ -28,8 +28,7 @@
"packageGroup": "NG_UPDATE_PACKAGE_GROUP"
},
"sideEffects": [
- "./esm2020/init/**",
- "./fesm2015/init.mjs",
- "./fesm2020/init.mjs"
+ "./esm2022/init/**",
+ "./fesm2022/init.mjs"
]
}
diff --git a/packages/router/src/router_state.ts b/packages/router/src/router_state.ts
index b91bed2be8eb..38f59e1468f5 100644
--- a/packages/router/src/router_state.ts
+++ b/packages/router/src/router_state.ts
@@ -120,8 +120,7 @@ export class ActivatedRoute {
_queryParamMap?: Observable;
/** An Observable of the resolved route title */
- readonly title: Observable =
- this.data?.pipe(map((d: Data) => d[RouteTitleKey])) ?? of(undefined);
+ readonly title: Observable;
/** @internal */
constructor(
@@ -140,6 +139,7 @@ export class ActivatedRoute {
/** The component of the route, a constant. */
public component: Type|null, futureSnapshot: ActivatedRouteSnapshot) {
this._futureSnapshot = futureSnapshot;
+ this.title = this.data?.pipe(map((d: Data) => d[RouteTitleKey])) ?? of(undefined);
}
/** The configuration used to match this route. */
diff --git a/packages/service-worker/worker/src/app-version.ts b/packages/service-worker/worker/src/app-version.ts
index 1a6349d44bd2..99ce1d8d78fa 100644
--- a/packages/service-worker/worker/src/app-version.ts
+++ b/packages/service-worker/worker/src/app-version.ts
@@ -55,7 +55,7 @@ export class AppVersion implements UpdateSource {
* The normalized URL to the file that serves as the index page to satisfy navigation requests.
* Usually this is `/index.html`.
*/
- private indexUrl = this.adapter.normalizeUrl(this.manifest.index);
+ private indexUrl: NormalizedUrl;
/**
* Tracks whether the manifest has encountered any inconsistencies.
@@ -70,6 +70,7 @@ export class AppVersion implements UpdateSource {
private scope: ServiceWorkerGlobalScope, private adapter: Adapter, private database: Database,
idle: IdleScheduler, private debugHandler: DebugHandler, readonly manifest: Manifest,
readonly manifestHash: string) {
+ this.indexUrl = this.adapter.normalizeUrl(this.manifest.index);
// The hashTable within the manifest is an Object - convert it to a Map for easier lookups.
Object.keys(manifest.hashTable).forEach(url => {
this.hashTable.set(adapter.normalizeUrl(url), manifest.hashTable[url]);
diff --git a/packages/service-worker/worker/src/db-cache.ts b/packages/service-worker/worker/src/db-cache.ts
index 120b4117185a..59c0c7fc2aed 100644
--- a/packages/service-worker/worker/src/db-cache.ts
+++ b/packages/service-worker/worker/src/db-cache.ts
@@ -52,11 +52,13 @@ export class CacheDatabase implements Database {
* A `Table` backed by a `Cache`.
*/
export class CacheTable implements Table {
- cacheName = this.cache.name;
+ cacheName: string;
constructor(
readonly name: string, private cache: NamedCache, private adapter: Adapter,
- private cacheQueryOptions?: CacheQueryOptions) {}
+ private cacheQueryOptions?: CacheQueryOptions) {
+ this.cacheName = this.cache.name;
+ }
private request(key: string): Request {
return this.adapter.newRequest('/' + key);
diff --git a/packages/service-worker/worker/src/driver.ts b/packages/service-worker/worker/src/driver.ts
index 1862b0fe129b..53a87abd62b2 100644
--- a/packages/service-worker/worker/src/driver.ts
+++ b/packages/service-worker/worker/src/driver.ts
@@ -9,7 +9,7 @@
import {Adapter} from './adapter';
import {CacheState, Debuggable, DebugIdleState, DebugState, DebugVersion, NormalizedUrl, UpdateCacheStatus, UpdateSource} from './api';
import {AppVersion} from './app-version';
-import {Database} from './database';
+import {Database, Table} from './database';
import {CacheTable} from './db-cache';
import {DebugHandler} from './debug';
import {errorToString} from './error';
@@ -101,7 +101,7 @@ export class Driver implements Debuggable, UpdateSource {
*/
private loggedInvalidOnlyIfCachedRequest: boolean = false;
- private ngswStatePath = this.adapter.parseUrl('ngsw/state', this.scope.registration.scope).path;
+ private ngswStatePath: string;
/**
* A scheduler which manages a queue of tasks that need to be executed when the SW is
@@ -112,10 +112,13 @@ export class Driver implements Debuggable, UpdateSource {
debugger: DebugHandler;
// A promise resolving to the control DB table.
- private controlTable = this.db.open('control');
+ private controlTable: Promise;
constructor(
private scope: ServiceWorkerGlobalScope, private adapter: Adapter, private db: Database) {
+ this.controlTable = this.db.open('control');
+ this.ngswStatePath = this.adapter.parseUrl('ngsw/state', this.scope.registration.scope).path;
+
// Set up all the event handlers that the SW needs.
// The install event is triggered when the service worker is first installed.
diff --git a/packages/tsconfig-build.json b/packages/tsconfig-build.json
index 1b9f4595e3e9..54a51e755905 100644
--- a/packages/tsconfig-build.json
+++ b/packages/tsconfig-build.json
@@ -16,7 +16,9 @@
"noFallthroughCasesInSwitch": true,
"moduleResolution": "node",
"module": "esnext",
- "target": "es2020",
+ "target": "es2022",
+ // Keep the below in sync with ng_module.bzl
+ "useDefineForClassFields": false,
"lib": ["es2020", "dom"],
"skipLibCheck": true,
// don't auto-discover @types/node, it results in a /// f.startsWith('babel__')).forEach(pkg => {
sed('-i', 'private rootDirsRelative;', 'rootDirsRelative(fileName: string): string;',
'node_modules/@bazel/concatjs/internal/tsc_wrapped/compiler_host.d.ts');
+// Add support for ES2022 in ts_library
+sed('-i', '"es2020", "esnext"', '"es2020", "es2022", "esnext"',
+ 'node_modules/@bazel/concatjs/internal/build_defs.bzl');
+
log('\n# patch: delete d.ts files referring to rxjs-compat');
// more info in https://github.com/angular/angular/pull/33786
rm('-rf', [