@cedarjs/vite 1.0.0-canary.12558 → 1.0.0-canary.12559

package/dist/cjs/lib/getMergedConfig.js

@@ -34,7 +34,6 @@ module.exports = __toCommonJS(getMergedConfig_exports);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_vite = require("vite");
 var import_project_config = require("@cedarjs/project-config");
-var import_envVarDefinitions = require("./envVarDefinitions.js");
 function getMergedConfig(rwConfig, rwPaths) {
   return (userConfig, env) => {
     let apiHost = process.env.REDWOOD_API_HOST;
@@ -69,7 +68,7 @@ function getMergedConfig(rwConfig, rwPaths) {
       // },
       envPrefix: "REDWOOD_ENV_",
       publicDir: import_node_path.default.join(rwPaths.web.base, "public"),
-      define: (0, import_envVarDefinitions.getEnvVarDefinitions)(),
+      define: (0, import_project_config.getEnvVarDefinitions)(),
       css: {
         // @NOTE config path is relative to where vite.config.js is if you use
         // a relative path

package/dist/cjs/lib/registerFwGlobalsAndShims.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,21 +15,12 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var registerFwGlobalsAndShims_exports = {};
 __export(registerFwGlobalsAndShims_exports, {
   registerFwGlobalsAndShims: () => registerFwGlobalsAndShims
 });
 module.exports = __toCommonJS(registerFwGlobalsAndShims_exports);
-var import_node_path = __toESM(require("node:path"), 1);
 var import_project_config = require("@cedarjs/project-config");
 const registerFwGlobalsAndShims = () => {
   registerFwGlobals();
@@ -39,13 +28,9 @@ const registerFwGlobalsAndShims = () => {
 };
 function registerFwGlobals() {
   const rwConfig = (0, import_project_config.getConfig)();
-  const rwPaths = (0, import_project_config.getPaths)();
+  const envVars = (0, import_project_config.getEnvVarDefinitions)();
   globalThis.RWJS_ENV = {
-    RWJS_API_GRAPHQL_URL: rwConfig.web.apiGraphQLUrl ?? rwConfig.web.apiUrl + "/graphql",
-    RWJS_API_URL: rwConfig.web.apiUrl,
-    __REDWOOD__APP_TITLE: rwConfig.web.title || import_node_path.default.basename(rwPaths.base),
-    RWJS_EXP_STREAMING_SSR: rwConfig.experimental.streamingSsr?.enabled,
-    RWJS_EXP_RSC: rwConfig.experimental?.rsc?.enabled,
+    ...envVars.RWJS_ENV,
     RWJS_EXP_SSR_GRAPHQL_ENDPOINT: (() => {
       const apiPath = rwConfig.web.apiGraphQLUrl ?? rwConfig.web.apiUrl + "/graphql";
       if (/^[a-zA-Z][a-zA-Z\d+\-.]*?:/.test(apiPath)) {
@@ -83,10 +68,7 @@ function registerFwGlobals() {
       }
     })()
   };
-  globalThis.RWJS_DEBUG_ENV = {
-    RWJS_SRC_ROOT: rwPaths.web.src,
-    REDWOOD_ENV_EDITOR: JSON.stringify(process.env.REDWOOD_ENV_EDITOR)
-  };
+  globalThis.RWJS_DEBUG_ENV = envVars.RWJS_DEBUG_ENV;
 }
 function registerFwShims() {
   if (!(0, import_project_config.getConfig)().experimental?.rsc?.enabled) {

package/dist/lib/getMergedConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMergedConfig.d.ts","sourceRoot":"","sources":["../../src/lib/getMergedConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAGjD,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAK5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,gBAC1C,UAAU,OAAO,SAAS,KAAG,UAAU,CAkI5D"}
+{"version":3,"file":"getMergedConfig.d.ts","sourceRoot":"","sources":["../../src/lib/getMergedConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAGjD,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAO5D;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,gBAC1C,UAAU,OAAO,SAAS,KAAG,UAAU,CAkI5D"}

package/dist/lib/getMergedConfig.js

@@ -1,7 +1,10 @@
 import path from "node:path";
 import { mergeConfig } from "vite";
-import { getConfig, getPaths } from "@cedarjs/project-config";
-import { getEnvVarDefinitions } from "./envVarDefinitions.js";
+import {
+  getConfig,
+  getEnvVarDefinitions,
+  getPaths
+} from "@cedarjs/project-config";
 function getMergedConfig(rwConfig, rwPaths) {
   return (userConfig, env) => {
     let apiHost = process.env.REDWOOD_API_HOST;

package/dist/lib/registerFwGlobalsAndShims.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerFwGlobalsAndShims.d.ts","sourceRoot":"","sources":["../../src/lib/registerFwGlobalsAndShims.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,YAGrC,CAAA"}
+{"version":3,"file":"registerFwGlobalsAndShims.d.ts","sourceRoot":"","sources":["../../src/lib/registerFwGlobalsAndShims.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,YAGrC,CAAA"}

package/dist/lib/registerFwGlobalsAndShims.js

@@ -1,18 +1,13 @@
-import path from "node:path";
-import { getConfig, getPaths } from "@cedarjs/project-config";
+import { getConfig, getEnvVarDefinitions } from "@cedarjs/project-config";
 const registerFwGlobalsAndShims = () => {
   registerFwGlobals();
   registerFwShims();
 };
 function registerFwGlobals() {
   const rwConfig = getConfig();
-  const rwPaths = getPaths();
+  const envVars = getEnvVarDefinitions();
   globalThis.RWJS_ENV = {
-    RWJS_API_GRAPHQL_URL: rwConfig.web.apiGraphQLUrl ?? rwConfig.web.apiUrl + "/graphql",
-    RWJS_API_URL: rwConfig.web.apiUrl,
-    __REDWOOD__APP_TITLE: rwConfig.web.title || path.basename(rwPaths.base),
-    RWJS_EXP_STREAMING_SSR: rwConfig.experimental.streamingSsr?.enabled,
-    RWJS_EXP_RSC: rwConfig.experimental?.rsc?.enabled,
+    ...envVars.RWJS_ENV,
     RWJS_EXP_SSR_GRAPHQL_ENDPOINT: (() => {
       const apiPath = rwConfig.web.apiGraphQLUrl ?? rwConfig.web.apiUrl + "/graphql";
       if (/^[a-zA-Z][a-zA-Z\d+\-.]*?:/.test(apiPath)) {
@@ -50,10 +45,7 @@ function registerFwGlobals() {
       }
     })()
   };
-  globalThis.RWJS_DEBUG_ENV = {
-    RWJS_SRC_ROOT: rwPaths.web.src,
-    REDWOOD_ENV_EDITOR: JSON.stringify(process.env.REDWOOD_ENV_EDITOR)
-  };
+  globalThis.RWJS_DEBUG_ENV = envVars.RWJS_DEBUG_ENV;
 }
 function registerFwShims() {
   if (!getConfig().experimental?.rsc?.enabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "1.0.0-canary.12558+2212ab860",
+  "version": "1.0.0-canary.12559+795af598e",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -60,13 +60,13 @@
     "@babel/generator": "7.27.5",
     "@babel/parser": "7.27.5",
     "@babel/traverse": "7.27.4",
-    "@cedarjs/auth": "1.0.0-canary.12558",
-    "@cedarjs/babel-config": "1.0.0-canary.12558",
-    "@cedarjs/cookie-jar": "1.0.0-canary.12558",
-    "@cedarjs/internal": "1.0.0-canary.12558",
-    "@cedarjs/project-config": "1.0.0-canary.12558",
-    "@cedarjs/server-store": "1.0.0-canary.12558",
-    "@cedarjs/web": "1.0.0-canary.12558",
+    "@cedarjs/auth": "1.0.0-canary.12559",
+    "@cedarjs/babel-config": "1.0.0-canary.12559",
+    "@cedarjs/cookie-jar": "1.0.0-canary.12559",
+    "@cedarjs/internal": "1.0.0-canary.12559",
+    "@cedarjs/project-config": "1.0.0-canary.12559",
+    "@cedarjs/server-store": "1.0.0-canary.12559",
+    "@cedarjs/web": "1.0.0-canary.12559",
     "@swc/core": "1.13.3",
     "@vitejs/plugin-react": "4.3.4",
     "@whatwg-node/fetch": "0.9.21",
@@ -110,5 +110,5 @@
     "typescript": "5.6.2",
     "vitest": "3.2.4"
   },
-  "gitHead": "2212ab8607fadb7ed3122e3b05af3edaf6a7e066"
+  "gitHead": "795af598e0aa1fec669a9e9def77f5aa4d57565d"
 }

package/dist/cjs/lib/envVarDefinitions.js

@@ -1,87 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var envVarDefinitions_exports = {};
-__export(envVarDefinitions_exports, {
-  getEnvVarDefinitions: () => getEnvVarDefinitions
-});
-module.exports = __toCommonJS(envVarDefinitions_exports);
-var import_node_path = __toESM(require("node:path"), 1);
-var import_project_config = require("@cedarjs/project-config");
-function getEnvVarDefinitions() {
-  const rwConfig = (0, import_project_config.getConfig)();
-  const rwPaths = (0, import_project_config.getPaths)();
-  return {
-    RWJS_ENV: {
-      RWJS_API_GRAPHQL_URL: rwConfig.web.apiGraphQLUrl ?? rwConfig.web.apiUrl + "/graphql",
-      RWJS_API_URL: rwConfig.web.apiUrl,
-      __REDWOOD__APP_TITLE: rwConfig.web.title || import_node_path.default.basename(rwPaths.base),
-      RWJS_EXP_STREAMING_SSR: rwConfig.experimental.streamingSsr?.enabled,
-      RWJS_EXP_RSC: rwConfig.experimental?.rsc?.enabled
-    },
-    RWJS_DEBUG_ENV: {
-      RWJS_SRC_ROOT: rwPaths.web.src,
-      REDWOOD_ENV_EDITOR: JSON.stringify(process.env.REDWOOD_ENV_EDITOR)
-    },
-    // Vite can automatically expose environment variables, but we
-    // disable that in `buildFeServer.ts` by setting `envFile: false`
-    // because we want to use our own logic for loading .env,
-    // .env.defaults, etc
-    // The two object spreads below will expose all environment
-    // variables listed in redwood.toml and all environment variables
-    // prefixed with REDWOOD_ENV_
-    ...Object.fromEntries(
-      rwConfig.web.includeEnvironmentVariables.flatMap((envName) => [
-        // TODO: Figure out if/why we need to disable eslint here, when we
-        // didn't have to before, when this code was in index.ts
-        // Re-enable if possible
-        // eslint-disable-next-line
-        [`import.meta.env.${envName}`, JSON.stringify(process.env[envName])],
-        // TODO: Figure out if/why we need to disable eslint here, when we
-        // didn't have to before, when this code was in index.ts
-        // Re-enable if possible
-        // eslint-disable-next-line
-        [`process.env.${envName}`, JSON.stringify(process.env[envName])]
-      ])
-    ),
-    ...Object.entries(process.env).reduce(
-      (acc, [key, value]) => {
-        if (key.startsWith("REDWOOD_ENV_")) {
-          acc[`import.meta.env.${key}`] = JSON.stringify(value);
-          acc[`process.env.${key}`] = JSON.stringify(value);
-        }
-        return acc;
-      },
-      {}
-    )
-  };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getEnvVarDefinitions
-});

package/dist/lib/envVarDefinitions.d.ts

@@ -1,14 +0,0 @@
-export declare function getEnvVarDefinitions(): {
-    RWJS_ENV: {
-        RWJS_API_GRAPHQL_URL: string;
-        RWJS_API_URL: string;
-        __REDWOOD__APP_TITLE: string;
-        RWJS_EXP_STREAMING_SSR: boolean;
-        RWJS_EXP_RSC: boolean;
-    };
-    RWJS_DEBUG_ENV: {
-        RWJS_SRC_ROOT: string;
-        REDWOOD_ENV_EDITOR: string;
-    };
-};
-//# sourceMappingURL=envVarDefinitions.d.ts.map

package/dist/lib/envVarDefinitions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"envVarDefinitions.d.ts","sourceRoot":"","sources":["../../src/lib/envVarDefinitions.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB;;;;;;;;;;;;EAkDnC"}

package/dist/lib/envVarDefinitions.js

@@ -1,53 +0,0 @@
-import path from "node:path";
-import { getConfig, getPaths } from "@cedarjs/project-config";
-function getEnvVarDefinitions() {
-  const rwConfig = getConfig();
-  const rwPaths = getPaths();
-  return {
-    RWJS_ENV: {
-      RWJS_API_GRAPHQL_URL: rwConfig.web.apiGraphQLUrl ?? rwConfig.web.apiUrl + "/graphql",
-      RWJS_API_URL: rwConfig.web.apiUrl,
-      __REDWOOD__APP_TITLE: rwConfig.web.title || path.basename(rwPaths.base),
-      RWJS_EXP_STREAMING_SSR: rwConfig.experimental.streamingSsr?.enabled,
-      RWJS_EXP_RSC: rwConfig.experimental?.rsc?.enabled
-    },
-    RWJS_DEBUG_ENV: {
-      RWJS_SRC_ROOT: rwPaths.web.src,
-      REDWOOD_ENV_EDITOR: JSON.stringify(process.env.REDWOOD_ENV_EDITOR)
-    },
-    // Vite can automatically expose environment variables, but we
-    // disable that in `buildFeServer.ts` by setting `envFile: false`
-    // because we want to use our own logic for loading .env,
-    // .env.defaults, etc
-    // The two object spreads below will expose all environment
-    // variables listed in redwood.toml and all environment variables
-    // prefixed with REDWOOD_ENV_
-    ...Object.fromEntries(
-      rwConfig.web.includeEnvironmentVariables.flatMap((envName) => [
-        // TODO: Figure out if/why we need to disable eslint here, when we
-        // didn't have to before, when this code was in index.ts
-        // Re-enable if possible
-        // eslint-disable-next-line
-        [`import.meta.env.${envName}`, JSON.stringify(process.env[envName])],
-        // TODO: Figure out if/why we need to disable eslint here, when we
-        // didn't have to before, when this code was in index.ts
-        // Re-enable if possible
-        // eslint-disable-next-line
-        [`process.env.${envName}`, JSON.stringify(process.env[envName])]
-      ])
-    ),
-    ...Object.entries(process.env).reduce(
-      (acc, [key, value]) => {
-        if (key.startsWith("REDWOOD_ENV_")) {
-          acc[`import.meta.env.${key}`] = JSON.stringify(value);
-          acc[`process.env.${key}`] = JSON.stringify(value);
-        }
-        return acc;
-      },
-      {}
-    )
-  };
-}
-export {
-  getEnvVarDefinitions
-};