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.

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

feat: update to Angular 18 #121

Merged
merged 1 commit into from
Sep 7, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ Thumbs.db

.angular
/.nx/cache
/test-results
3 changes: 0 additions & 3 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run commitlint ${1}
16 changes: 0 additions & 16 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

set -exo pipefail

UNSTAGED=$(git diff --name-only)

if [ -n "$UNSTAGED" ]; then
git stash push --keep-index
fi
git diff --cached --name-only --diff-filter=d -z | xargs -0 npx prettier -wu
git add .

npm run lint:all
npm run test:all
npm run build
npm run e2e

if [ -n "$UNSTAGED" ]; then
git stash pop
fi
16 changes: 8 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular/build:application",
"options": {
"outputPath": "dist/apps/e2e",
"outputPath": {
"base": "dist/apps/e2e"
},
"browser": "apps/e2e/src/main.ts",
"index": "apps/e2e/src/index.html",
"main": "apps/e2e/src/main.ts",
"polyfills": ["zone.js"],
"polyfills": ["zone.js", "@angular/localize/init"],
"tsConfig": "apps/e2e/tsconfig.app.json",
"assets": ["apps/e2e/src/favicon.ico", "apps/e2e/src/assets"],
"styles": [
Expand All @@ -91,9 +93,7 @@
"outputHashing": "all"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
Expand All @@ -102,7 +102,7 @@
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"builder": "@angular/build:dev-server",
"configurations": {
"production": {
"buildTarget": "e2e:build:production"
Expand All @@ -114,7 +114,7 @@
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"builder": "@angular/build:extract-i18n",
"options": {
"buildTarget": "e2e:build"
}
Expand Down
9 changes: 5 additions & 4 deletions apps/e2e/playwright.config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { PlaywrightTestConfig } from '@playwright/test';
import { defineConfig } from '@playwright/test';

const config: PlaywrightTestConfig = {
const config = defineConfig({
outputDir: '../../dist/playwright',
testDir: './tests',
webServer: {
command: 'npx ng s e2e --port 4204',
port: 4204,
timeout: 120 * 1000,
cwd: '../..',
},
testDir: './tests',
};
});

export default config;
2 changes: 1 addition & 1 deletion apps/e2e/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"types": []
Expand Down
2 changes: 1 addition & 1 deletion apps/e2e/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"types": ["jasmine"]
Expand Down
12 changes: 7 additions & 5 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ module.exports = function (config, coverageDir, isCi) {
require(__dirname + '/scripts/karma-webkit-launcher.js'),
require('@angular-devkit/build-angular/plugins/karma'),
],
client: {
clearContext: false, // leave Jasmine Spec Runner output visible in browser
},
jasmineHtmlReporter: {
suppressAll: true, // removes the duplicated traces
},
Expand Down Expand Up @@ -53,8 +50,13 @@ module.exports = function (config, coverageDir, isCi) {
browsers: isCi ? ['ChromeHeadlessCI', 'WebkitHeadless'] : ['Chrome'],
customLaunchers: {
ChromeHeadlessCI: {
base: 'ChromeHeadless',
flags: ['--disable-translate', '--disable-extensions', '--no-sandbox'],
base: 'Chrome',
flags: [
'--disable-extensions',
'--disable-gpu',
'--disable-translate',
'--headless=new',
],
},
},
singleRun: isCi,
Expand Down
8 changes: 4 additions & 4 deletions libs/ng-keyboard-sort/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"directory": "libs/ng-keyboard-sort"
},
"peerDependencies": {
"@angular/cdk": "^17.0.0",
"@angular/common": "^17.0.0",
"@angular/core": "^17.0.0",
"rxjs": "^7.0.0"
"@angular/cdk": "^18.2.0",
"@angular/common": "^18.2.0",
"@angular/core": "^18.2.0",
"rxjs": "^7.8.0"
},
"keywords": [
"angular",
Expand Down
5 changes: 3 additions & 2 deletions libs/ng-keyboard-sort/src/lib/keyboard-sort-item.directive.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
AfterViewInit,
booleanAttribute,
ContentChildren,
Directive,
ElementRef,
Expand Down Expand Up @@ -40,7 +41,7 @@ export class KeyboardSortItemDirective
@Input({ alias: 'kbdSortItem', required: true })
public position = -1;

@Input()
@Input({ transform: booleanAttribute })
public get activated(): boolean {
return this.#activated;
}
Expand Down Expand Up @@ -70,7 +71,7 @@ export class KeyboardSortItemDirective
@HostBinding('attr.tabindex')
public readonly tabindex = '-1' as const;

@Input()
@Input({ transform: booleanAttribute })
public get kbdSortItemDisabled(): boolean {
return this.#kbdSortItemDisabled;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
AfterViewInit,
booleanAttribute,
ChangeDetectorRef,
ContentChildren,
Directive,
Expand Down Expand Up @@ -39,7 +40,7 @@ export class KeyboardSortListDirective
@Input()
public kbdSortListOrientation: 'horizontal' | 'vertical' = 'horizontal';

@Input()
@Input({ transform: booleanAttribute })
public kbdSortListDisabled = false;

@Input({ required: true })
Expand Down
2 changes: 1 addition & 1 deletion libs/ng-keyboard-sort/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"declaration": true,
Expand Down
2 changes: 1 addition & 1 deletion libs/ng-keyboard-sort/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"types": ["jasmine", "@angular/localize"]
Expand Down
Loading
Loading