Merge remote-tracking branch 'origin/feature/translation-module' into…

… rte-translate-button
vivid-planet · Feb 20, 2024 · 453d449 · 453d449
2 parents 798c5a7 + c43852a
commit 453d449
Show file tree

Hide file tree

Showing 344 changed files with 6,261 additions and 3,464 deletions.
diff --git a/.changeset/eighty-tools-fail.md b/.changeset/eighty-tools-fail.md
diff --git a/.changeset/fifty-crabs-love.md b/.changeset/fifty-crabs-love.md
diff --git a/.changeset/kind-fans-watch.md b/.changeset/kind-fans-watch.md
diff --git a/.changeset/smart-weeks-behave.md b/.changeset/smart-weeks-behave.md
diff --git a/.changeset/stale-turtles-smile.md b/.changeset/stale-turtles-smile.md
diff --git a/.changeset/three-eagles-cheat.md b/.changeset/three-eagles-cheat.md
@@ -0,0 +1,5 @@
+---
+"@comet/cms-api": patch
+---
+
+API Generator: Add missing `scope` argument and filter to `<entity>BySlug` query
diff --git a/.changeset/tricky-adults-laugh.md b/.changeset/tricky-adults-laugh.md
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
@@ -4,3 +4,7 @@ addReviewers: true
 
 reviewers:
     - johnnyomair
+
+skipKeywords:
+    - Merge main into next
+    - Version Packages
diff --git a/copy-schema-files.js b/copy-schema-files.js
@@ -11,7 +11,7 @@ const fs = require("fs");
         fs.promises.copyFile("demo/api/block-meta.json", "demo/site/block-meta.json"),
         fs.promises.copyFile("demo/api/schema.gql", "demo/admin/schema.gql"),
         fs.promises.copyFile("demo/api/schema.gql", "demo/site/schema.gql"),
-        fs.promises.copyFile("demo/api/comet-config.json", "demo/site/comet-config.json"),
-        fs.promises.copyFile("demo/api/comet-config.json", "demo/admin/comet-config.json"),
+        fs.promises.copyFile("demo/api/src/comet-config.json", "demo/site/src/comet-config.json"),
+        fs.promises.copyFile("demo/api/src/comet-config.json", "demo/admin/src/comet-config.json"),
     ]);
 })();
diff --git a/demo/admin/.gitignore b/demo/admin/.gitignore
@@ -12,5 +12,5 @@ lang-compiled
 graphql.generated.ts
 block-meta.json
 src/blocks.generated.ts
-comet-config.json
+src/comet-config.json
 src/**/*.generated.ts
diff --git a/demo/admin/package.json b/demo/admin/package.json
@@ -9,7 +9,6 @@
         "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"npm run generate-block-types\"",
         "gql:types": "graphql-codegen",
         "gql:watch": "graphql-codegen --watch",
-        "postinstall": "cd server && npm install",
         "intl:compile": "run-p intl:compile:comet intl:compile:comet-demo",
         "intl:compile:comet": "formatjs compile-folder --format simple --ast lang/comet-lang lang-compiled/comet-lang",
         "intl:compile:comet-demo": "formatjs compile-folder --format simple --ast lang/comet-demo-lang lang-compiled/comet-demo-lang",