Skip to content

Commit d1349df

Browse files
gcollingcollin
authored
Merge pull request #61 from dont-code/upgrade
Upgrade
2 parents 33b2922 + 296849a commit d1349df

69 files changed

Lines changed: 6441 additions & 5199 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci-website.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
with:
2424
ref: ${{ env.branch }}
2525
token: ${{secrets.DONTCODE_ACTIONS_TOKEN}}

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2424
with:
2525
ref: ${{ env.branch }}
2626
token: ${{secrets.DONTCODE_ACTIONS_TOKEN}}
@@ -30,18 +30,20 @@ jobs:
3030
with:
3131
name: Dont-code
3232
email: developer@dont-code.net
33-
- uses: actions/setup-node@v4
33+
- uses: actions/setup-node@v6
3434
with:
35-
node-version: 20
35+
node-version: 24
3636
# - name: Verify Change Logs
3737
# run: node common/scripts/install-run-rush.js change --verify
3838
- name: Rush Install
39-
run: node common/scripts/install-run-rush.js install
39+
run: |
40+
npm install -g pnpm@latest
41+
node common/scripts/install-run-rush.js install
4042
- name: Rush rebuild
4143
run: node common/scripts/install-run-rush.js rebuild
4244
- name: Unit Tests
4345
run: node common/scripts/install-run-rush.js test
44-
- uses: actions/upload-artifact@v4
46+
- uses: actions/upload-artifact@v6
4547
if: failure()
4648
with:
4749
name: test-logs

‎.github/workflows/deploy.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
steps:
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 1
3232
ref: ${{ env.branch }}
@@ -37,12 +37,13 @@ jobs:
3737
with:
3838
name: Dont-code
3939
email: developer@dont-code.net
40-
- uses: actions/setup-node@v4
40+
- uses: actions/setup-node@v6
4141
with:
42-
node-version: 20
42+
node-version: 24
4343
registry-url: 'https://registry.npmjs.org'
4444
- name: Install
4545
run: |
46+
npm install -g pnpm@latest
4647
node common/scripts/install-run-rush.js install
4748
- name: Build
4849
run: |

‎.github/workflows/doc-update.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
with:
1616
ref: ${{ env.branch }}
1717
token: ${{secrets.DONTCODE_ACTIONS_TOKEN}}

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828

2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v6
3131
with:
3232
fetch-depth: 1
3333
ref: ${{ env.branch }}
@@ -50,6 +50,7 @@ jobs:
5050
echo "XT_VERSION : $XT_VERSION"
5151
- name: Install
5252
run: |
53+
npm install -g pnpm@latest
5354
node common/scripts/install-run-rush.js install
5455
- name: Build
5556
run: |

‎apps/xt-host/angular.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"version": 1,
44
"cli": {
5-
"packageManager": "pnpm",
65
"analytics": "cf875e2f-dffc-4763-9249-15d06cfa7c81",
76
"cache": {
87
"enabled": true

‎apps/xt-host/package.json‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,46 +14,45 @@
1414
"url": "https://github.com/dont-code/ng-xtend.git"
1515
},
1616
"dependencies": {
17-
"@angular/animations": "^20.3.9",
18-
"@angular/common": "^20.3.9",
19-
"@angular/compiler": "^20.3.9",
20-
"@angular/core": "^20.3.9",
21-
"@angular/forms": "^20.3.9",
22-
"@angular/platform-browser": "^20.3.9",
23-
"@angular/platform-browser-dynamic": "^20.3.9",
24-
"@angular/router": "^20.3.9",
17+
"@angular/animations": "^21.2.7",
18+
"@angular/common": "^21.2.7",
19+
"@angular/compiler": "^21.2.7",
20+
"@angular/core": "^21.2.7",
21+
"@angular/forms": "^21.2.7",
22+
"@angular/platform-browser": "^21.2.7",
23+
"@angular/platform-browser-dynamic": "^21.2.7",
24+
"@angular/router": "^21.2.7",
2525
"xt-components": "workspace:^",
2626
"xt-plugin-default": "workspace:^",
2727
"xt-type": "workspace:^",
2828
"xt-store": "workspace:^",
2929
"rxjs": "^7.8.2",
3030
"tslib": "^2.8.1",
3131
"es-module-shims": "^2.6.2",
32-
"primeng": "^20.3.0",
32+
"primeng": "^21.1.5",
3333
"primeicons": "^7.0.0",
34-
"@primeuix/themes": "^1.2.5",
35-
"tailwindcss": "~4.1.16",
36-
"@ngrx/signals": "^20.1.0",
34+
"@primeuix/themes": "^2.0.3",
35+
"tailwindcss": "~4.2.2",
36+
"@ngrx/signals": "^21.1.0",
3737
"@softarc/native-federation-runtime": "^3.3.6",
38-
"@angular-architects/native-federation": "^20.1.7"
38+
"@angular-architects/native-federation": "^21.2.3"
3939
},
4040
"devDependencies": {
41-
"@primeuix/utils": "^0.6.1",
41+
"@primeuix/utils": "^0.7.1",
4242
"@primeuix/styled": "^0.7.2",
43-
"@tailwindcss/postcss": "~4.1.16",
43+
"@tailwindcss/postcss": "~4.2.2",
4444
"postcss": "~8.5.6",
45-
"@angular-devkit/build-angular": "^20.3.8",
46-
"@angular/cli": "^20.3.8",
47-
"@angular/compiler-cli": "^20.3.9",
48-
"@angular/build": "^20.3.8",
49-
"ng-packagr": "^20.3.0",
45+
"@angular-devkit/build-angular": "^21.2.6",
46+
"@angular/cli": "^21.2.6",
47+
"@angular/compiler-cli": "^21.2.7",
48+
"@angular/build": "^21.2.6",
49+
"ng-packagr": "^21.2.2",
5050
"typescript": "^5.9.3",
51-
"happy-dom": "^18.0.1",
52-
"@analogjs/vite-plugin-angular":"^1.22.4",
53-
"@analogjs/vitest-angular": "^1.22.4",
54-
"jsdom": "^26.1.0",
55-
"vite": "^7.1.12",
56-
"vitest": "^3.2.4",
57-
"vite-tsconfig-paths": "~5.1.4"
51+
"happy-dom": "^20.8.9",
52+
"@analogjs/vite-plugin-angular":"^2.4.0",
53+
"@analogjs/vitest-angular": "^2.4.0",
54+
"jsdom": "^29.0.1",
55+
"vite": "^8.0.3",
56+
"vitest": "^4.1.2"
5857
}
5958
}

