Fixed env variable definitions

dorukgezici · Sep 28, 2024 · 0e957e3 · 0e957e3
1 parent 02d15d8
commit 0e957e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/astro.config.mjs b/astro.config.mjs
@@ -6,7 +6,7 @@ export default defineConfig({
       schema: {
         OAUTH_GITHUB_CLIENT_ID: envField.string({ context: "server", access: "secret" }),
         OAUTH_GITHUB_CLIENT_SECRET: envField.string({ context: "server", access: "secret" }),
-        PUBLIC_DECAP_CMS_VERSION: envField.string({ context: "client", access: "public" }),
+        PUBLIC_DECAP_CMS_VERSION: envField.string({ context: "client", access: "public", optional: true }),
       },
     },
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro-decap-cms-oauth",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Add Decap CMS’s admin dashboard and a custom OAuth backend to your Astro project",
   "keywords": [
     "astro-integration",

diff --git a/src/main.ts b/src/main.ts
@@ -32,17 +32,19 @@ export default function decapCMS(options: DecapCMSOptions): AstroIntegration {
   return {
     name: "astro-decap-cms-oauth",
     hooks: {
-      "astro:config:setup": async ({ config, injectRoute, updateConfig }) => {
+      "astro:config:setup": async ({ injectRoute, updateConfig }) => {
         if (!adminDisabled) {
-          // apply env schema & version
+          // apply env schema & decapCMS version
           updateConfig({
             experimental: {
               env: {
                 schema: {
-                  ...config.experimental.env?.schema,
+                  OAUTH_GITHUB_CLIENT_ID: envField.string({ context: "server", access: "secret" }),
+                  OAUTH_GITHUB_CLIENT_SECRET: envField.string({ context: "server", access: "secret" }),
                   PUBLIC_DECAP_CMS_VERSION: envField.string({
                     context: "client",
                     access: "public",
+                    optional: true,
                     default: decapCMSVersion,
                   }),
                 },