fix(capacitor): dist nodejs files correctly

capacitor/capacitor.config.js

@@ -4,7 +4,6 @@ const config = {
   appId: 'watch.miru',
   appName: 'Miru',
   webDir: 'build',
-  bundledWebRuntime: false,
   android: {
     buildOptions: {
       keystorePath: './watch.miru',

capacitor/config-node.sh

@@ -29,7 +29,7 @@ export npm_gyp_defines="target_arch=$node_target_arch v8_target_arch=$node_targe
 
 #mv node_modules ../node_modules.bak
 # --from-from-source is used by node-pre-gyp
-cd resources/nodejs
+cd public/nodejs
 npm rebuild --build-from-source
 # Remove executable permissions from native node modules
 # find node_modules -iname '*.node' -exec chmod -x '{}' \;

capacitor/git_modules/nodejs-mobile

@@ -1 +1 @@
-Subproject commit 1b0223dc74dfa359e61131ee24e0fa386c6d12aa
+Subproject commit 23c55996d50e0f750e4b013a51d212e98dc661ea

capacitor/package.json

@@ -2,7 +2,7 @@
   "name": "capacitor",
   "private": true,
   "scripts": {
-    "postinstall": "cd resources/nodejs/ && npm install",
+    "postinstall": "cd public/nodejs/ && npm install",
     "build:app": "cross-env NODE_ENV=production run-s build:web build:assets build:android",
     "build:web": "webpack build",
     "build:android": "cap build android",

capacitor/public/nodejs/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "capacitor-nodejs-thread",
+  "name": "nodejs-capacitor-thread",
   "private": true,
   "dependencies": {
     "utp-native": "^2.5.3"

capacitor/webpack.config.cjs

@@ -1,6 +1,7 @@
 const commonConfig = require('common/webpack.config.cjs')
 const { merge } = require('webpack-merge')
 const { join, resolve } = require('path')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
 
 const mode = process.env.NODE_ENV?.trim() || 'development'
 
@@ -35,7 +36,14 @@ const capacitorConfig = {
       overlay: { errors: true, warnings: false, runtimeErrors: false }
     },
     port: 5000
-  }
+  },
+  plugins: [
+    new CopyWebpackPlugin({
+      patterns: [
+        { from: join(__dirname, 'public', 'nodejs') }
+      ]
+    }),
+  ]
 }
 
 const alias = {

package.json

@@ -31,5 +31,8 @@
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1",
     "webtorrent": "^2.1.29"
+  },
+  "devDependencies": {
+    "npm-run-all": "^4.1.5"
   }
 }

pnpm-workspace.yaml

@@ -1,5 +1,2 @@
 packages:
-  - 'common'
+  - './*'
-  - 'capacitor/*'
-  - 'electron/*'
-  - 'web/*'