Merge pull request #3 from Termina/fix-safari

fix chrome detection; upgrade deps

.github/workflows/upload.yaml

@@ -17,9 +17,9 @@ jobs:
         node-version: 20
         cache: 'yarn'
 
-    - uses: calcit-lang/setup-cr@0.0.3
+    - uses: calcit-lang/setup-cr@0.0.7
       with:
-        version: '0.9.1'
+        bundler: false
 
     - name: "compiles to js"
       run: >

compact.cirru

@@ -242,7 +242,7 @@
       :defs $ {}
         |chrome-extension? $ %{} :CodeEntry (:doc |)
           :code $ quote
-            def chrome-extension? $ and (some? js/chrome) (some? js/chrome.runtime) (some? js/chrome.runtime.id)
+            def chrome-extension? $ and (some? js/window.chrome) (some? js/window.chrome.runtime) (some? js/window.chrome.runtime.id)
         |dev? $ %{} :CodeEntry (:doc |)
           :code $ quote
             def dev? $ = "\"dev" (get-env "\"mode" "\"release")

deps.cirru

@@ -1,5 +1,6 @@
 
 {}
+  :calcit-version |0.9.5
   :dependencies $ {}
     |calcit-lang/lilac |main
     |calcit-lang/memof |main

extension/get-selected.mjs

@@ -1,18 +1,18 @@
 export let get_selected = () => {
   return new Promise((resolve, reject) => {
-    if (chrome?.runtime?.id == null) {
+    if (window.chrome?.runtime?.id == null) {
       console.warn("not chrome extension runtime...");
       resolve(null);
       return;
     }
     console.log("calling content script...");
-    chrome.tabs
+    window.chrome.tabs
       .query({ active: true, currentWindow: true })
       .then((x) => {
         let activeTab = x[0];
         if (activeTab) {
           let id = activeTab.id;
-          chrome.tabs.sendMessage(id, { get: "selected" }, function (response) {
+          window.chrome.tabs.sendMessage(id, { get: "selected" }, function (response) {
             // 接收来自 content.js 的返回数据
             // console.info('Content script returned: ' + response);
             resolve(response);

package.json

@@ -1,14 +1,14 @@
 {
   "dependencies": {
-    "@calcit/procs": "^0.9.1",
-    "@google/generative-ai": "^0.16.0",
-    "axios": "^1.7.3",
+    "@calcit/procs": "^0.9.5",
+    "@google/generative-ai": "^0.20.0",
+    "axios": "^1.7.7",
     "cirru-color": "^0.2.4",
     "copy-text-to-clipboard": "^3.2.0"
   },
   "devDependencies": {
     "bottom-tip": "^0.1.5",
-    "vite": "^5.3.5"
+    "vite": "^5.4.8"
   },
   "scripts": {
     "build": "yarn vite build --base ./ && rm -rfv extension/dist && cp -vr dist extension/"