@cedarjs/cli 6.0.0-canary.2660 → 6.0.0-canary.2662

package/dist/commands/setup/deploy/providers/flightcontrolHandler.js

@@ -16,6 +16,10 @@ import {
   mysqlDatabaseService
 } from "../templates/flightcontrol.js";
 const { getConfig } = prismaInternals;
+const APOLLO_PROVIDER_COMPONENT_NAMES = [
+  "CedarApolloProvider",
+  "RedwoodApolloProvider"
+];
 const getFlightcontrolJson = async (database) => {
   const flightcontrolConfig = getFlightcontrolConfig();
   if (database === "none") {
@@ -205,18 +209,26 @@ const updateApp = () => {
         appContent[authLineIndex] = `      <AuthProvider type="dbAuth" config={{ fetchConfig: { credentials: 'include' } }}>
 `;
       }
-      const gqlLineIndex = appContent.findIndex(
-        (line) => line.includes("<RedwoodApolloProvider")
-      );
+      let gqlLineIndex = -1;
+      let apolloProviderComponentName = "";
+      for (const componentName of APOLLO_PROVIDER_COMPONENT_NAMES) {
+        gqlLineIndex = appContent.findIndex(
+          (line) => line.includes(`<${componentName}`)
+        );
+        if (gqlLineIndex !== -1) {
+          apolloProviderComponentName = componentName;
+          break;
+        }
+      }
       if (gqlLineIndex === -1) {
         console.log(`
-    Couldn't find <RedwoodApolloProvider in web/src/App.js
+    Couldn't find <CedarApolloProvider in web/src/App.js
     If (and when) you use *dbAuth*, you'll have to add the following fetch config manually:
 
     graphQLClientConfig={{ httpLinkConfig: { credentials: 'include' }}}
     `);
       } else if (appContent.toString().match(/dbAuth/)) {
-        appContent[gqlLineIndex] = `        <RedwoodApolloProvider graphQLClientConfig={{ httpLinkConfig: { credentials: 'include' }}} >
+        appContent[gqlLineIndex] = `        <${apolloProviderComponentName} graphQLClientConfig={{ httpLinkConfig: { credentials: 'include' }}} >
 `;
       }
       fs.writeFileSync(appPath, appContent.join(EOL));

package/dist/commands/setup/graphql/features/fragments/appGqlConfigTransform.js

@@ -16,8 +16,11 @@ function isPropertyWithName(node, name) {
 function transform(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
-  const redwoodApolloProvider = root.findJSXElements("RedwoodApolloProvider");
-  const graphQLClientConfigCollection = redwoodApolloProvider.find(
+  let apolloProviderElements = root.findJSXElements("CedarApolloProvider");
+  if (apolloProviderElements.length === 0) {
+    apolloProviderElements = root.findJSXElements("RedwoodApolloProvider");
+  }
+  const graphQLClientConfigCollection = apolloProviderElements.find(
     j.JSXAttribute,
     {
       name: { name: "graphQLClientConfig" }
@@ -104,7 +107,7 @@ function transform(file, api) {
     cacheConfigValue.properties.push(property);
   }
   graphQLClientConfigCollection.remove();
-  redwoodApolloProvider.get(0).node.openingElement.attributes.push(
+  apolloProviderElements.get(0).node.openingElement.attributes.push(
     j.jsxAttribute(
       j.jsxIdentifier("graphQLClientConfig"),
       j.jsxExpressionContainer(j.identifier(graphQLClientConfigVariableName))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2660",
+  "version": "6.0.0-canary.2662",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.7",
     "@babel/preset-typescript": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-canary.2660",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2660",
-    "@cedarjs/fastify-web": "6.0.0-canary.2660",
-    "@cedarjs/internal": "6.0.0-canary.2660",
-    "@cedarjs/prerender": "6.0.0-canary.2660",
-    "@cedarjs/project-config": "6.0.0-canary.2660",
-    "@cedarjs/structure": "6.0.0-canary.2660",
-    "@cedarjs/telemetry": "6.0.0-canary.2660",
-    "@cedarjs/utils": "6.0.0-canary.2660",
-    "@cedarjs/vite": "6.0.0-canary.2660",
-    "@cedarjs/web-server": "6.0.0-canary.2660",
+    "@cedarjs/api-server": "6.0.0-canary.2662",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2662",
+    "@cedarjs/fastify-web": "6.0.0-canary.2662",
+    "@cedarjs/internal": "6.0.0-canary.2662",
+    "@cedarjs/prerender": "6.0.0-canary.2662",
+    "@cedarjs/project-config": "6.0.0-canary.2662",
+    "@cedarjs/structure": "6.0.0-canary.2662",
+    "@cedarjs/telemetry": "6.0.0-canary.2662",
+    "@cedarjs/utils": "6.0.0-canary.2662",
+    "@cedarjs/vite": "6.0.0-canary.2662",
+    "@cedarjs/web-server": "6.0.0-canary.2662",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",