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

Commit d8f2a24

Browse files
Merge branch 'main' into main
2 parents dfba692 + 725b302 commit d8f2a24

File tree

22 files changed

+95
-21015
lines changed

22 files changed

+95
-21015
lines changed

e2e/capacitor-e2e/project.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
},
1616
"lint": {
1717
"executor": "@nx/eslint:lint",
18-
"outputs": ["{options.outputFile}"],
19-
"options": {
20-
"lintFilePatterns": ["e2e/capacitor-e2e/**/*.ts"]
21-
}
18+
"outputs": ["{options.outputFile}"]
2219
}
2320
},
2421
"tags": [],

e2e/ionic-angular-e2e/project.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
},
1616
"lint": {
1717
"executor": "@nx/eslint:lint",
18-
"outputs": ["{options.outputFile}"],
19-
"options": {
20-
"lintFilePatterns": ["e2e/ionic-angular-e2e/**/*.ts"]
21-
}
18+
"outputs": ["{options.outputFile}"]
2219
}
2320
},
2421
"tags": [],

e2e/ionic-react-e2e/project.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
},
1616
"lint": {
1717
"executor": "@nx/eslint:lint",
18-
"outputs": ["{options.outputFile}"],
19-
"options": {
20-
"lintFilePatterns": ["e2e/ionic-react-e2e/**/*.ts"]
21-
}
18+
"outputs": ["{options.outputFile}"]
2219
}
2320
},
2421
"tags": [],

e2e/utils/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function createTestProject() {
2222
});
2323

2424
execSync(
25-
`npx --yes create-nx-workspace@latest ${projectName} --preset empty --no-nxCloud --no-interactive`,
25+
`npx --yes create-nx-workspace@latest ${projectName} --preset empty --nxCloud skip --no-interactive`,
2626
{
2727
cwd: dirname(projectDirectory),
2828
stdio: 'inherit',

migrations.json

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

nx.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,6 @@
7777
"inputs": ["production", "^production"],
7878
"cache": true
7979
},
80-
"lint": {
81-
"inputs": [
82-
"default",
83-
"{workspaceRoot}/.eslintrc.json",
84-
"{workspaceRoot}/eslint.config.js"
85-
],
86-
"cache": true
87-
},
8880
"@nx/jest:jest": {
8981
"cache": true,
9082
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
@@ -97,6 +89,14 @@
9789
"codeCoverage": true
9890
}
9991
}
92+
},
93+
"@nx/eslint:lint": {
94+
"inputs": [
95+
"default",
96+
"{workspaceRoot}/.eslintrc.json",
97+
"{workspaceRoot}/eslint.config.js"
98+
],
99+
"cache": true
100100
}
101101
},
102102
"$schema": "./node_modules/nx/schemas/nx-schema.json",

