Skip to content
This repository was archived by the owner on Oct 7, 2024. It is now read-only.

Commit 1ff5540

Browse files
committed
chore(nxext): update Nx 18.3
1 parent d221bd0 commit 1ff5540

File tree

8 files changed

+5875
-9750
lines changed

8 files changed

+5875
-9750
lines changed

.github/workflows/ci.yml

+31-19
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,39 @@ name: CI
33
on:
44
push:
55
branches:
6-
- main
6+
- master
77
pull_request:
88

9+
permissions:
10+
actions: read
11+
contents: read
12+
913
jobs:
1014
main:
11-
name: Nx Cloud - Main Job
12-
uses: nrwl/ci/.github/workflows/[email protected]
13-
with:
14-
main-branch-name: main
15-
number-of-agents: 3
16-
init-commands: |
17-
pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
18-
parallel-commands: |
19-
pnpm exec nx-cloud record -- pnpm exec nx format:check
20-
parallel-commands-on-agents: |
21-
pnpm exec nx affected --target=lint --parallel=3
22-
pnpm exec nx affected --target=test --parallel=3 --ci --code-coverage
23-
pnpm exec nx affected --target=build --parallel=3
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
with:
19+
fetch-depth: 0
20+
21+
- uses: pnpm/action-setup@v2
22+
with:
23+
version: 8
24+
# Cache node_modules
25+
- uses: actions/setup-node@v3
26+
with:
27+
node-version: 18
28+
cache: 'pnpm'
29+
- uses: actions/cache@v4
30+
with:
31+
lookup-only: true
32+
path: '**/node_modules'
33+
key: pnpm-${{ hashFiles('pnpm-lock.yaml') }}
34+
# Connect your workspace on nx.app and uncomment this to enable task distribution.
35+
# The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
36+
- run: pnpm install --no-frozen-lockfile
37+
- uses: nrwl/nx-set-shas@v4
38+
#- run: pnpm exec nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
2439

25-
agents:
26-
name: Nx Cloud - Agents
27-
uses: nrwl/ci/.github/workflows/[email protected]
28-
with:
29-
number-of-agents: 3
40+
- run: pnpm exec nx-cloud record -- nx format:check
41+
- run: pnpm exec nx affected -t lint test build

.prettierignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
.docusaurus/
77
/build
88

9-
/.nx/cache
9+
/.nx/cache
10+
pnpm-lock.yaml

