Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion aio/content/examples/upgrade-module/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ docs_example(
flaky = True, # TODO: figure out why this is flaky or times out
# This example downloads and inlines resources
test_exec_properties = ENABLE_NETWORK,
test_tags = ["requires-network"],
test_tags = [
"requires-network",
# This is currently broken due to usage of ESM2022 which does not work out-of-the-box with system.js.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a tracking issue we can reference here? I'm fine without if you plan on looking into it soon anyway

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’ll create as a reminder, but I plan to look into this during the feature freeze.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alan-agius4 Did we ever create an issue for this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, still in my todo list. I'll try to create one in the coming days.

"broken",
],
)
18 changes: 9 additions & 9 deletions aio/content/examples/upgrade-module/src/systemjs.config.1.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
// our app is within the app folder
app: 'app',
// angular bundles
'@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-dynamic': 'npm:@angular/platform-browser-dynamic/fesm2015/platform-browser-dynamic.mjs',
'@angular/router': 'npm:@angular/router/fesm2015/router.mjs',
'@angular/forms': 'npm:@angular/forms/fesm2015/forms.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-dynamic': 'npm:@angular/platform-browser-dynamic/fesm2022/platform-browser-dynamic.mjs',
'@angular/router': 'npm:@angular/router/fesm2022/router.mjs',
'@angular/forms': 'npm:@angular/forms/fesm2022/forms.mjs',
// #docregion upgrade-static-package
'@angular/upgrade/static': 'npm:@angular/upgrade/fesm2015/static.mjs',
'@angular/upgrade/static': 'npm:@angular/upgrade/fesm2022/static.mjs',
// #enddocregion upgrade-static-package

