Skip to content

Commit 0e11a94

Browse files
authored
Major/update ng 15 (#59)
1 parent 6344df0 commit 0e11a94

32 files changed

+257
-343
lines changed

.github/workflows/build-gh-pages-demo.yaml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'main'
77

88
jobs:
9-
build-gh-pages-demo:
9+
build-demo:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
@@ -22,26 +22,25 @@ jobs:
2222
- name: build workspace application
2323
run: yarn run build:workspace
2424

25-
- name: Checkout code
26-
uses: actions/checkout@v3
27-
with:
28-
ref: gh-pages-demo
29-
path: 'gh-pages-demo'
30-
31-
- name: Clean out old dist and copy new dist
32-
run: |
33-
rm -rf gh-pages-demo/*
34-
cp -R dist/lib-workspace/* gh-pages-demo
35-
touch gh-pages-demo/$(date "+%d-%m-%Y_%H-%m-%S")-dummyfile
36-
37-
- name: push chages to branch
38-
working-directory: gh-pages-demo
25+
- name: Fix permissions
3926
run: |
40-
git config user.name "$GITHUB_ACTOR"
41-
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
42-
43-
git add .
44-
git status
45-
46-
git commit -a -m "update dist automated by $GITHUB_ACTOR"
47-
git push
27+
chmod -c -R +rX "_site/" | while read line; do
28+
echo "::warning title=Invalid file permissions automatically fixed::$line"
29+
done
30+
- name: Upload Pages artifact
31+
uses: actions/upload-pages-artifact@v2
32+
with:
33+
path: dist/lib-workspace
34+
deploy:
35+
needs: build-demo
36+
permissions:
37+
pages: write
38+
id-token: write
39+
environment:
40+
name: github-pages
41+
url: ${{ steps.deployment.outputs.page_url }}
42+
runs-on: ubuntu-latest
43+
steps:
44+
- name: Deploy to GitHub Pages
45+
id: deployment
46+
uses: actions/deploy-pages@v3

.github/workflows/pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
- name: Setup node
2020
uses: actions/setup-node@v3
2121
with:
22-
node-version: '16.x'
23-
registry-url: 'https://npm.pkg.github.com'
22+
node-version-file: .nvmrc
23+
registry-url: 'https://registry.npmjs.org'
2424
scope: '@fullstack-devops'
2525

2626
- name: install packages

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
uses: actions/checkout@v3
2525

2626
- name: Setup node for npmjs
27-
uses: actions/setup-node@v3
27+
uses: actions/setup-node@v4
2828
with:
29-
node-version: '16.x'
29+
node-version-file: .nvmrc
3030
registry-url: 'https://registry.npmjs.org'
3131
scope: '@fullstack-devops'
3232

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v18

.vscode/settings.json

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +0,0 @@
1-
{
2-
"editor.formatOnPaste": true,
3-
"editor.formatOnSave": true,
4-
"editor.codeActionsOnSave": {
5-
"source.organizeImports": true
6-
},
7-
"workbench.iconTheme": "material-icon-theme",
8-
"editor.defaultFormatter": "esbenp.prettier-vscode",
9-
"[javascript]": {
10-
"editor.defaultFormatter": "esbenp.prettier-vscode"
11-
},
12-
"javascript.updateImportsOnFileMove.enabled": "always",
13-
"typescript.updateImportsOnFileMove.enabled": "always",
14-
"angular.enable-strict-mode-prompt": false,
15-
"files.associations": {
16-
".env*": "shell"
17-
},
18-
"[yaml]": {
19-
"editor.defaultFormatter": "esbenp.prettier-vscode"
20-
},
21-
"[scss]": {
22-
"editor.defaultFormatter": "vscode.css-language-features"
23-
},
24-
"[html]": {
25-
"editor.defaultFormatter": "esbenp.prettier-vscode",
26-
"editor.codeActionsOnSave": {
27-
"source.fixAll.eslint": true
28-
},
29-
"editor.formatOnSave": true
30-
},
31-
"[typescript]": {
32-
"editor.defaultFormatter": "esbenp.prettier-vscode",
33-
"editor.codeActionsOnSave": {
34-
"source.fixAll.eslint": true
35-
},
36-
"editor.formatOnSave": true
37-
},
38-
"[xml]": {
39-
"editor.defaultFormatter": "redhat.vscode-xml"
40-
}
41-
}

angular.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,13 @@
142142
},
143143
"cli": {
144144
"analytics": false
145+
},
146+
"schematics": {
147+
"@angular-eslint/schematics:application": {
148+
"setParserOptionsProject": true
149+
},
150+
"@angular-eslint/schematics:library": {
151+
"setParserOptionsProject": true
152+
}
145153
}
146154
}

package.json

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@fullstack-devops/ng-mat-components",
33
"version": "0.0.0-PLACEHOLDER",
44
"engines": {
5-
"node": ">=14.0.0 <17.0.0",
5+
"node": ">=18.0.0",
66
"yarn": "^1.22.17",
77
"npm": "Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/"
88
},
@@ -20,16 +20,18 @@
2020
},
2121
"private": false,
2222
"dependencies": {
23-
"@angular/animations": "^14.2.12",
24-
"@angular/cdk": "^14.2.7",
25-
"@angular/common": "^14.2.12",
26-
"@angular/compiler": "^14.2.12",
27-
"@angular/core": "^14.2.12",
28-
"@angular/forms": "^14.2.12",
29-
"@angular/material": "^14.2.7",
30-
"@angular/platform-browser": "^14.2.12",
31-
"@angular/platform-browser-dynamic": "^14.2.12",
32-
"@angular/router": "^14.2.12",
23+
"@angular/animations": "^15.2.10",
24+
"@angular/cdk": "^15.2.9",
25+
"@angular/common": "^15.2.10",
26+
"@angular/compiler": "^15.2.10",
27+
"@angular/core": "^15.2.10",
28+
"@angular/forms": "^15.2.10",
29+
"@angular/material": "^15.2.9",
30+
"@angular/platform-browser": "^15.2.10",
31+
"@angular/platform-browser-dynamic": "^15.2.10",
32+
"@angular/router": "^15.2.10",
33+
"@ng-icons/core": "24",
34+
"@ng-icons/material-icons": "24",
3335
"date-fns": "^2.29.3",
3436
"material-icons": "^1.13.1",
3537
"postcss": "^8.4.20",
@@ -38,30 +40,30 @@
3840
"zone.js": "~0.11.7"
3941
},
4042
"devDependencies": {
41-
"@angular-devkit/build-angular": "^14.2.10",
42-
"@angular-eslint/builder": "^14.4.0",
43-
"@angular-eslint/eslint-plugin": "^14.4.0",
44-
"@angular-eslint/eslint-plugin-template": "^14.4.0",
45-
"@angular-eslint/schematics": "^14.4.0",
46-
"@angular-eslint/template-parser": "^14.4.0",
47-
"@angular/cli": "^14.2.10",
48-
"@angular/compiler-cli": "^14.2.12",
43+
"@angular-devkit/build-angular": "^15.2.10",
44+
"@angular-eslint/builder": "^15.2.1",
45+
"@angular-eslint/eslint-plugin": "^15.2.1",
46+
"@angular-eslint/eslint-plugin-template": "^15.2.1",
47+
"@angular-eslint/schematics": "^15.2.1",
48+
"@angular-eslint/template-parser": "^15.2.1",
49+
"@angular/cli": "^15.2.10",
50+
"@angular/compiler-cli": "^15.2.10",
4951
"@types/jasmine": "~3.10.0",
5052
"@types/node": "^12.11.1",
51-
"@typescript-eslint/eslint-plugin": "^5.36.2",
52-
"@typescript-eslint/parser": "^5.36.2",
53+
"@typescript-eslint/eslint-plugin": "^5.43.0",
54+
"@typescript-eslint/parser": "^5.43.0",
5355
"autoprefixer": "^10.4.13",
54-
"eslint": "^8.23.0",
56+
"eslint": "^8.28.0",
5557
"jasmine-core": "~4.0.0",
5658
"karma": "~6.3.0",
5759
"karma-chrome-launcher": "~3.1.0",
5860
"karma-coverage": "~2.2.0",
5961
"karma-jasmine": "~4.0.0",
6062
"karma-jasmine-html-reporter": "~1.7.0",
61-
"ng-packagr": "^14.2.2",
63+
"ng-packagr": "^15.2.2",
6264
"prettier": "^2.8.3",
6365
"prettier-eslint": "^15.0.1",
6466
"sass": "^1.57.1",
6567
"typescript": "~4.8.4"
6668
}
67-
}
69+
}

projects/lib-workspace/.browserslistrc

Lines changed: 0 additions & 16 deletions
This file was deleted.

projects/lib-workspace/src/app/app.component.html

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,36 @@
1717

1818
<fs-nav-frame-toolbar-end>
1919
<div style="font-size: 12px">
20-
<mat-form-field appearance="outline">
20+
<mat-form-field appearance="outline" dense>
2121
<mat-label>Search</mat-label>
2222
<input matInput placeholder="Searching..." />
2323
</mat-form-field>
2424
</div>
2525
</fs-nav-frame-toolbar-end>
2626
</fs-nav-frame-toolbar>
2727

28+
<fs-nav-frame-sidebar>
29+
<fs-nav-frame-sidebar-item routerLink="home">
30+
<mat-icon class="icon">home</mat-icon>
31+
<span class="title">Home</span>
32+
</fs-nav-frame-sidebar-item>
33+
<fs-nav-frame-sidebar-item routerLink="nav-frame">
34+
<mat-icon class="icon">pivot_table_chart</mat-icon>
35+
<span class="title">Nav Frame</span>
36+
</fs-nav-frame-sidebar-item>
37+
38+
<!-- <fs-nav-frame-sidebar-item routerLink="home"></fs-nav-frame-sidebar-item>
39+
40+
<fs-nav-frame-sidebar-item routerLink="nav-frame">
41+
<fs-sidebar-item-icon>
42+
<mat-icon>pivot_table_chart</mat-icon>
43+
</fs-sidebar-item-icon>
44+
<fs-sidebar-item-title>Nav Frame</fs-sidebar-item-title>
45+
</fs-nav-frame-sidebar-item> -->
46+
</fs-nav-frame-sidebar>
47+
2848
<!-- <fs-nav-frame-sidebar> -->
29-
<fs-nav-user-profile profilePicture="https://material.angular.io/assets/img/examples/shiba1.jpg">
49+
<fs-nav-user-profile >
3050
<!-- profilePicture="https://material.angular.io/assets/img/examples/shiba1.jpg" -->
3151
<fs-nav-user-profile-name>Some User</fs-nav-user-profile-name>
3252
<fs-nav-user-profile-subname>Enginer</fs-nav-user-profile-subname>

projects/lib-workspace/src/app/content/home/home.component.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
justify-content: center;
66
}
77

8-
.docs-components .mat-card {
9-
height: 300px;
10-
width: 250px;
8+
.docs-components mat-card {
9+
width: 380px;
1110
margin: 8px;
1211
cursor: pointer;
1312
}

0 commit comments

Comments
 (0)