@cedarjs/cli 6.0.0-canary.2877 → 6.0.0-canary.2880

package/dist/commands/setup/monitoring/sentry/sentryHandler.js

@@ -90,15 +90,20 @@ const handler = async ({ force }) => {
       title: "Replacing Redwood's Error boundary",
       task: async () => {
         const contentLines = fs.readFileSync(rwPaths.web.app).toString().split("\n");
+        const webImportRe = /^import \{ FatalErrorBoundary, ((?:Cedar|Redwood)Provider) \} from '@cedarjs\/web'$/;
         const webImportIndex = contentLines.findLastIndex(
-          (line) => /^import { FatalErrorBoundary, RedwoodProvider } from '@cedarjs\/web'$/.test(
-            line
-          )
+          (line) => webImportRe.test(line)
         );
+        if (webImportIndex === -1) {
+          throw new Error(
+            `Could not find "import { FatalErrorBoundary, CedarProvider } from '@cedarjs/web'" in web/src/App`
+          );
+        }
+        const providerName = contentLines[webImportIndex].match(webImportRe)?.[1];
         contentLines.splice(
           webImportIndex,
           1,
-          "import { RedwoodProvider } from '@cedarjs/web'"
+          `import { ${providerName} } from '@cedarjs/web'`
         );
         const boundaryOpenIndex = contentLines.findLastIndex(
           (line) => line.includes("<FatalErrorBoundary page={FatalErrorPage}>")

package/dist/commands/setup/ui/libraries/chakra-uiHandler.js

@@ -54,7 +54,9 @@ async function handler({
           insertComponent: {
             name: "ChakraProvider",
             props: { theme: "extendedTheme" },
-            within: "RedwoodProvider",
+            // Older projects (created before CedarProvider replaced the
+            // deprecated RedwoodProvider) may still use RedwoodProvider.
+            within: "CedarProvider|RedwoodProvider",
             insertBefore: "<ColorModeScript />"
           },
           imports: [

package/dist/commands/setup/ui/libraries/mantineHandler.js

@@ -77,7 +77,9 @@ async function handler({
           insertComponent: {
             name: "MantineProvider",
             props: { theme: "theme" },
-            within: "RedwoodProvider"
+            // Older projects (created before CedarProvider replaced the
+            // deprecated RedwoodProvider) may still use RedwoodProvider.
+            within: "CedarProvider|RedwoodProvider"
           },
           imports: [
             "import { MantineProvider } from '@mantine/core'",

package/dist/lib/extendFile.js

@@ -56,7 +56,7 @@ function insertComponent(content, {
       "Exactly one of (around | within) must be defined. Choose one."
     );
   }
-  const target = around ?? within;
+  const target = `(?:${around ?? within})`;
   const findTagIndex = (regex) => content.findIndex((line) => regex.test(line));
   let open = findTagIndex(new RegExp(`([^\\S\r
 ]*)<${target}\\s*(.*)\\s*>`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2877",
+  "version": "6.0.0-canary.2880",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-canary.2877",
-    "@cedarjs/babel-config": "6.0.0-canary.2877",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2877",
-    "@cedarjs/internal": "6.0.0-canary.2877",
-    "@cedarjs/prerender": "6.0.0-canary.2877",
-    "@cedarjs/project-config": "6.0.0-canary.2877",
-    "@cedarjs/structure": "6.0.0-canary.2877",
-    "@cedarjs/telemetry": "6.0.0-canary.2877",
-    "@cedarjs/utils": "6.0.0-canary.2877",
-    "@cedarjs/vite": "6.0.0-canary.2877",
-    "@cedarjs/web-server": "6.0.0-canary.2877",
+    "@cedarjs/api-server": "6.0.0-canary.2880",
+    "@cedarjs/babel-config": "6.0.0-canary.2880",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2880",
+    "@cedarjs/internal": "6.0.0-canary.2880",
+    "@cedarjs/prerender": "6.0.0-canary.2880",
+    "@cedarjs/project-config": "6.0.0-canary.2880",
+    "@cedarjs/structure": "6.0.0-canary.2880",
+    "@cedarjs/telemetry": "6.0.0-canary.2880",
+    "@cedarjs/utils": "6.0.0-canary.2880",
+    "@cedarjs/vite": "6.0.0-canary.2880",
+    "@cedarjs/web-server": "6.0.0-canary.2880",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-canary.2877",
+    "@cedarjs/framework-tools": "6.0.0-canary.2880",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.64.0",