Merge remote-tracking branch 'upstream/master'

fix:merge upstream

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: mubaidr
+patreon: mubaidr
+open_collective: mubaidr
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: mubaidr
+otechie: # Replace with a single Otechie username
+custom: # Replace with a single custom sponsorship URL

.github/workflows/release.yml

@@ -0,0 +1,53 @@
+name: release
+'on':
+  push:
+    branches:
+      - master
+
+concurrency:
+  group: release-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: 'bash'
+
+jobs:
+  draft_release:
+    permissions:
+      contents: write # Allows this job to create releases
+
+    strategy:
+      fail-fast: true
+      matrix:
+        # os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [ubuntu-latest]
+
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 5
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          # cache: 'npm'
+
+      - run: npm i
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+
+      - name: Get Package Version
+        id: get-version
+        run: echo "::set-output name=version::$(node -p "require('./package.json').version")"
+
+      - run: npm run build
+      - run: zip -r ${{ steps.get-version.outputs.version }}.zip dist
+
+      - name: GH Release
+        uses: softprops/[email protected]
+        with:
+          tag_name: ${{ steps.get-version.outputs.version }}
+          release_name: ${{ steps.get-version.outputs.version }}
+          draft: true
+          files: ${{ steps.get-version.outputs.version }}.zip

.gitignore

@@ -28,4 +28,4 @@ backup.ts
 *.crx
 *.pem
 
-.history
+.history

.prettierignore

@@ -0,0 +1,5 @@
+auto-imports.d.ts
+components.d.ts
+pnpm-lock.yaml
+yarn.lock
+node_modules/

.prettierrc

@@ -6,5 +6,5 @@
   "tabWidth": 2,
   "trailingComma": "es5",
   "useTabs": false,
-  "printWidth": 200
+  "htmlWhitespaceSensitivity": "ignore"
 }

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["manifest.json"],
+      "url": "https://json.schemastore.org/chrome-manifest.json"
+    }
+  ]
+}

README.md

@@ -66,4 +66,4 @@ pnpm build
 如果您有任何问题或需要帮助，请随时通过 [[email protected]](mailto:[email protected]) 联系我们。
 
 ## 鸣谢
-感谢 https://github.com/mubaidr/vite-vue3-chrome-extension-v3 
+感谢 https://github.com/mubaidr/vite-vue3-chrome-extension-v3 

manifest.config.ts

@@ -2,7 +2,7 @@ import { defineManifest } from '@crxjs/vite-plugin'
 // @ts-ignore
 import packageJson from './package.json'
 
-const { version, name } = packageJson
+const { version, name, description, displayName } = packageJson
 // Convert from Semver (example: 0.1.0-beta6)
 const [major, minor, patch, label = '0'] = version
   // can only contain digits, dots, or dash
@@ -11,7 +11,8 @@ const [major, minor, patch, label = '0'] = version
   .split(/[.-]/)
 
 export default defineManifest(async (env) => ({
-  name: env.mode === 'staging' ? `[INTERNAL] ${name}` : name,
+  name: env.mode === 'staging' ? `[INTERNAL] ${name}` : displayName || name,
+  description,
   // up to four numbers separated by dots
   version: `${major}.${minor}.${patch}.${label}`,
   // semver is OK in "version_name"
@@ -49,9 +50,5 @@ export default defineManifest(async (env) => ({
       matches: ['*://*/*'],
       resources: ['src/content-script/iframe/index.html'],
     },
-    {
-      matches: ['<all_urls>'],
-      resources: ['src/assets/*.png'],
-    },
   ],
 }))

package.json

@@ -1,40 +1,44 @@
 {
   "dependencies": {
     "vue": "^3.3.4",
-    "vue-router": "^4.2.2"
+    "vue-router": "^4.2.5"
   },
+  "description": "A plugin that helps you manage multiple accounts on the same site ",
   "devDependencies": {
-    "@crxjs/vite-plugin": "2.0.0-beta.17",
-    "@iconify-json/mdi": "^1.1.52",
-    "@tailwindcss/forms": "^0.5.3",
-    "@types/chrome": "^0.0.237",
-    "@types/eslint-config-prettier": "^6.11.0",
-    "@types/node": "^18.16.16",
-    "@types/prettier": "^2.7.2",
-    "@typescript-eslint/eslint-plugin": "^5.59.8",
-    "@typescript-eslint/parser": "^5.59.8",
-    "@vitejs/plugin-vue": "^4.2.3",
+    "@crxjs/vite-plugin": "^2.0.0-beta.19",
+    "@iconify-json/mdi": "^1.1.54",
+    "@tailwindcss/forms": "^0.5.6",
+    "@tailwindcss/typography": "^0.5.10",
+    "@types/chrome": "^0.0.246",
+    "@types/eslint": "^8.44.3",
+    "@types/eslint-config-prettier": "^6.11.1",
+    "@types/node": "^18.18.3",
+    "@typescript-eslint/eslint-plugin": "^6.7.4",
+    "@typescript-eslint/parser": "^6.7.4",
+    "@vitejs/plugin-vue": "^4.4.0",
     "@vue/compiler-sfc": "^3.3.4",
-    "@vueuse/core": "^10.1.2",
-    "autoprefixer": "^10.4.14",
-    "eslint": "^8.41.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-vue": "^9.14.1",
-    "postcss": "^8.4.24",
-    "prettier": "^2.8.8",
-    "prettier-plugin-tailwindcss": "^0.3.0",
-    "sass": "^1.62.1",
-    "tailwindcss": "^3.3.2",
-    "typescript": "^5.0.4",
-    "unplugin-auto-import": "^0.16.4",
-    "unplugin-icons": "^0.16.1",
-    "unplugin-vue-components": "^0.25.0",
-    "vite": "^4.3.9",
-    "vite-plugin-pages": "^0.30.1",
-    "vue-tsc": "^1.6.5",
+    "@vueuse/core": "^10.4.1",
+    "autoprefixer": "^10.4.16",
+    "daisyui": "^3.8.3",
+    "eslint": "^8.50.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "postcss": "^8.4.31",
+    "prettier": "^3.0.3",
+    "prettier-plugin-tailwindcss": "^0.5.4",
+    "sass": "^1.68.0",
+    "tailwindcss": "^3.3.3",
+    "typescript": "^5.2.2",
+    "unplugin-auto-import": "^0.16.6",
+    "unplugin-icons": "^0.17.0",
+    "unplugin-vue-components": "^0.25.2",
+    "vite": "^4.4.9",
+    "vite-plugin-pages": "^0.31.0",
+    "vue-tsc": "^1.8.15",
     "webext-bridge": "^6.0.1"
   },
-  "name": "CookiesClerk",
+  "displayName": "CookiesClerk",
+  "name": "cookiesclerk",
   "overrides": {
     "@crxjs/vite-plugin": "$@crxjs/vite-plugin"
   },
@@ -53,7 +57,7 @@
   "scripts": {
     "build": "vite build",
     "dev": "vite",
-    "lint": "eslint --fix ./src/**/*.{ts,tsx,vue}",
+    "lint": "eslint . --fix --ext js,mjs,cjs,ts,mts,cts,vue",
     "preview": "vite preview"
   },
   "type": "module",