package.json

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,31 @@
4949
"private": true,
5050
"packageManager": "pnpm@8.7.0",
5151
"devDependencies": {
52-
"@angular-devkit/core": "16.0.0",
53-
"@angular-devkit/schematics": "16.0.0",
52+
"@angular-devkit/core": "17.2.1",
53+
"@angular-devkit/schematics": "17.2.1",
5454
"@eslint/eslintrc": "^2.1.1",
5555
"@eslint/js": "8.49.0",
56-
"@nuxt/kit": "3.6.5",
57-
"@nx/angular": "17.1.2",
58-
"@nx/cypress": "17.1.2",
59-
"@nx/devkit": "17.1.2",
60-
"@nx/eslint": "17.1.2",
61-
"@nx/eslint-plugin": "17.1.2",
62-
"@nx/jest": "17.1.2",
63-
"@nx/js": "17.1.2",
64-
"@nx/node": "17.1.2",
65-
"@nx/playwright": "17.1.2",
66-
"@nx/plugin": "17.1.2",
67-
"@nx/react": "17.1.2",
68-
"@nx/storybook": "17.1.2",
69-
"@nx/vite": "17.1.2",
70-
"@nx/web": "17.1.2",
71-
"@nx/workspace": "17.1.2",
72-
"@nxext/svelte": "^16.7.0",
56+
"@nuxt/kit": "3.10.3",
57+
"@nx/angular": "18.0.4",
58+
"@nx/cypress": "18.0.4",
59+
"@nx/devkit": "18.0.4",
60+
"@nx/eslint": "18.0.4",
61+
"@nx/eslint-plugin": "18.0.4",
62+
"@nx/jest": "18.0.4",
63+
"@nx/js": "18.0.4",
64+
"@nx/node": "18.0.4",
65+
"@nx/playwright": "18.0.4",
66+
"@nx/plugin": "18.0.4",
67+
"@nx/react": "18.0.4",
68+
"@nx/storybook": "18.0.4",
69+
"@nx/vite": "18.0.4",
70+
"@nx/web": "18.0.4",
71+
"@nx/workspace": "18.0.4",
72+
"@nxext/svelte": "^17.0.1",
7373
"@phenomnomnominal/tsquery": "~5.0.1",
74-
"@schematics/angular": "16.0.0",
74+
"@schematics/angular": "17.2.1",
7575
"@stencil/core": "3.4.0",
76-
"@swc-node/register": "1.6.8",
76+
"@swc-node/register": "1.8.0",
7777
"@swc/cli": "0.1.62",
7878
"@swc/core": "1.3.91",
7979
"@swc/helpers": "0.5.2",
@@ -82,49 +82,49 @@
8282
"@types/globrex": "^0.1.2",
8383
"@types/is-ci": "^3.0.1",
8484
"@types/jest": "29.5.5",
85-
"@types/node": "18.15.3",
85+
"@types/node": "18.19.18",
8686
"@types/yargs": "^17.0.26",
87-
"@typescript-eslint/eslint-plugin": "6.10.0",
88-
"@typescript-eslint/parser": "6.10.0",
87+
"@typescript-eslint/eslint-plugin": "6.21.0",
88+
"@typescript-eslint/parser": "6.21.0",
8989
"ajv": "6.12.6",
9090
"all-contributors-cli": "^6.26.1",
9191
"chalk": "4.1.0",
9292
"commitizen": "^4.3.0",
93-
"cz-customizable": "^6.9.1",
93+
"cz-customizable": "^7.0.0",
9494
"dotenv": "16.3.1",
95-
"eslint": "8.46.0",
95+
"eslint": "8.48.0",
9696
"eslint-config-prettier": "9.0.0",
9797
"eslint-plugin-cypress": "2.14.0",
9898
"file-type": "^18.5.0",
9999
"fs-extra": "^10.1.0",
100100
"globrex": "^0.1.2",
101-
"husky": "^6.0.0",
102-
"ignore": "^5.2.4",
101+
"husky": "^9.0.11",
102+
"ignore": "^5.3.1",
103103
"is-ci": "^3.0.1",
104-
"jest": "29.4.3",
105-
"jest-environment-jsdom": "29.5.0",
106-
"jest-environment-node": "^29.4.1",
104+
"jest": "29.7.0",
105+
"jest-environment-jsdom": "29.7.0",
106+
"jest-environment-node": "^29.7.0",
107107
"jsonc-eslint-parser": "^2.3.0",
108108
"jsonc-parser": "^3.2.0",
109109
"kill-port": "^2.0.1",
110110
"lint-staged": "13.2.3",
111-
"nx": "17.1.2",
111+
"nx": "18.0.4",
112112
"prettier": "2.7.1",
113113
"pretty-quick": "^3.1.3",
114114
"tcp-port-used": "^1.0.2",
115-
"ts-jest": "29.1.1",
115+
"ts-jest": "29.1.2",
116116
"ts-node": "10.9.1",
117117
"tslib": "^2.3.0",
118118
"tslint": "6.1.3",
119-
"typescript": "5.2.2",
120-
"verdaccio": "5.18.0",
119+
"typescript": "5.3.3",
120+
"verdaccio": "5.29.2",
121121
"verdaccio-auth-memory": "^10.2.2",
122-
"vitepress": "^1.0.0-rc.20",
122+
"vitepress": "^1.0.0-rc.44",
123123
"yargs": "^17.7.2",
124124
"yargs-parser": "^21.1.1"
125125
},
126126
"peerDependencies": {
127-
"rxjs": "^7.4.0"
127+
"rxjs": "^7.5.0"
128128
},
129129
"lint-staged": {
130130
"nx.json": [

packages/capacitor/migrations.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"generators": {},
33
"packageJsonUpdates": {
4-
"16.2.0": {
5-
"version": "16.2.0",
4+
"18.0.4": {
5+
"version": "18.0.4",
66
"packages": {
77
"@capacitor/core": {
8-
"version": "^5.0.3",
8+
"version": "^5.7.0",
99
"alwaysAddToPackageJson": true
1010
},
1111
"@capacitor/cli": {
12-
"version": "^5.0.3",
12+
"version": "^5.7.0",
1313
"alwaysAddToPackageJson": true
1414
},
1515
"@capacitor/ios": {
16-
"version": "^5.0.3",
16+
"version": "^5.7.0",
1717
"alwaysAddToPackageJson": false
1818
},
1919
"@capacitor/android": {
20-
"version": "^5.0.3",
20+
"version": "^5.7.0",
2121
"alwaysAddToPackageJson": false
2222
}
2323
}

packages/capacitor/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "@nxext/capacitor",
3-
"version": "17.1.2",
3+
"version": "18.0.4",
44
"description": "An Nx plugin for developing cross-platform applications using Capacitor",
55
"author": {
66
"name": "Devin Shoemaker",
77
"email": "devinshoe@gmail.com"
88
},
9-
"homepage": "https://nxext.dev/docs/capacitor/getting-started.html",
9+
"homepage": "https://nxext.github.io/nx-extensions-ionic/docs/capacitor/getting-started.html",
1010
"repository": {
1111
"type": "git",
12-
"url": "https://github.com/nxext/nx-extensions",
12+
"url": "https://github.com/nxext/nx-extensions-ionic",
1313
"directory": "packages/capacitor"
1414
},
1515
"license": "MIT",
@@ -24,10 +24,10 @@
2424
"dependencies": {
2525
"tslib": "^2.3.0",
2626
"ignore": "^5.2.4",
27-
"@nx/devkit": "^17.1.2",
28-
"nx": "^17.1.2"
27+
"@nx/devkit": "18.0.4",
28+
"nx": "18.0.4"
2929
},
3030
"peerDependencies": {
31-
"@nx/web": "17.1.2"
31+
"@nx/web": "18.0.4"
3232
}
3333
}

packages/capacitor/project.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,7 @@
4444
},
4545
"lint": {
4646
"executor": "@nx/eslint:lint",
47-
"outputs": ["{options.outputFile}"],
48-
"options": {
49-
"lintFilePatterns": [
50-
"packages/capacitor/**/*.ts",
51-
"packages/capacitor/generators.json",
52-
"packages/capacitor/executors.json",
53-
"packages/capacitor/package.json",
54-
"packages/capacitor/project.json",
55-
"packages/capacitor/migrations.json"
56-
]
57-
}
47+
"outputs": ["{options.outputFile}"]
5848
},
5949
"test": {
6050
"executor": "@nx/jest:jest",

0 commit comments

Comments
 (0)