fix(serverless-cms-aws): add WEBINY_ADMIN_ENV and WEBINY_WEBSITE_ENV

webiny · Jun 7, 2024 · f365509 · f365509
1 parent 91554b6
commit f365509
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/packages/cwp-template-aws/template/common/types/env/index.d.ts b/packages/cwp-template-aws/template/common/types/env/index.d.ts
@@ -24,6 +24,8 @@ declare namespace NodeJS {
         MOCK_DYNAMODB_ENDPOINT?: string;
         ELASTICSEARCH_PORT?: string;
         WEBINY_ENV?: string;
+        WEBINY_ADMIN_ENV?: string;
+        WEBINY_WEBSITE_ENV?: string;
         REACT_APP_DEBUG?: "true" | "false" | string;
         AWS_REGION?: string;
         REACT_APP_WEBINY_VERSION?: string;

diff --git a/packages/serverless-cms-aws/src/createAdminAppConfig.ts b/packages/serverless-cms-aws/src/createAdminAppConfig.ts
@@ -3,9 +3,13 @@ import { ApiOutput } from "@webiny/pulumi-aws";
 
 export const createAdminAppConfig = (modifier?: ReactAppConfigModifier) => {
     return createReactAppConfig(baseParams => {
-        const { config } = baseParams;
+        const { config, options } = baseParams;
 
-        config.customEnv(env => ({ ...env, PORT: 3001 }));
+        config.customEnv(env => ({
+            ...env,
+            PORT: process.env.PORT || 3001,
+            WEBINY_ADMIN_ENV: options.env
+        }));
 
         config.pulumiOutputToEnv<ApiOutput>("apps/api", ({ output, env }) => {
             return {

diff --git a/packages/serverless-cms-aws/src/createWebsiteAppConfig.ts b/packages/serverless-cms-aws/src/createWebsiteAppConfig.ts
@@ -3,9 +3,13 @@ import { ApiOutput } from "@webiny/pulumi-aws";
 
 export const createWebsiteAppConfig = (modifier?: ReactAppConfigModifier) => {
     return createReactAppConfig(baseParams => {
-        const { config } = baseParams;
+        const { config, options } = baseParams;
 
-        config.customEnv(env => ({ ...env, PORT: 3000 }));
+        config.customEnv(env => ({
+            ...env,
+            PORT: process.env.PORT || 3000,
+            WEBINY_WEBSITE_ENV: options.env
+        }));
 
         config.pulumiOutputToEnv<ApiOutput>("apps/api", ({ output, env }) => {
             return {

diff --git a/typings/env/index.d.ts b/typings/env/index.d.ts
@@ -25,6 +25,8 @@ declare namespace NodeJS {
         MOCK_DYNAMODB_ENDPOINT?: string;
         ELASTICSEARCH_PORT?: string;
         WEBINY_ENV?: string;
+        WEBINY_ADMIN_ENV?: string;
+        WEBINY_WEBSITE_ENV?: string;
         REACT_APP_DEBUG?: "true" | "false" | string;
         AWS_REGION?: string;
         REACT_APP_WEBINY_VERSION?: string;