Sfoglia il codice sorgente

mobile: use capacitor.config.ts && yarn app-watch

Tienson Qin 4 anni fa
parent
commit
5b11a90c67
5 ha cambiato i file con 26 aggiunte e 16 eliminazioni
  1. 0 10
      capacitor.config.json
  2. 14 0
      capacitor.config.ts
  3. 3 3
      mobile.md
  4. 4 1
      package.json
  5. 5 2
      yarn.lock

+ 0 - 10
capacitor.config.json

@@ -1,10 +0,0 @@
-{
-  "appId": "com.logseq.app",
-  "appName": "Logseq",
-  "webDir": "public",
-  "bundledWebRuntime": false,
-  "server": {
-      "url": "http://192.168.50.122:3001",
-      "cleartext": true
-  }
-}

+ 14 - 0
capacitor.config.ts

@@ -0,0 +1,14 @@
+import { CapacitorConfig } from '@capacitor/cli';
+
+const config: CapacitorConfig = {
+  appId: 'com.Logseq',
+  appName: 'capacitor-testapp',
+  bundledWebRuntime: false,
+  webDir: 'public',
+  server: {
+    url: process.env.LOGSEQ_APP_SERVER_URL,
+    cleartext: true
+  }
+};
+
+export = config;

+ 3 - 3
mobile.md

@@ -2,10 +2,10 @@
 * Android studio
 * SDK 29
 * other sdk tools in Android studio preference setting https://capacitorjs.com/docs/getting-started/environment-setup
-* change the server url in capacitor.config.json with your local ip:3001 (run ifconig to check)
-* run `yarn && yarn watch`
+* change the server url in capacitor.config.json with your local ip:3001 (run ifconfig to check)
+* run `yarn && yarn app-watch`
 * in another console, run `npx cap open android`
 * create Android virtual device in Android studio
 * click the run button in Android stutio to run the project
 * after logseq startup in Android virtual device, repl should be able to connect
-* for borwser console print and devtool remote debug, open chrome, type url chrome://inspect/#devices, you should see your device there, click inspect
+* for browser console print and devtool remote debug, open chrome, type url chrome://inspect/#devices, you should see your device there, click inspect

+ 4 - 1
package.json

@@ -23,11 +23,13 @@
         "shadow-cljs": "2.15.3",
         "stylelint": "^13.8.0",
         "stylelint-config-standard": "^20.0.0",
-        "tailwindcss": "2.2.4"
+        "tailwindcss": "2.2.4",
+        "typescript": "^4.4.3"
     },
     "scripts": {
         "watch": "run-p gulp:watch cljs:watch",
         "electron-watch": "run-p gulp:watch cljs:electron-watch",
+        "app-watch": "run-p gulp:watch cljs:app-watch",
         "release": "run-s gulp:build cljs:release",
         "dev-release-app": "run-s gulp:build cljs:dev-release-app",
         "dev-electron-app": "gulp electron",
@@ -43,6 +45,7 @@
         "css:build": "postcss tailwind.all.css -o static/css/style.css --verbose --env production",
         "css:watch": "TAILWIND_MODE=watch postcss tailwind.all.css -o static/css/style.css --verbose --watch",
         "cljs:watch": "PATCH_PARSER_WORKER=$(cat \"./templates/patch.parser.woker.js\" | sed -e \"s#PWD_ROOT#`pwd`#g\") clojure -M:cljs watch parser-worker app electron",
+        "cljs:app-watch": "PATCH_PARSER_WORKER=$(cat \"./templates/patch.parser.woker.js\" | sed -e \"s#PWD_ROOT#`pwd`#g\") clojure -M:cljs watch parser-worker app",
         "cljs:electron-watch": "PATCH_PARSER_WORKER=$(cat \"./templates/patch.parser.woker.js\" | sed -e \"s#PWD_ROOT#`pwd`#g\") clojure -M:cljs watch parser-worker app electron",
         "cljs:release": "clojure -M:cljs release parser-worker app publishing electron",
         "cljs:test": "clojure -M:test compile test",

+ 5 - 2
yarn.lock

@@ -7861,8 +7861,6 @@ react-icons@^2.2.7:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-2.2.7.tgz#d7860826b258557510dac10680abea5ca23cf650"
   integrity sha512-0n4lcGqzJFcIQLoQytLdJCE0DKSA9dkwEZRYoGrIDJZFvIT6Hbajx5mv9geqhqFiNjUgtxg8kPyDfjlhymbGFg==
-  dependencies:
-    react-icon-base "2.1.0"
 
 react-is@^16.3.1, react-is@^16.8.1:
   version "16.13.1"
@@ -9506,6 +9504,11 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
+  integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
+
 ua-parser-js@^0.7.18:
   version "0.7.28"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"