// other libraries
Expand Down
6 changes: 5 additions & 1 deletion aio/content/examples/upgrade-phonecat-2-hybrid/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,9 @@ docs_example(
flaky = True, # TODO: figure out why this is flaky or times out
# This example downloads and inlines resources
test_exec_properties = ENABLE_NETWORK,
test_tags = ["requires-network"],
test_tags = [
"requires-network",
# This is currently broken due to usage of ESM2022 which does not work out-of-the-box with system.js.
"broken",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ System.config({
// Assume npm: is set in `paths` in systemjs.config
// Map the angular testing bundles
map: {
'@angular/core/testing': 'npm:@angular/core/fesm2015/testing.mjs',
'@angular/common/testing': 'npm:@angular/common/fesm2015/testing.mjs',
'@angular/common/http/testing': 'npm:@angular/common/fesm2015/http/testing.mjs',
'@angular/compiler/testing': 'npm:@angular/compiler/fesm2015/testing.mjs',
'@angular/platform-browser/testing': 'npm:@angular/platform-browser/fesm2015/testing.mjs',
'@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/fesm2015/testing.mjs',
'@angular/router/testing': 'npm:@angular/router/fesm2015/testing.mjs',
'@angular/forms/testing': 'npm:@angular/forms/fesm2015/testing.mjs',
'@angular/core/testing': 'npm:@angular/core/fesm2022/testing.mjs',
'@angular/common/testing': 'npm:@angular/common/fesm2022/testing.mjs',
'@angular/common/http/testing': 'npm:@angular/common/fesm2022/http/testing.mjs',
'@angular/compiler/testing': 'npm:@angular/compiler/fesm2022/testing.mjs',
'@angular/platform-browser/testing': 'npm:@angular/platform-browser/fesm2022/testing.mjs',
'@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/fesm2022/testing.mjs',
'@angular/router/testing': 'npm:@angular/router/fesm2022/testing.mjs',
'@angular/forms/testing': 'npm:@angular/forms/fesm2022/testing.mjs',
},
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ System.config({
// Assume npm: is set in `paths` in systemjs.config
// Map the angular testing bundles
map: {
'@angular/core/testing': 'npm:@angular/core/fesm2015/testing.mjs',
'@angular/common/testing': 'npm:@angular/common/fesm2015/testing.mjs',
'@angular/common/http/testing': 'npm:@angular/common/fesm2015/http/testing.mjs',
'@angular/compiler/testing': 'npm:@angular/compiler/fesm2015/testing.mjs',
'@angular/platform-browser/testing': 'npm:@angular/platform-browser/fesm2015/testing.mjs',
'@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/fesm2015/testing.mjs',
'@angular/router/testing': 'npm:@angular/router/fesm2015/testing.mjs',
'@angular/forms/testing': 'npm:@angular/forms/fesm2015/testing.mjs',
'@angular/core/testing': 'npm:@angular/core/fesm2022/testing.mjs',
'@angular/common/testing': 'npm:@angular/common/fesm2022/testing.mjs',
'@angular/common/http/testing': 'npm:@angular/common/fesm2022/http/testing.mjs',
'@angular/compiler/testing': 'npm:@angular/compiler/fesm2022/testing.mjs',
'@angular/platform-browser/testing': 'npm:@angular/platform-browser/fesm2022/testing.mjs',
'@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/fesm2022/testing.mjs',
'@angular/router/testing': 'npm:@angular/router/fesm2022/testing.mjs',
'@angular/forms/testing': 'npm:@angular/forms/fesm2022/testing.mjs',
},
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ export default {
sourcemap: true,
sourcemapFile: 'aot/dist/build.js.map'
},
// 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(),
commonjs({
Expand Down
20 changes: 10 additions & 10 deletions aio/content/examples/upgrade-phonecat-2-hybrid/systemjs.config.1.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
// #enddocregion paths
// angular bundles
// #docregion angular-paths
'@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-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/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-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',
// #enddocregion angular-paths
// #docregion paths
'@angular/upgrade/static': 'npm:@angular/upgrade/fesm2015/static.mjs',
'@angular/upgrade/static': 'npm:@angular/upgrade/fesm2022/static.mjs',
// #enddocregion paths

// other libraries
Expand Down
1 change: 1 addition & 0 deletions aio/content/examples/upgrade-phonecat-3-final/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ package(default_visibility = ["//visibility:public"])
docs_example(
name = "upgrade-phonecat-3-final",
flaky = True, # TODO: figure out why this is flaky or times out
test_tags = ["broken"], # This is currently broken due to usage of ESM2022 which does not work out-of-the-box with system.js.
)
16 changes: 8 additions & 8 deletions aio/content/examples/upgrade-phonecat-3-final/karma-test-shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ System.config({
// Assume npm: is set in `paths` in systemjs.config
// Map the angular testing bundles
map: {
'@angular/core/testing': 'npm:@angular/core/fesm2015/testing.mjs',
'@angular/common/testing': 'npm:@angular/common/fesm2015/testing.mjs',
'@angular/common/http/testing': 'npm:@angular/common/fesm2015/http/testing.mjs',
'@angular/compiler/testing': 'npm:@angular/compiler/fesm2015/testing.mjs',
'@angular/platform-browser/testing': 'npm:@angular/platform-browser/fesm2015/testing.mjs',
'@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/fesm2015/testing.mjs',
'@angular/router/testing': 'npm:@angular/router/fesm2015/testing.mjs',
'@angular/forms/testing': 'npm:@angular/forms/fesm2015/testing.mjs',
'@angular/core/testing': 'npm:@angular/core/fesm2022/testing.mjs',
'@angular/common/testing': 'npm:@angular/common/fesm2022/testing.mjs',
'@angular/common/http/testing': 'npm:@angular/common/fesm2022/http/testing.mjs',
'@angular/compiler/testing': 'npm:@angular/compiler/fesm2022/testing.mjs',
'@angular/platform-browser/testing': 'npm:@angular/platform-browser/fesm2022/testing.mjs',
'@angular/platform-browser-dynamic/testing': 'npm:@angular/platform-browser-dynamic/fesm2022/testing.mjs',
'@angular/router/testing': 'npm:@angular/router/fesm2022/testing.mjs',
'@angular/forms/testing': 'npm:@angular/forms/fesm2022/testing.mjs',
},
});

Expand Down
22 changes: 11 additions & 11 deletions aio/content/examples/upgrade-phonecat-3-final/systemjs.config.1.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
'ng-loader': '../src/systemjs-angular-loader.js',
app: '/app',
// angular bundles
'@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-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/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-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',
Expand Down
Loading