package.json

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "nxext",
2+
"name": "nxext-ionic",
33
"version": "0.0.0",
44
"license": "MIT",
55
"keywords": [
@@ -49,35 +49,34 @@
4949
"private": true,
5050
"packageManager": "[email protected]",
5151
"devDependencies": {
52-
"@angular-devkit/core": "17.2.1",
53-
"@angular-devkit/schematics": "17.2.1",
52+
"@angular-devkit/core": "17.3.5",
53+
"@angular-devkit/schematics": "17.3.4",
5454
"@eslint/eslintrc": "^2.1.1",
5555
"@eslint/js": "8.49.0",
5656
"@nuxt/kit": "3.10.3",
57-
"@nx/angular": "18.2.4",
58-
"@nx/cypress": "18.2.4",
59-
"@nx/devkit": "18.2.4",
60-
"@nx/eslint": "18.2.4",
61-
"@nx/eslint-plugin": "18.2.4",
62-
"@nx/jest": "18.2.4",
63-
"@nx/js": "18.2.4",
64-
"@nx/node": "18.2.4",
65-
"@nx/playwright": "18.2.4",
66-
"@nx/plugin": "18.2.4",
67-
"@nx/react": "18.2.4",
68-
"@nx/storybook": "18.2.4",
69-
"@nx/vite": "18.2.4",
70-
"@nx/web": "18.2.4",
71-
"@nx/workspace": "18.2.4",
72-
"@nxext/svelte": "^17.0.1",
57+
"@nx/angular": "18.3.1",
58+
"@nx/cypress": "18.3.1",
59+
"@nx/devkit": "18.3.1",
60+
"@nx/eslint": "18.3.1",
61+
"@nx/eslint-plugin": "18.3.1",
62+
"@nx/jest": "18.3.1",
63+
"@nx/js": "18.3.1",
64+
"@nx/node": "18.3.1",
65+
"@nx/playwright": "18.3.1",
66+
"@nx/plugin": "18.3.1",
67+
"@nx/react": "18.3.1",
68+
"@nx/storybook": "18.3.1",
69+
"@nx/vite": "18.3.1",
70+
"@nx/web": "18.3.1",
71+
"@nx/workspace": "18.3.1",
72+
"@nxext/svelte": "^18.0.0",
7373
"@phenomnomnominal/tsquery": "~5.0.1",
74-
"@schematics/angular": "17.2.1",
74+
"@schematics/angular": "17.3.4",
7575
"@stencil/core": "3.4.0",
7676
"@swc-node/register": "1.8.0",
7777
"@swc/cli": "0.1.62",
78-
"@swc/core": "1.3.91",
79-
"@swc/helpers": "0.5.2",
80-
"@swc/jest": "0.2.26",
78+
"@swc/core": "^1.3.85",
79+
"@swc/jest": "^0.2.20",
8180
"@types/glob": "^8.1.0",
8281
"@types/globrex": "^0.1.2",
8382
"@types/is-ci": "^3.0.1",
@@ -108,7 +107,8 @@
108107
"jsonc-parser": "^3.2.1",
109108
"kill-port": "^2.0.1",
110109
"lint-staged": "13.2.3",
111-
"nx": "18.2.4",
110+
"nx": "18.3.1",
111+
"nx-cloud": "^18.0.0",
112112
"prettier": "2.7.1",
113113
"pretty-quick": "^3.1.3",
114114
"tcp-port-used": "^1.0.2",

packages/capacitor/package.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
"schematics": "./generators.json",
2323
"builders": "./executors.json",
2424
"dependencies": {
25-
"tslib": "^2.3.0",
26-
"ignore": "^5.2.4",
27-
"@nx/devkit": "18.2.4",
28-
"nx": "18.2.4"
25+
"@nx/devkit": "18.3.1",
26+
"nx": "18.3.1",
27+
"@nx/web": "18.3.1",
28+
"ignore": "^5.3.1",
29+
"tslib": "^2.3.0"
2930
},
30-
"peerDependencies": {
31-
"@nx/web": "18.2.4"
32-
}
31+
"peerDependencies": {}
3332
}

packages/ionic-angular/package.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@
2525
"schematics": "./generators.json",
2626
"builders": "./executors.json",
2727
"dependencies": {
28-
"tslib": "^2.3.0",
2928
"@nxext/capacitor": "^18.0.4",
29+
"@nx/devkit": "18.3.1",
30+
"@nx/eslint": "18.3.1",
31+
"@nx/angular": "18.3.1",
32+
"@nx/js": "18.3.1",
3033
"@phenomnomnominal/tsquery": "~5.0.1",
31-
"@nx/devkit": "18.2.4",
3234
"typescript": "5.4.5",
33-
"@nx/js": "18.2.4"
35+
"tslib": "^2.3.0"
3436
},
35-
"peerDependencies": {
36-
"@nx/angular": "18.2.4",
37-
"@nx/eslint": "18.2.4"
38-
}
37+
"peerDependencies": {}
3938
}

packages/ionic-angular/src/generators/application/lib/add-angular.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ export async function addAngular(
1111
return await applicationGenerator(host, {
1212
...options,
1313
name: options.name,
14-
skipFormat: options.skipFormat,
14+
directory: options.directory,
15+
skipFormat: true,
1516
routing: true,
1617
style: 'scss',
1718
linter: Linter.EsLint,

packages/ionic-react/package.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
"schematics": "./generators.json",
2626
"builders": "./executors.json",
2727
"dependencies": {
28-
"tslib": "^2.3.0",
2928
"@nxext/capacitor": "^18.0.4",
30-
"@nx/devkit": "18.2.4",
31-
"typescript": "5.4.5"
32-
},
33-
"peerDependencies": {
34-
"@nx/react": "18.2.4",
29+
"@nx/devkit": "18.3.1",
30+
"@nx/eslint": "18.3.1",
31+
"@nx/react": "18.3.1",
32+
"typescript": "5.4.5",
3533
"@phenomnomnominal/tsquery": "~5.0.1",
36-
"@nx/eslint": "18.2.4"
37-
}
34+
"tslib": "^2.3.0"
35+
},
36+
"peerDependencies": {}
3837
}

0 commit comments

Comments
 (0)