Merge branch 'main' into varun/compiler-poc

UCLA-IRL · Nov 23, 2023 · c1c03b2 · c1c03b2
2 parents 6836211 + 6885abd
commit c1c03b2
Show file tree

Hide file tree

Showing 35 changed files with 773 additions and 926 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -6,7 +6,7 @@ module.exports = {
     'plugin:@typescript-eslint/recommended',
     'plugin:solid/recommended',
   ],
-  ignorePatterns: ['dist', '.eslintrc.cjs', 'aframe.d.ts'],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
   parser: '@typescript-eslint/parser',
   plugins: ['solid'],
   rules: {

diff --git a/.firebaserc b/.firebaserc
@@ -1,5 +1,5 @@
 {
   "projects": {
-    "default": "zjkmxy"
+    "default": "ndn-workspace"
   }
 }
diff --git a/.github/workflows/deploy-firebase.yaml b/.github/workflows/deploy-firebase.yaml
@@ -24,9 +24,10 @@ jobs:
   # Single deploy job since we're just deploying
   deploy:
     runs-on: ubuntu-latest
+    if: github.repository == 'UCLA-IRL/ndn-workspace-solid'
     environment: 
       name: firebase
-      url: https://zjkmxy.web.app/
+      url: https://ndn-workspace.web.app/
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -45,6 +46,6 @@ jobs:
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_ZJKMXY }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_NDN_WORKSPACE }}'
           channelId: live
-          projectId: zjkmxy
+          projectId: ndn-workspace
diff --git a/.github/workflows/lint-code.yaml b/.github/workflows/lint-code.yaml
@@ -0,0 +1,40 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Lint
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+  pull_request:
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Down scope as necessary via https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
+permissions:
+  checks: write
+  contents: read
+
+jobs:
+  run-linters:
+    name: Run linters
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 21
+          cache: "pnpm"
+      - name: Install dependencies
+        run: pnpm install
+      - name: Run linters
+        uses: wearerequired/lint-action@v2
+        with:
+          # Enable your linters here
+          eslint: true
+          eslint_args: "--ext ts,tsx --report-unused-disable-directives --max-warnings 10"
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A local-first shared workspace demo application using NDNts and Yjs.
 
-Published at https://zjkmxy.web.app/
+Published at https://ndn-workspace.web.app/
 
 ## Usage
 

diff --git a/index.html b/index.html
@@ -11,10 +11,7 @@
   <link href="/font/roboto-mono-v23.css" rel="stylesheet" />
   <title>NDN Workspace</title>
   <meta name="description" content="NDN Workspace for collaborative paper writing and documents">
-  <script src="https://aframe.io/releases/1.4.2/aframe.min.js"></script>
   <script src="/swiftlatex/PdfTeXEngine.js"></script>
-  <!-- aframe.js has to be loaded from beginning, or there will be an error on `systems` -->
-  <!-- Also, it is too large to be handled by the ServiceWorker, so we use the CDN version -->
 </head>
 
 <body>

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "@codemirror/state": "^6.3.1",
     "@codemirror/view": "^6.22.0",
     "@material/web": "^1.0.1",
+    "@ndn/autoconfig": "https://ndnts-nightly.ndn.today/autoconfig.tgz",
     "@ndn/endpoint": "https://ndnts-nightly.ndn.today/endpoint.tgz",
     "@ndn/fw": "https://ndnts-nightly.ndn.today/fw.tgz",
     "@ndn/keychain": "https://ndnts-nightly.ndn.today/keychain.tgz",
@@ -52,30 +53,29 @@
     "qr-scanner": "^1.4.2",
     "qrcode": "^1.5.3",
     "solid-codemirror": "^2.3.0",
-    "solid-js": "^1.8.5",
+    "solid-js": "^1.8.6",
     "solid-tiptap": "^0.6.0",
     "uuid": "^9.0.1",
     "y-codemirror.next": "^0.3.2",
-    "yjs": "^13.6.8"
+    "yjs": "^13.6.10"
   },
   "devDependencies": {
     "@suid/vite-plugin": "^0.1.5",
-    "@types/aframe": "^1.2.5",
     "@types/diff": "^5.0.8",
     "@types/qrcode": "^1.5.5",
     "@types/uuid": "^9.0.7",
-    "@types/wicg-file-system-access": "^2023.10.3",
-    "@typescript-eslint/eslint-plugin": "^6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
-    "eslint": "^8.53.0",
+    "@types/wicg-file-system-access": "^2023.10.4",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "eslint": "^8.54.0",
     "eslint-plugin-solid": "^0.13.0",
     "peer": "^1.0.1",
-    "solid-devtools": "^0.28.1",
-    "typescript": "^5.2.2",
+    "solid-devtools": "^0.29.2",
+    "typescript": "^5.3.2",
     "typescript-event-target": "^1.1.0",
     "vite": "^4.5.0",
-    "vite-plugin-pwa": "^0.16.7",
-    "vite-plugin-rewrite-all": "^1.0.1",
+    "vite-plugin-pwa": "^0.17.0",
+    "vite-plugin-rewrite-all": "^1.0.2",
     "vite-plugin-solid": "^2.7.2"
   }
 }