Skip to content

build: update to angular v10.0.0-next.6 #19287

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2020
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
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
},
"version": "9.2.1",
"dependencies": {
"@angular/animations": "^9.1.0",
"@angular/common": "^9.1.0",
"@angular/compiler": "^9.1.0",
"@angular/core": "^9.1.0",
"@angular/elements": "^9.1.0",
"@angular/forms": "^9.1.0",
"@angular/platform-browser": "^9.1.0",
"@angular/animations": "^10.0.0-next.6",
"@angular/common": "^10.0.0-next.6",
"@angular/compiler": "^10.0.0-next.6",
"@angular/core": "^10.0.0-next.6",
"@angular/elements": "^10.0.0-next.6",
"@angular/forms": "^10.0.0-next.6",
"@angular/platform-browser": "^10.0.0-next.6",
"@types/googlemaps": "^3.39.3",
"@types/youtube": "^0.0.38",
"@webcomponents/custom-elements": "^1.1.0",
Expand All @@ -66,14 +66,14 @@
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/core": "^9.0.7",
"@angular-devkit/schematics": "^9.0.7",
"@angular/bazel": "^9.1.0",
"@angular/compiler-cli": "^9.1.0",
"@angular-devkit/core": "^10.0.0-next.3",
"@angular-devkit/schematics": "^10.0.0-next.3",
"@angular/bazel": "^10.0.0-next.6",
"@angular/compiler-cli": "^10.0.0-next.6",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#414d7dd979092cb52d60b58596927abbc26d40b9",
"@angular/platform-browser-dynamic": "^9.1.0",
"@angular/platform-server": "^9.1.0",
"@angular/router": "^9.1.0",
"@angular/platform-browser-dynamic": "^10.0.0-next.6",
"@angular/platform-server": "^10.0.0-next.6",
"@angular/router": "^10.0.0-next.6",
"@bazel/bazelisk": "^1.4.0",
"@bazel/buildifier": "^2.2.1",
"@bazel/ibazel": "^0.13.0",
Expand All @@ -83,7 +83,7 @@
"@bazel/typescript": "^1.6.0",
"@firebase/app-types": "^0.3.2",
"@octokit/rest": "16.28.7",
"@schematics/angular": "^9.0.7",
"@schematics/angular": "^10.0.0-next.3",
"@types/autoprefixer": "^9.7.2",
"@types/browser-sync": "^2.26.1",
"@types/fs-extra": "^4.0.3",
Expand All @@ -106,7 +106,7 @@
"browser-sync": "^2.26.7",
"chalk": "^2.4.2",
"clang-format": "^1.2.4",
"codelyzer": "^5.2.1",
"codelyzer": "^6.0.0-next.1",
"conventional-changelog": "^3.0.5",
"dgeni": "^0.4.11",
"dgeni-packages": "^0.27.1",
Expand Down
4 changes: 2 additions & 2 deletions packages.bzl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Each individual package uses a placeholder for the version of Angular to ensure they're
# all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
# version for the placeholders.
ANGULAR_PACKAGE_VERSION = "^9.0.0 || ^10.0.0-0"
ANGULAR_PACKAGE_VERSION = "^10.0.0-0 || ^11.0.0-0"
MDC_PACKAGE_VERSION = "^6.0.0-canary.265ecbad5.0"
TSLIB_PACKAGE_VERSION = "^1.9.0"
TSLIB_PACKAGE_VERSION = "^1.10.0"

VERSION_PLACEHOLDER_REPLACEMENTS = {
"0.0.0-MDC": MDC_PACKAGE_VERSION,
Expand Down
8 changes: 0 additions & 8 deletions src/cdk-experimental/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
"name": "@angular/cdk-experimental",
"version": "0.0.0-PLACEHOLDER",
"description": "Experimental components for Angular CDK",
"main": "./bundles/cdk-experimental.umd.js",
"fesm5": "./fesm5/cdk-experimental.js",
"fesm2015": "./fesm2015/cdk-experimental.js",
"esm5": "./esm5/index.js",
"esm2015": "./esm2015/index.js",
"typings": "./index.d.ts",
"module": "./fesm5/cdk-experimental.js",
"es2015": "./fesm2015/cdk-experimental.js",
"repository": {
"type": "git",
"url": "https://github.com/angular/components.git"
Expand Down
8 changes: 0 additions & 8 deletions src/cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
"name": "@angular/cdk",
"version": "0.0.0-PLACEHOLDER",
"description": "Angular Material Component Development Kit",
"main": "./bundles/cdk.umd.js",
"fesm5": "./fesm5/cdk.js",
"fesm2015": "./fesm2015/cdk.js",
"esm5": "./esm5/index.js",
"esm2015": "./esm2015/index.js",
"typings": "./index.d.ts",
"module": "./fesm5/cdk.js",
"es2015": "./fesm2015/cdk.js",
"repository": {
"type": "git",
"url": "https://github.com/angular/components.git"
Expand Down
8 changes: 0 additions & 8 deletions src/components-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
"name": "@angular/components-examples",
"version": "0.0.0-PLACEHOLDER",
"description": "Angular Components Examples",
"main": "./bundles/components-examples.umd.js",
"fesm5": "./fesm5/components-examples.js",
"fesm2015": "./fesm2015/components-examples.js",
"esm5": "./esm5/components-examples_public_index.js",
"esm2015": "./esm2015/components-examples_public_index.js",
"typings": "./components-examples_public_index.d.ts",
"module": "./fesm5/components-examples.js",
"es2015": "./fesm2015/components-examples.js",
"private": true,
"repository": {
"type": "git",
Expand Down
8 changes: 0 additions & 8 deletions src/google-maps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
"name": "@angular/google-maps",
"version": "0.0.0-PLACEHOLDER",
"description": "Angular Google Maps",
"main": "./bundles/google-maps.umd.js",
"fesm5": "./fesm5/google-maps.js",
"fesm2015": "./fesm2015/google-maps.js",
"esm5": "./esm5/google-maps_public_index.js",
"esm2015": "./esm2015/google-maps_public_index.js",
"typings": "./google-maps_public_index.d.ts",
"module": "./fesm5/google-maps.js",
"es2015": "./fesm2015/google-maps.js",
"repository": {
"type": "git",
"url": "https://github.com/angular/components.git"
Expand Down
8 changes: 0 additions & 8 deletions src/material-experimental/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
"name": "@angular/material-experimental",
"version": "0.0.0-PLACEHOLDER",
"description": "Experimental components for Angular Material",
"main": "./bundles/material-experimental.umd.js",
"fesm5": "./fesm5/material-experimental.js",
"fesm2015": "./fesm2015/material-experimental.js",
"esm5": "./esm5/index.js",
"esm2015": "./esm2015/index.js",
"typings": "./index.d.ts",
"module": "./fesm5/material-experimental.js",
"es2015": "./fesm2015/material-experimental.js",
"repository": {
"type": "git",
"url": "https://github.com/angular/components.git"
Expand Down
8 changes: 0 additions & 8 deletions src/material-moment-adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
"name": "@angular/material-moment-adapter",
"version": "0.0.0-PLACEHOLDER",
"description": "Angular Material Moment Adapter",
"main": "./bundles/material-moment-adapter.umd.js",
"fesm5": "./fesm5/material-moment-adapter.js",
"fesm2015": "./fesm2015/material-moment-adapter.js",
"esm5": "./esm5/material-moment-adapter_public_index.js",
"esm2015": "./esm2015/material-moment-adapter_public_index.js",
"typings": "./material-moment-adapter_public_index.d.ts",
"module": "./fesm5/material-moment-adapter.js",
"es2015": "./fesm2015/material-moment-adapter.js",
"repository": {
"type": "git",
"url": "https://github.com/angular/components.git"
Expand Down
8 changes: 0 additions & 8 deletions src/material/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
"name": "@angular/material",
"version": "0.0.0-PLACEHOLDER",
"description": "Angular Material",
"main": "./bundles/material.umd.js",
"fesm5": "./fesm5/material.js",
"fesm2015": "./fesm2015/material.js",
"esm5": "./esm5/index.js",
"esm2015": "./esm2015/index.js",
"typings": "./index.d.ts",
"module": "./fesm5/material.js",
"es2015": "./fesm2015/material.js",
"repository": {
"type": "git",
"url": "https://github.com/angular/components.git"
Expand Down
8 changes: 0 additions & 8 deletions src/youtube-player/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@
"name": "@angular/youtube-player",
"version": "0.0.0-PLACEHOLDER",
"description": "Angular YouTube Player",
"main": "./bundles/youtube-player.umd.js",
"fesm5": "./fesm5/youtube-player.js",
"fesm2015": "./fesm2015/youtube-player.js",
"esm5": "./esm5/youtube-player_public_index.js",
"esm2015": "./esm2015/youtube-player_public_index.js",
"typings": "./youtube-player_public_index.d.ts",
"module": "./fesm5/youtube-player.js",
"es2015": "./fesm2015/youtube-player.js",
"repository": {
"type": "git",
"url": "https://github.com/angular/components.git"
Expand Down
2 changes: 1 addition & 1 deletion tools/release/release-output/check-package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from './output-validations';

/** Glob that matches all JavaScript files within a release package. */
const releaseJsFilesGlob = '+(fesm5|fesm2015|esm5|esm2015|bundles)/**/*.js';
const releaseJsFilesGlob = '+(fesm2015|esm2015|bundles)/**/*.js';

/** Glob that matches all TypeScript definition files within a release package. */
const releaseTypeDefinitionsGlob = '**/*.d.ts';
Expand Down
3 changes: 2 additions & 1 deletion tools/release/release-output/output-validations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const bazelManifestPath = /(angular_material|external)\//;
* to files in the release output.
*/
const packageJsonPathFields =
['main', 'module', 'typings', 'es2015', 'fesm5', 'fesm2015', 'esm5', 'esm2015'];
['main', 'module', 'typings', 'es2015', 'fesm2015', 'esm2015'];

/**
* Checks the specified JavaScript file and ensures that it does not
Expand Down Expand Up @@ -58,6 +58,7 @@ export function checkPackageJsonFile(filePath: string): string[] {
packageJsonPathFields.forEach(fieldName => {
if (!parsed[fieldName]) {
failures.push(`Missing field: ${fieldName}`);
return;
}

const resolvedPath = join(packageJsonDir, parsed[fieldName]);
Expand Down
Loading