Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat!: drop support for Angular 15; add support for Angular 16 #77

Merged
merged 3 commits into from
Aug 7, 2023
Merged

feat!: drop support for Angular 15; add support for Angular 16 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d963a01
feat!: drop support for Angular 15; add support for Angular 16
Blackbaud-SteveBrush Aug 7, 2023
a0295b2
fix test/lint
Blackbaud-SteveBrush Aug 7, 2023
c9f6d44
update version
Blackbaud-SteveBrush Aug 7, 2023
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
8 changes: 4 additions & 4 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx"],
"extends": ["prettier"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
Expand All @@ -24,12 +24,12 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript", "prettier"],
"extends": ["plugin:@nx/typescript", "prettier"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript", "prettier"],
"extends": ["plugin:@nx/javascript", "prettier"],
"rules": {}
}
]
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ jobs:
with:
path: node_modules
key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
# Running ngcc after each agent is created to address the "ngcc is already running error".
# Since we're running multiple builds in parallel, we need to pre-process our node_modules before starting the builds.
- name: Run NGCC
run: npx ngcc
- name: Start Nx Agent ${{ matrix.agent }}
run: npx nx-cloud start-agent

Expand Down Expand Up @@ -127,8 +123,6 @@ jobs:
with:
path: node_modules
key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
- name: Run NGCC
run: npx ngcc
- name: Build
run: npx nx affected --target=build --parallel=${{ env.MATRIX_SIZE }}

