Skip to content
Merged
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
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@
},
"homepage": "https://github.com/angular/angular-cli",
"devDependencies": {
"@angular/animations": "21.0.0-next.5",
"@angular/cdk": "21.0.0-next.5",
"@angular/common": "21.0.0-next.5",
"@angular/compiler": "21.0.0-next.5",
"@angular/compiler-cli": "21.0.0-next.5",
"@angular/core": "21.0.0-next.5",
"@angular/forms": "21.0.0-next.5",
"@angular/localize": "21.0.0-next.5",
"@angular/material": "21.0.0-next.5",
"@angular/animations": "21.0.0-next.6",
"@angular/cdk": "21.0.0-next.6",
"@angular/common": "21.0.0-next.6",
"@angular/compiler": "21.0.0-next.6",
"@angular/compiler-cli": "21.0.0-next.6",
"@angular/core": "21.0.0-next.6",
"@angular/forms": "21.0.0-next.6",
"@angular/localize": "21.0.0-next.6",
"@angular/material": "21.0.0-next.6",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#6f8f9b9ad21f8a8386290489377ef73a88bf5aeb",
"@angular/platform-browser": "21.0.0-next.5",
"@angular/platform-server": "21.0.0-next.5",
"@angular/router": "21.0.0-next.5",
"@angular/service-worker": "21.0.0-next.5",
"@angular/platform-browser": "21.0.0-next.6",
"@angular/platform-server": "21.0.0-next.6",
"@angular/router": "21.0.0-next.6",
"@angular/service-worker": "21.0.0-next.6",
"@bazel/bazelisk": "1.26.0",
"@bazel/buildifier": "8.2.1",
"@eslint/compat": "1.4.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describeKarmaBuilder(execute, KARMA_BUILDER_INFO, (harness, setupTarget) => {

await harness.modifyFile('src/tsconfig.spec.json', (content) => {
const tsConfig = JSON.parse(content);
tsConfig.compilerOptions.moduleResolution = 'node';
tsConfig.compilerOptions.moduleResolution = 'bundler';
tsConfig.compilerOptions.module = 'commonjs';

return JSON.stringify(tsConfig);
Expand Down
6 changes: 3 additions & 3 deletions packages/angular/build/src/utils/service-worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ export async function augmentAppWithServiceWorkerCore(
// Once TypeScript provides support for keeping the dynamic import this workaround can be
// changed to a direct dynamic import.
const GeneratorConstructor = (
await loadEsmModule<typeof import('@angular/service-worker/config')>(
'@angular/service-worker/config',
)
await loadEsmModule<
typeof import('@angular/service-worker/config', { with: { 'resolution-mode': 'import' } })
>('@angular/service-worker/config')
).Generator;

// Generate the manifest
Expand Down
12 changes: 6 additions & 6 deletions packages/angular/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
},
"devDependencies": {
"@angular-devkit/schematics": "workspace:*",
"@angular/common": "21.0.0-next.5",
"@angular/compiler": "21.0.0-next.5",
"@angular/core": "21.0.0-next.5",
"@angular/platform-browser": "21.0.0-next.5",
"@angular/platform-server": "21.0.0-next.5",
"@angular/router": "21.0.0-next.5",
"@angular/common": "21.0.0-next.6",
"@angular/compiler": "21.0.0-next.6",
"@angular/core": "21.0.0-next.6",
"@angular/platform-browser": "21.0.0-next.6",
"@angular/platform-server": "21.0.0-next.6",
"@angular/router": "21.0.0-next.6",
"@schematics/angular": "workspace:*",
"beasties": "0.3.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"moduleResolution": "bundler",
"experimentalDecorators": true,
"target": "es2015",
"module": "es2022",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"moduleResolution": "bundler",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2022",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"moduleResolution": "bundler",
"experimentalDecorators": true,
"target": "es2022",
"module": "esnext",
Expand Down
4 changes: 2 additions & 2 deletions packages/ngtools/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
},
"devDependencies": {
"@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
"@angular/compiler": "21.0.0-next.5",
"@angular/compiler-cli": "21.0.0-next.5",
"@angular/compiler": "21.0.0-next.6",
"@angular/compiler-cli": "21.0.0-next.6",
"typescript": "5.9.3",
"webpack": "5.102.0"
}
Expand Down
266 changes: 133 additions & 133 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions tests/legacy-cli/e2e/ng-snapshot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
"description": "snapshot versions of Angular for e2e testing",
"private": true,
"dependencies": {
"@angular/animations": "github:angular/animations-builds#5880a486d83953cc2b9ac63c4d32191a5ab7a52d",
"@angular/cdk": "github:angular/cdk-builds#daeac37793cf6f9c29e05ad90dcea9e2fefccf60",
"@angular/common": "github:angular/common-builds#53c1f3ce704acf38a6d2512375d0e31027b398fa",
"@angular/compiler": "github:angular/compiler-builds#2cb70ce621595141bfdd3465c4d9db2758d640ab",
"@angular/compiler-cli": "github:angular/compiler-cli-builds#dfb8696d20fc218455130ca8f1849cc1a5d13fea",
"@angular/core": "github:angular/core-builds#f5f75b96fd3a7f12115a2cbc461500f26942268a",
"@angular/forms": "github:angular/forms-builds#992a42d9f4099e44c3f5102bdc53fa43bdd9d332",
"@angular/language-service": "github:angular/language-service-builds#9cbe8c613b50cc89e4ffde38cd89b15276ae9179",
"@angular/localize": "github:angular/localize-builds#7daa29c76e957a9e7b7401bd8d9ae73c531061cb",
"@angular/material": "github:angular/material-builds#0bbebf269409254c04b485831f99a2ce9eb9a44d",
"@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#afaf20982a2dc5f225dc1d23f0e854666a18ab99",
"@angular/platform-browser": "github:angular/platform-browser-builds#ca2c8ce644f35de86e295118ffa38d4441dee606",
"@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#93a2d01adc9d75c9a4a6d4a6ab4288f34c9a097b",
"@angular/platform-server": "github:angular/platform-server-builds#72614e0d55863f5fea55b84ef21a7490964f297e",
"@angular/router": "github:angular/router-builds#f02aef514925f8659ce23460d2568124e8ecd39f",
"@angular/service-worker": "github:angular/service-worker-builds#55c8e26b6e05adbbdf8924b346d56cdcb64305bf"
"@angular/animations": "github:angular/animations-builds#8ad28f7f9a2e9b00666085adced41354bfed3ece",
"@angular/cdk": "github:angular/cdk-builds#0e29805c2d52a47f7116393a1643cc83c37d2784",
"@angular/common": "github:angular/common-builds#5b3b73038741820ac6b06d918d6e077fa329f048",
"@angular/compiler": "github:angular/compiler-builds#0ede7d6c1ddce8cfa378852b64db4eca45ad6c0e",
"@angular/compiler-cli": "github:angular/compiler-cli-builds#11f25b69504598e935f744629ddffff63811a28c",
"@angular/core": "github:angular/core-builds#316705517179afc0832ebcf00ad35dee955957c4",
"@angular/forms": "github:angular/forms-builds#aa3fb5bea2386f7e290f538010734e7a75e5be84",
"@angular/language-service": "github:angular/language-service-builds#1be2d0827515203c0aa274d59c9e48518a9655da",
"@angular/localize": "github:angular/localize-builds#dd3cc2921cebcf6bd1eba5541210485a4c6a58a6",
"@angular/material": "github:angular/material-builds#f817d7a9d54383fd6e4b48f9a472ec0899264a35",
"@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#b8c6d364ffe424ef3f1cc6cce0a816da88ededaf",
"@angular/platform-browser": "github:angular/platform-browser-builds#76334354d21182733ef51ab8a0d6f447aa00869a",
"@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#732bff10598fe87579ff59347de310bfc7b630f5",
"@angular/platform-server": "github:angular/platform-server-builds#a5d02b41c745b31674aa5a4bfbe09724ab5d513b",
"@angular/router": "github:angular/router-builds#23c79a85370b1bce64d79343bb6e20cf2d4d7862",
"@angular/service-worker": "github:angular/service-worker-builds#20e8eaeb45fd41efa650621c52ea96467105ec24"
}
}