Merge eee187ed00 into d72f1af361

.devcontainer/devcontainer.json

@@ -22,7 +22,7 @@
     // Terraform support
     "ghcr.io/devcontainers/features/terraform:1": {},
     // Just a wrap to install needed packages
-    "ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
+    "ghcr.io/devcontainers-contrib/features/apt-packages:1": {
       // Dependencies copied from ../docker/Dockerfile plus some dev stuff
       "packages": [
         "build-essential",

.prettierignore

@@ -10,3 +10,7 @@ frontend/bundleinspector.html
 
 #server
 server/swagger/openapi.json
+
+#embed
+**/static/**
+embed/src/utils/chat/hljs.js

.prettierrc

@@ -17,7 +17,7 @@
       }
     },
     {
-      "files": "*.config.js",
+      "files": ["*.config.js"],
       "options": {
         "semi": false,
         "parser": "flow",

collector/package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "dev": "NODE_ENV=development nodemon --ignore hotdir --ignore storage --trace-warnings index.js",
     "start": "NODE_ENV=production node index.js",
-    "lint": "yarn prettier --write ./processSingleFile ./processLink ./utils index.js"
+    "lint": "yarn prettier --ignore-path ../.prettierignore --write ./processSingleFile ./processLink ./utils index.js"
   },
   "dependencies": {
     "@googleapis/youtube": "^9.0.0",

embed/.prettierignore

@@ -1,9 +0,0 @@
-# defaults
-**/.git
-**/.svn
-**/.hg
-**/node_modules
-
-**/dist
-**/static/**
-src/utils/chat/hljs.js

embed/jsconfig.json

@@ -4,9 +4,7 @@
     "target": "esnext",
     "jsx": "react",
     "paths": {
-      "@/*": [
-        "./src/*"
-      ],
-    }
-  }
-}
+      "@/*": ["./src/*"],
+    },
+  },
+}

embed/package.json

@@ -1,6 +1,7 @@
 {
   "name": "anythingllm-embedded-chat",
   "private": false,
+  "license": "MIT",
   "type": "module",
   "scripts": {
     "dev": "nodemon -e js,jsx,css --watch src --exec \"yarn run dev:preview\"",
@@ -8,7 +9,7 @@
     "dev:build": "vite build && cat src/static/tailwind@3.4.1.js >> dist/anythingllm-chat-widget.js",
     "build": "vite build && cat src/static/tailwind@3.4.1.js >> dist/anythingllm-chat-widget.js && npx terser --compress -o dist/anythingllm-chat-widget.min.js -- dist/anythingllm-chat-widget.js",
     "build:publish": "yarn build && mkdir -p ../frontend/public/embed && cp -r dist/anythingllm-chat-widget.min.js ../frontend/public/embed/anythingllm-chat-widget.min.js",
-    "lint": "yarn prettier --write ./src"
+    "lint": "yarn prettier --ignore-path ../.prettierignore --write ./src"
   },
   "dependencies": {
     "@microsoft/fetch-event-source": "^2.0.1",

embed/vite.config.js

@@ -38,7 +38,7 @@ export default defineConfig({
     rollupOptions: {
       external: [
         // Reduces transformation time by 50% and we don't even use this variant, so we can ignore.
-        /@phosphor-icons\/react\/dist\/ssr/,
+        /@phosphor-icons\/react\/dist\/ssr/
       ]
     },
     commonjsOptions: {
@@ -51,7 +51,7 @@ export default defineConfig({
     emptyOutDir: true,
     inlineDynamicImports: true,
     assetsDir: "",
-    sourcemap: 'inline',
+    sourcemap: "inline"
   },
   optimizeDeps: {
     esbuildOptions: {
@@ -60,5 +60,5 @@ export default defineConfig({
       },
       plugins: []
     }
-  },
+  }
 })

frontend/jsconfig.json

@@ -4,9 +4,7 @@
     "target": "esnext",
     "jsx": "react",
     "paths": {
-      "@/*": [
-        "./src/*"
-      ],
+      "@/*": ["./src/*"]
     }
   }
-}
+}

frontend/package.json

@@ -7,7 +7,7 @@
     "start": "vite --open",
     "dev": "NODE_ENV=development vite --debug --host=0.0.0.0",
     "build": "vite build",
-    "lint": "yarn prettier --write ./src",
+    "lint": "yarn prettier --ignore-path ../.prettierignore --write ./src",
     "preview": "vite preview"
   },
   "dependencies": {

frontend/vite.config.js

@@ -51,7 +51,7 @@ export default defineConfig({
     rollupOptions: {
       external: [
         // Reduces transformation time by 50% and we don't even use this variant, so we can ignore.
-        /@phosphor-icons\/react\/dist\/ssr/,
+        /@phosphor-icons\/react\/dist\/ssr/
       ]
     },
     commonjsOptions: {

package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "lint": "cd server && yarn lint && cd ../frontend && yarn lint && cd ../embed && yarn lint && cd ../collector && yarn lint",
-    "setup": "cd server && yarn && cd ../collector && yarn && cd ../frontend && yarn && cd .. && yarn setup:envs && yarn prisma:setup && echo \"Please run yarn dev:server, yarn dev:collector, and yarn dev:frontend in separate terminal tabs.\"",
+    "setup": "cd server && yarn && cd ../collector && yarn && cd ../frontend && yarn && cd ../embed && yarn && cd .. && yarn setup:envs && yarn prisma:setup && echo \"Please run yarn dev:server, yarn dev:collector, and yarn dev:frontend in separate terminal tabs.\"",
     "setup:envs": "cp -n ./frontend/.env.example ./frontend/.env && cp -n ./server/.env.example ./server/.env.development && cp -n ./collector/.env.example ./collector/.env && cp -n ./docker/.env.example ./docker/.env && echo \"All ENV files copied!\n\"",
     "dev:server": "cd server && yarn dev",
     "dev:collector": "cd collector && yarn dev",
@@ -27,4 +27,4 @@
     "generate::gcp_deployment": "node cloud-deployments/gcp/deployment/generate.mjs"
   },
   "private": false
-}
+}

server/package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "dev": "NODE_ENV=development nodemon --ignore documents --ignore vector-cache --ignore storage --ignore swagger --trace-warnings index.js",
     "start": "NODE_ENV=production node index.js",
-    "lint": "yarn prettier --write ./endpoints ./models ./utils index.js",
+    "lint": "yarn prettier --ignore-path ../.prettierignore --write ./endpoints ./models ./utils index.js",
     "swagger": "node ./swagger/init.js",
     "sqlite:migrate": "cd ./utils/prisma && node migrateFromSqlite.js"
   },