‎apps/xt-host/projects/host/federation.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { withNativeFederation, shareAll,share } = require('@angular-architects/native-federation/config');
22

33
module.exports = withNativeFederation({
4-
4+
name: 'xt-host',
55
shared: {
66
...shareAll({ singleton: true, strictVersion: true, requiredVersion: 'auto' }),
77
...share({

‎apps/xt-host/projects/host/public/assets/config/collinfr.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212
"display-name": "Web plugin",
1313
"version": "1.0.0",
1414
"info": {
15-
"remote-entry":"https://test.dont-code.net/apps/latest/web-plugin/remoteEntry.json"
15+
"remote-entry":"https://dont-code.net/apps/latest/web-plugin/remoteEntry.json"
1616
},
1717
"config": {}
1818
}, {
1919
"id": "International",
2020
"display-name": "International plugin",
2121
"version": "1.0.0",
2222
"info": {
23-
"remote-entry":"https://test.dont-code.net/apps/latest/intl-plugin/remoteEntry.json"
23+
"remote-entry":"https://dont-code.net/apps/latest/intl-plugin/remoteEntry.json"
2424
},
2525
"config": {}
2626
}, {
2727
"id": "Finance",
2828
"display-name": "Finance plugin",
2929
"version": "1.0.0",
3030
"info": {
31-
"remote-entry":"https://test.dont-code.net/apps/latest/finance-plugin/remoteEntry.json"
31+
"remote-entry":"https://dont-code.net/apps/latest/finance-plugin/remoteEntry.json"
3232
},
3333
"config": {}
3434
}, {
3535
"id": "Agenda",
3636
"display-name": "Agenda plugin",
3737
"version": "1.0.0",
3838
"info": {
39-
"remote-entry":"https://test.dont-code.net/apps/latest/agenda-plugin/remoteEntry.json"
39+
"remote-entry":"https://dont-code.net/apps/latest/agenda-plugin/remoteEntry.json"
4040
},
4141
"config": {}
4242
}

‎apps/xt-host/projects/host/public/assets/config/default.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212
"display-name": "Web plugin",
1313
"version": "1.0.0",
1414
"info": {
15-
"remote-entry":"https://test.dont-code.net/apps/latest/web-plugin/remoteEntry.json"
15+
"remote-entry":"https://dont-code.net/apps/latest/web-plugin/remoteEntry.json"
1616
},
1717
"config": {}
1818
}, {
1919
"id": "International",
2020
"display-name": "International plugin",
2121
"version": "0.5",
2222
"info": {
23-
"remote-entry":"https://test.dont-code.net/apps/latest/intl-plugin/remoteEntry.json"
23+
"remote-entry":"https://dont-code.net/apps/latest/intl-plugin/remoteEntry.json"
2424
},
2525
"config": {}
2626
}, {
2727
"id": "Finance",
2828
"display-name": "Finance plugin",
2929
"version": "0.5",
3030
"info": {
31-
"remote-entry":"https://test.dont-code.net/apps/latest/finance-plugin/remoteEntry.json"
31+
"remote-entry":"https://dont-code.net/apps/latest/finance-plugin/remoteEntry.json"
3232
},
3333
"config": {}
3434
}, {
3535
"id": "Agenda",
3636
"display-name": "Agenda plugin",
3737
"version": "1.0.0",
3838
"info": {
39-
"remote-entry":"https://test.dont-code.net/apps/latest/agenda-plugin/remoteEntry.json"
39+
"remote-entry":"https://dont-code.net/apps/latest/agenda-plugin/remoteEntry.json"
4040
},
4141
"config": {}
4242
}

0 commit comments

Comments
 (0)