Merge remote-tracking branch 'origin/main' into cspell

vivid-planet · Oct 15, 2024 · fb53609 · fb53609
2 parents dfdeebd + 13446c0
commit fb53609
Show file tree

Hide file tree

Showing 56 changed files with 3,619 additions and 4,888 deletions.
diff --git a/.env b/.env
@@ -39,6 +39,8 @@ API_URL=http://${DEV_DOMAIN:-localhost}:${API_PORT}/api
 API_URL_INTERNAL=http://localhost:$API_PORT/api
 CORS_ALLOWED_ORIGIN="^http:\/\/(localhost|.*\.dev\.vivid-planet\.cloud|192\.168\.\d{1,3}\.\d{1,3}):\d{2,4}"
 BASIC_AUTH_SYSTEM_USER_PASSWORD=password
+ACL_ALL_PERMISSIONS_EMAILS=[email protected]
+ACL_ALL_PERMISSIONS_DOMAINS=vivid-planet.com
 
 # blob storage
 BLOB_STORAGE_DRIVER="file"

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -21,36 +21,36 @@ jobs:
     steps:
       - run: echo "${{ github.actor }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - run: |
           git config user.name github-actions
           git config user.email [email protected]
 
       - name: "Admin: Clone library translations"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: vivid-planet/comet-lang
           token: ${{ secrets.GITHUB_TOKEN }}
           path: "admin/lang/comet-lang"
 
       - name: "Admin: Clone starter translations"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: vivid-planet/comet-starter-lang
           token: ${{ secrets.GITHUB_TOKEN }}
           path: "admin/lang/starter-lang"
 
       - name: "Site: Clone starter translations"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: vivid-planet/comet-starter-lang
           token: ${{ secrets.GITHUB_TOKEN }}
           path: "site/lang/starter-lang"
 
       - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: "npm"

diff --git a/.github/workflows/publish-create-app.yml b/.github/workflows/publish-create-app.yml
@@ -18,15 +18,15 @@ jobs:
     steps:
       - run: echo "${{ github.actor }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.VIVID_PLANET_BOT_TOKEN }}
       - run: |
           git config user.name github-actions
           git config user.email [email protected]
 
       - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: "npm"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,15 +21,15 @@ jobs:
     steps:
       - run: echo "${{ github.actor }}"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - run: |
           git config user.name github-actions
           git config user.email [email protected]
 
       - name: Use Node.js 20.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: "npm"

diff --git a/admin/index.html b/admin/index.html
@@ -4,6 +4,7 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>Starter Admin</title>
+        <link rel="icon" href="/favicon.ico" type="image/x-icon" />
         <script type="text/javascript">
             (function() {
                 <%- environmentValues.map((env) => `window.EXTERNAL__${env.key}__ = ${env.value ? `'${env.value}'` : undefined};`).join("\n") %>

diff --git a/admin/package-lock.json b/admin/package-lock.json
diff --git a/admin/package.json b/admin/package.json
@@ -26,13 +26,13 @@
     },
     "dependencies": {
         "@apollo/client": "^3.2.5",
-        "@comet/admin": "^7.3.2",
-        "@comet/admin-date-time": "^7.3.2",
-        "@comet/admin-icons": "^7.3.2",
-        "@comet/admin-rte": "^7.3.2",
-        "@comet/admin-theme": "^7.3.2",
-        "@comet/blocks-admin": "^7.3.2",
-        "@comet/cms-admin": "^7.3.2",
+        "@comet/admin": "^7.5.0",
+        "@comet/admin-date-time": "^7.5.0",
+        "@comet/admin-icons": "^7.5.0",
+        "@comet/admin-rte": "^7.5.0",
+        "@comet/admin-theme": "^7.5.0",
+        "@comet/blocks-admin": "^7.5.0",
+        "@comet/cms-admin": "^7.5.0",
         "@emotion/react": "^11.9.3",
         "@emotion/styled": "^11.9.3",
         "@fontsource/roboto": "^4.5.8",
@@ -61,9 +61,9 @@
         "react-router-dom": "^5.1.2"
     },
     "devDependencies": {
-        "@comet/cli": "^7.3.2",
-        "@comet/eslint-config": "^7.3.2",
-        "@comet/eslint-plugin": "^7.3.2",
+        "@comet/cli": "^7.5.0",
+        "@comet/eslint-config": "^7.5.0",
+        "@comet/eslint-plugin": "^7.5.0",
         "@cspell/eslint-plugin": "^8.15.2",
         "@formatjs/cli": "^6.0.0",
         "@graphql-codegen/add": "^3.0.0",
@@ -81,12 +81,13 @@
         "@types/react-router": "^5.0.3",
         "@types/react-router-dom": "^5.1.7",
         "@vitejs/plugin-react-swc": "^3.7.0",
-        "chokidar-cli": "^2.1.0",
+        "chokidar-cli": "^3.0.0",
         "cspell": "^8.14.4",
         "dotenv-cli": "^7.0.0",
         "eslint": "^8.0.0",
         "npm-run-all": "^4.1.5",
         "prettier": "^2.2.1",
+        "rimraf": "^6.0.0",
         "ts-node": "^10.0.0",
         "typescript": "~5.1.0",
         "vite": "^5.1.6",