Expand Down Expand Up @@ -177,8 +171,6 @@ jobs:
with:
path: node_modules
key: ${{ runner.os }}-node-${{ needs.install-deps.outputs.node-version }}-modules-${{ hashFiles('package-lock.json') }}
- name: Run NGCC
run: npx ngcc
- name: Code coverage
run: |
npx nx affected --target=test --browsers=ChromeHeadless --code-coverage --parallel=${{ env.MATRIX_SIZE }} --progress=false --source-map --watch=false
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release-please.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Next release
if: ${{ env.PRERELEASE == 'true' }}
# if: ${{ env.PRERELEASE == 'true' }}
if: ${{ false }}
id: next-release
run: |
# Log commands and exit on error.
Expand Down
4 changes: 2 additions & 2 deletions apps/playground/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@nx/angular",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
Expand All @@ -29,7 +29,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
2 changes: 1 addition & 1 deletion apps/playground/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/playground/**/*.ts",
Expand Down
4 changes: 2 additions & 2 deletions decorate-angular-cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ const cp = require('child_process');
const isWindows = os.platform() === 'win32';
let output;
try {
output = require('@nrwl/workspace').output;
output = require('@nx/workspace').output;
} catch (e) {
console.warn(
'Angular CLI could not be decorated to enable computation caching. Please ensure @nrwl/workspace is installed.'
'Angular CLI could not be decorated to enable computation caching. Please ensure @nx/workspace is installed.'
);
process.exit(0);
}
Expand Down
4 changes: 2 additions & 2 deletions libs/clipboard/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@nx/angular",
"plugin:@angular-eslint/template/process-inline-templates",
"../../.eslintrc-overrides.json",
"prettier"
Expand All @@ -31,7 +31,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
10 changes: 5 additions & 5 deletions libs/clipboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
},
"homepage": "https://github.com/blackbaud/stache#readme",
"peerDependencies": {
"@angular/common": "^15.2.9",
"@angular/core": "^15.2.9",
"@skyux/core": "^8.0.0",
"@skyux/i18n": "^8.0.0"
"@angular/common": "^16.1.8",
"@angular/core": "^16.1.8",
"@skyux/core": "^9.0.0-alpha.0",
"@skyux/i18n": "^9.0.0-alpha.0"
},
"dependencies": {
"tslib": "^2.4.1"
"tslib": "^2.6.1"
}
}
4 changes: 2 additions & 2 deletions libs/clipboard/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"prefix": "sky",
"targets": {
"build": {
"executor": "@nrwl/angular:package",
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"project": "libs/clipboard/ng-package.json",
Expand Down Expand Up @@ -37,7 +37,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"libs/clipboard/**/*.ts",
Expand Down
4 changes: 2 additions & 2 deletions libs/code-block/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@nx/angular",
"plugin:@angular-eslint/template/process-inline-templates",
"../../.eslintrc-overrides.json",
"prettier"
Expand All @@ -31,7 +31,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
10 changes: 5 additions & 5 deletions libs/code-block/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
},
"homepage": "https://github.com/blackbaud/stache#readme",
"peerDependencies": {
"@angular/common": "^15.2.9",
"@angular/core": "^15.2.9",
"@angular/platform-browser": "^15.2.9",
"@angular/common": "^16.1.8",
"@angular/core": "^16.1.8",
"@angular/platform-browser": "^16.1.8",
"@blackbaud/skyux-lib-clipboard": "0.0.0-PLACEHOLDER",
"@skyux/i18n": "^8.0.0"
"@skyux/i18n": "^9.0.0-alpha.0"
},
"dependencies": {
"prismjs": "1.29.0",
"tslib": "^2.4.1"
"tslib": "^2.6.1"
}
}
4 changes: 2 additions & 2 deletions libs/code-block/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"prefix": "sky",
"targets": {
"build": {
"executor": "@nrwl/angular:package",
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"project": "libs/code-block/ng-package.json",
Expand Down Expand Up @@ -37,7 +37,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": [
"libs/code-block/**/*.ts",
Expand Down
4 changes: 2 additions & 2 deletions libs/media/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@nx/angular",
"plugin:@angular-eslint/template/process-inline-templates",
"../../.eslintrc-overrides.json",
"prettier"
Expand All @@ -31,7 +31,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
10 changes: 5 additions & 5 deletions libs/media/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
},
"homepage": "https://github.com/blackbaud/stache#readme",
"peerDependencies": {
"@angular/common": "^15.2.9",
"@angular/core": "^15.2.9",
"@angular/platform-browser": "^15.2.9",
"@skyux/i18n": "^8.0.0"
"@angular/common": "^16.1.8",
"@angular/core": "^16.1.8",
"@angular/platform-browser": "^16.1.8",
"@skyux/i18n": "^9.0.0-alpha.0"
},
"dependencies": {
"tslib": "^2.4.1"
"tslib": "^2.6.1"
}
}
4 changes: 2 additions & 2 deletions libs/media/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"prefix": "sky",
"targets": {
"build": {
"executor": "@nrwl/angular:package",
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"project": "libs/media/ng-package.json",
Expand Down Expand Up @@ -37,7 +37,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["libs/media/**/*.ts", "libs/media/**/*.html"]
}
Expand Down
4 changes: 2 additions & 2 deletions libs/stache/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
"files": ["*.ts"],
"extends": [
"plugin:@nrwl/nx/angular",
"plugin:@nx/angular",
"plugin:@angular-eslint/template/process-inline-templates",
"../../.eslintrc-overrides.json",
"prettier"
Expand All @@ -31,7 +31,7 @@
},
{
"files": ["*.html"],
"extends": ["plugin:@nrwl/nx/angular-template"],
"extends": ["plugin:@nx/angular-template"],
"rules": {}
}
]
Expand Down
22 changes: 11 additions & 11 deletions libs/stache/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@
}
},
"peerDependencies": {
"@angular/cli": "^15.2.8",
"@angular/common": "^15.2.9",
"@angular/core": "^15.2.9",
"@angular/platform-browser": "^15.2.9",
"@angular/router": "^15.2.9",
"@skyux/config": "^8.0.0",
"@skyux/core": "^8.0.0",
"@skyux/i18n": "^8.0.0",
"@skyux/layout": "^8.0.0",
"@skyux/lookup": "^8.0.0",
"@angular/cli": "^16.1.8",
"@angular/common": "^16.1.8",
"@angular/core": "^16.1.8",
"@angular/platform-browser": "^16.1.8",
"@angular/router": "^16.1.8",
"@skyux/config": "^9.0.0-alpha.0",
"@skyux/core": "^9.0.0-alpha.0",
"@skyux/i18n": "^9.0.0-alpha.0",
"@skyux/layout": "^9.0.0-alpha.0",
"@skyux/lookup": "^9.0.0-alpha.0",
"fs-extra": "^10.1.0 || ^11"
},
"dependencies": {
"lodash.get": "4.4.2",
"tslib": "^2.4.1"
"tslib": "^2.6.1"
}
}
4 changes: 2 additions & 2 deletions libs/stache/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"prefix": "stache",
"targets": {
"build": {
"executor": "@nrwl/angular:package",
"executor": "@nx/angular:package",
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
"options": {
"project": "libs/stache/ng-package.json",
Expand Down Expand Up @@ -49,7 +49,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["libs/stache/**/*.ts", "libs/stache/**/*.html"]
}
Expand Down
2 changes: 1 addition & 1 deletion libs/stache/schematics/ng-add/ng-add.schematic.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('ng-add.schematic', () => {
];

for (const packageName of packageNames) {
expect(packageJson.dependencies[packageName]).toEqual('^8.0.0');
expect(packageJson.dependencies[packageName]).toEqual('^9.0.0-alpha.0');
}
});
});
Loading