Skip to content
This repository has been archived by the owner on Jan 6, 2025. It is now read-only.

chore: upgrade to Angular 14.0.0 #1405

Closed
wants to merge 10 commits into from
11 changes: 8 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# To validate changes, use an online parser, eg.
# http://yaml-online-parser.appspot.com/

var_1: &docker_image circleci/node:14.16.1
var_1: &docker_image cimg/node:16.14.0
var_2: &cache_key v2-ng-layout-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.7.0

# Settings common to each job
Expand Down Expand Up @@ -53,7 +53,7 @@ var_8: &docker-firefox-image
# TODO(devversion): Temporarily use a image that includes Firefox 62 because the
# ngcontainer image does include an old Firefox version that does not support headless.
# See the PR that fixes this: https://github.com/angular/angular/pull/26435
- image: circleci/node:14.16.1-browsers
- image: cimg/node:16.14.0-browsers

# Attaches the release output which has been stored in the workspace to the current job.
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
Expand All @@ -64,7 +64,9 @@ var_9: &attach_release_output
# -----------------------------
# Container version of CircleCI
# -----------------------------
version: 2
version: 2.1
orbs:
browser-tools: circleci/[email protected]

# -----------------------------------------------------------------------------------------
# Job definitions. Jobs which are defined just here, will not run automatically. Each job
Expand Down Expand Up @@ -103,6 +105,7 @@ jobs:
steps:
- *checkout_code
- *attach_release_output
- browser-tools/install-browser-tools
- run: ./scripts/circleci/run-local-browser-tests.sh

# ----------------------------------------------------------------------------
Expand All @@ -118,6 +121,7 @@ jobs:
- *checkout_code
- *restore_cache
- *attach_release_output
- browser-tools/install-browser-tools
- run: ./scripts/circleci/run-browserstack-tests.sh

# ----------------------------------------------------------------------------
Expand All @@ -135,6 +139,7 @@ jobs:
steps:
- *checkout_code
- *attach_release_output
- browser-tools/install-browser-tools

- run: ./scripts/circleci/run-saucelabs-tests.sh

Expand Down
3 changes: 1 addition & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,5 @@
}
}
}
},
"defaultProject": "@angular/flex-layout"
}
}
41 changes: 20 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,31 @@
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
},
"private": true,
"requiredAngularVersion": "^13.0.0",
"requiredAngularVersion": "^14.0.0",
"dependencies": {
"@angular/animations": "~13.0.0",
"@angular/common": "~13.0.0",
"@angular/compiler": "~13.0.0",
"@angular/core": "~13.0.0",
"@angular/forms": "~13.0.0",
"@angular/material": "^13.0.2",
"@angular/platform-browser": "~13.0.0",
"@angular/platform-browser-dynamic": "~13.0.0",
"@angular/platform-server": "~13.0.0",
"@angular/router": "~13.0.0",
"@nguniversal/builders": "^13.0.1",
"@nguniversal/express-engine": "^13.0.1",
"@angular/animations": "^14.0.0 || ^15.0.0",
"@angular/common": "^14.0.0 || ^15.0.0",
"@angular/compiler": "^14.0.0 || ^15.0.0",
"@angular/core": "^14.0.0 || ^15.0.0",
"@angular/forms": "^14.0.0 || ^15.0.0",
"@angular/material": "^14.0.0 || ^15.0.0",
"@angular/platform-browser": "^14.0.0 || ^15.0.0",
"@angular/platform-browser-dynamic": "^14.0.0 || ^15.0.0",
"@angular/platform-server": "^14.0.0 || ^15.0.0",
"@angular/router": "^14.0.0 || ^15.0.0",
"@nguniversal/builders": "^14.0.0 || ^15.0.0",
"@nguniversal/express-engine": "^14.0.0 || ^15.0.0",
"express": "^4.17.1",
"rxjs": "~7.4.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~13.0.0",
"@angular/cdk": "^13.0.2",
"@angular/cli": "~13.0.0",
"@angular/compiler-cli": "~13.0.0",
"@ngtools/webpack": "^13.0.3",
"@nguniversal/builders": "^13.0.1",
"@angular-devkit/build-angular": "^14.0.0 || ^15.0.0",
"@angular/cdk": "^14.0.0 || ^15.0.0",
"@angular/cli": "^14.0.0 || ^15.0.0",
"@angular/compiler-cli": "^14.0.0 || ^15.0.0",
"@ngtools/webpack": "^14.0.0 || ^15.0.0",
"@types/express": "^4.17.0",
"@types/jasmine": "~3.10.0",
"@types/minimatch": "^3.0.5",
Expand All @@ -71,14 +70,14 @@
"karma-parallel": "^0.3.1",
"karma-sauce-launcher": "^2.0.2",
"minimatch": "^3.0.4",
"ng-packagr": "^13.0.0",
"ng-packagr": "^14.0.0 || ^15.0.0",
"postcss": "^8.3.3",
"postcss-scss": "^4.0.2",
"protractor": "^7.0.0",
"stylelint": "^14.1.0",
"ts-node": "^10.4.0",
"tslint": "^6.1.3",
"typescript": "~4.4.3",
"typescript": "~4.7.2",
"webpack": "^5.64.1",
"webpack-cli": "^4.9.1"
}
Expand Down
2 changes: 1 addition & 1 deletion projects/libs/flex-layout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/cdk": "^13.0.0",
"@angular/cdk": "^14.0.0 || ^15.0.0",
"@angular/core": "0.0.0-NG",
"@angular/common": "0.0.0-NG",
"@angular/platform-browser": "0.0.0-NG",
Expand Down
2 changes: 1 addition & 1 deletion scripts/saucelabs/start-tunnel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e -o pipefail

tunnelFileName="sc-4.6.2-linux.tar.gz"
tunnelFileName="sc-4.8.0-linux.tar.gz"
tunnelUrl="https://saucelabs.com/downloads/${tunnelFileName}"

tunnelTmpDir="/tmp/layout-saucelabs"
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2017",
"target": "es2020",
"module": "es2020",
"lib": [
"es2020",
Expand Down
Loading