Skip to content

Commit acbdf94

Browse files
committed
build: fixed pnpm link issue
See witchcraftjs/editor@c4c2648
1 parent b1f5409 commit acbdf94

7 files changed

Lines changed: 1139 additions & 9965 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ To build nuxt for android and also build android, set `BUILD_ANDROID=true` in th
9898
// pages/index.vue
9999
<script setup lang="ts">
100100
if (isNativeMobile()) {
101-
navigateTo("/app")
101+
await navigateTo("/app")
102102
}
103103
</script>
104104

package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"dist"
3131
],
3232
"scripts": {
33-
"prepare": "husky && pnpm nuxt-module-build prepare && pnpm build:only && cd playground && pnpm i --ignore-scripts --ignore-workspace",
33+
"prepare": "husky && pnpm dev:prepare",
3434
"build": "nuxt-module-build prepare && nuxt-module-build build && nuxi build playground",
3535
"build:only": "nuxt-module-build build",
3636
"dev": "nuxi dev playground",
@@ -41,36 +41,36 @@
4141
"test:watch": "vitest watch"
4242
},
4343
"peerDependencies": {
44-
"@capacitor/android": "^7.4.3",
45-
"@capacitor/app": "^7.1.0",
46-
"@capacitor/core": "^7.4.3"
44+
"@capacitor/android": "catalog:",
45+
"@capacitor/app": "catalog:",
46+
"@capacitor/core": "catalog:"
4747
},
4848
"dependencies": {
49-
"@alanscodelog/utils": "^6.0.2",
50-
"@capacitor/android": "^7.4.3",
51-
"@capacitor/app": "^7.1.0",
52-
"@capacitor/core": "^7.4.3",
53-
"@nuxt/kit": "^4.1.2",
54-
"@witchcraft/nuxt-utils": "^0.3.3",
55-
"defu": "^6.1.4"
49+
"@alanscodelog/utils": "catalog:",
50+
"@capacitor/android": "catalog:",
51+
"@capacitor/app": "catalog:",
52+
"@capacitor/core": "catalog:",
53+
"@nuxt/kit": "catalog:",
54+
"@witchcraft/nuxt-utils": "catalog:",
55+
"defu": "catalog:"
5656
},
5757
"devDependencies": {
58-
"@alanscodelog/eslint-config": "^6.3.1",
59-
"@alanscodelog/semantic-release-config": "^5.0.4",
60-
"@alanscodelog/tsconfigs": "^6.2.0",
61-
"@capacitor/cli": "^7.4.3",
62-
"@nuxt/eslint-config": "^1.9.0",
63-
"@nuxt/module-builder": "^1.0.2",
64-
"@nuxt/schema": "^4.1.2",
65-
"@nuxt/test-utils": "^3.19.2",
58+
"@alanscodelog/eslint-config": "catalog:",
59+
"@alanscodelog/semantic-release-config": "catalog:",
60+
"@alanscodelog/tsconfigs": "catalog:",
61+
"@capacitor/cli": "catalog:",
62+
"@nuxt/eslint-config": "catalog:",
63+
"@nuxt/module-builder": "catalog:",
64+
"@nuxt/schema": "catalog:",
65+
"@nuxt/test-utils": "catalog:",
6666
"@types/node": "latest",
67-
"changelogen": "^0.6.2",
68-
"eslint": "^9.37.0",
69-
"husky": "^9.1.7",
70-
"nuxt": "^4.1.2",
71-
"typescript": "^5.9.3",
72-
"vitest": "^3.2.4",
73-
"vue-tsc": "^3.1.0"
67+
"changelogen": "catalog:",
68+
"eslint": "catalog:",
69+
"husky": "catalog:",
70+
"nuxt": "catalog:",
71+
"typescript": "catalog:",
72+
"vitest": "catalog:",
73+
"vue-tsc": "catalog:"
7474
},
7575
"release": {
7676
"extends": [

playground/nuxt.config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ export default defineNuxtConfig({
66
},
77
modules: [
88
"../src/module",
9-
// the below also works, just remember to run the update-dep script and uncomment ../src/module above before attempting to use the file: linked module
10-
// "@witchcraft/nuxt-android",
119
],
1210
routeRules: {
1311
"/api/**": {

playground/package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"dev": "nuxi dev",
77
"build": "nuxi build",
88
"preview": "nuxt preview .dist/web",
9-
"update-dep": "cd ../ && pnpm build:only && cd playground && pnpm update @witchcraft/nuxt-android",
109
"======= android": "=======",
1110
"dev:android": "AUTO_OPEN=android nuxi dev --host",
1211
"build:android": "BUILD_ANDROID=true nuxi build",
@@ -15,15 +14,15 @@
1514
"android:sync:android": "node ./node_modules/@witchcraft/nuxt-android/build/syncGradleWithEnv.js"
1615
},
1716
"dependencies": {
18-
"@capacitor/android": "^7.4.3",
19-
"@capacitor/app": "^7.1.0",
20-
"@capacitor/core": "^7.4.3",
21-
"@witchcraft/nuxt-android": "^0.0.2",
22-
"@witchcraft/nuxt-logger": "^0.0.6",
23-
"nuxt": "^4.0.3",
24-
"thread-stream": "^3.1.0"
17+
"@capacitor/android": "catalog:",
18+
"@capacitor/app": "catalog:",
19+
"@capacitor/core": "catalog:",
20+
"@witchcraft/nuxt-android": "catalog:",
21+
"@witchcraft/nuxt-logger": "catalog:",
22+
"nuxt": "catalog:",
23+
"thread-stream": "catalog:"
2524
},
2625
"devDependencies": {
27-
"@capacitor/cli": "6.1.2"
26+
"@capacitor/cli": "catalog:"
2827
}
2928
}

0 commit comments

Comments
 (0)