@cedarjs/cli 7.0.1-next.314 → 7.0.1-next.466

package/dist/commands/setup/monitoring/sentry/templates/sentryApi.ts.template

@@ -3,10 +3,7 @@ import * as Sentry from '@sentry/node'
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   environment: process.env.NODE_ENV,
-  integrations: [
-    Sentry.prismaIntegration(),
-    Sentry.httpIntegration(),
-  ],
+  integrations: [Sentry.prismaIntegration(), Sentry.httpIntegration()],
   tracesSampleRate: 1.0,
 })
 

package/dist/commands/setup/monitoring/sentry/templates/sentryWeb.ts.template

@@ -1,9 +1,12 @@
 import * as Sentry from '@sentry/react'
 
+const sentryDsn =
+  typeof process === 'undefined' ? undefined : process.env?.SENTRY_DSN
+
 let dsn = ''
 let environment = 'development'
 
-if (typeof process === 'undefined' || !process.env?.SENTRY_DSN) {
+if (!sentryDsn) {
   console.error(
     'Missing SENTRY_DSN environment variable. Did you forget to add it to ' +
       'your cedar.toml (or redwood.toml) in `includeEnvironmentVariables`?'
@@ -17,14 +20,14 @@ if (typeof process === 'undefined' || !process.env?.SENTRY_DSN) {
   `)
   console.error('Sentry is disabled for now')
 } else {
-  dsn = process.env.SENTRY_DSN
-  environment = process.env.NODE_ENV
+  dsn = sentryDsn
+  environment = process.env.NODE_ENV ?? 'development'
 }
 
 Sentry.init({
   dsn,
   environment,
-  integrations: [ Sentry.browserTracingIntegration() ],
+  integrations: [Sentry.browserTracingIntegration()],
   tracesSampleRate: 1.0,
 })
 

package/dist/commands/setup/realtime/templates/defer/fastAndSlowFields/fastAndSlowFields.ts.template

@@ -7,7 +7,10 @@ export const fastField = async () => {
   return 'I am fast'
 }
 
-export const slowField = async (_, { waitFor = 5000 }) => {
+export const slowField = async (
+  _: unknown,
+  { waitFor = 5000 }: { waitFor?: number }
+) => {
   logger.debug('waiting on slowField')
   await wait(waitFor)
   return 'I am slow'

package/dist/commands/setup/realtime/templates/liveQueries/auctions/auctions.ts.template

@@ -1,8 +1,16 @@
+import type { BidInput } from 'types/graphql'
+
 import type { LiveQueryStorageMechanism } from '@cedarjs/realtime'
 
 import { logger } from 'src/lib/logger'
 
-const auctions = [
+interface AuctionData {
+  id: string
+  title: string
+  bids: { amount: number }[]
+}
+
+const auctions: AuctionData[] = [
   { id: '1', title: 'RedwoodJS Logo Shirt', bids: [{ amount: 20 }] },
   { id: '2', title: 'RedwoodJS Lapel Pin', bids: [{ amount: 5 }] },
   { id: '3', title: 'RedwoodJS Beanie', bids: [{ amount: 15 }] },
@@ -34,14 +42,14 @@ const auctions = [
  *   }
  * }
  */
-export const auction = async ({ id }) => {
+export const auction = async ({ id }: { id: string }) => {
   const foundAuction = auctions.find((a) => a.id === id)
   logger.debug({ id, auction: foundAuction }, 'auction')
   return foundAuction
 }
 
 export const bid = async (
-  { input },
+  { input }: { input: BidInput },
   { context }: { context: { liveQueryStore: LiveQueryStorageMechanism } }
 ) => {
   const { auctionId, amount } = input
@@ -62,7 +70,7 @@ export const bid = async (
 }
 
 export const Auction = {
-  highestBid: (obj, { root }) => {
+  highestBid: (obj: unknown, { root }: { root: AuctionData }) => {
     const [max] = root.bids.sort((a, b) => b.amount - a.amount)
 
     logger.debug({ obj, root }, 'highestBid')

package/dist/commands/setup/realtime/templates/subscriptions/newMessage/newMessage.ts.template

@@ -48,7 +48,7 @@ const newMessage = {
 
       return pubSub.subscribe('newMessage', roomId)
     },
-    resolve: (payload) => {
+    resolve: (payload: NewMessageChannel['newMessage'][1]) => {
       logger.debug({ payload }, 'newMessage subscription resolve')
 
       return payload

package/dist/commands/setup/tenancy/signupCodemod.js

@@ -52,7 +52,8 @@ function wrapCreateCall(fn) {
           ),
           j.objectProperty(
             j.identifier("invitationToken"),
-            j.memberExpression(
+            // `userAttributes` is optional in dbAuth's signup handler options
+            j.optionalMemberExpression(
               j.identifier("userAttributes"),
               j.identifier("invitationToken")
             )

package/dist/commands/setup/tenancy/templates/InvitePage.tsx.template

@@ -1,11 +1,20 @@
 import { useEffect, useState } from 'react'
 
+import type {
+  AcceptInvitationMutation,
+  AcceptInvitationMutationVariables,
+} from 'types/graphql'
+
 import { navigate, routes, useParams } from '@cedarjs/router'
 import { Metadata, useMutation } from '@cedarjs/web'
+import type { TypedDocumentNode } from '@cedarjs/web'
 
 import { useAuth } from 'src/auth'
 
-const ACCEPT_INVITATION_MUTATION = gql`
+const ACCEPT_INVITATION_MUTATION: TypedDocumentNode<
+  AcceptInvitationMutation,
+  AcceptInvitationMutationVariables
+> = gql`
   mutation AcceptInvitationMutation($token: String!) {
     acceptInvitation(token: $token) {
       id

package/dist/commands/setup/tenancy/templates/organizations.scenarios.ts.template

@@ -26,7 +26,6 @@ export const standard = defineScenario<
             email: 'owner@example.com',
             hashedPassword: 'x',
             salt: 'x',
-            fullName: 'Org Owner',
           },
         },
       },
@@ -40,7 +39,6 @@ export const standard = defineScenario<
             email: 'admin@example.com',
             hashedPassword: 'x',
             salt: 'x',
-            fullName: 'Org Admin',
           },
         },
       },

package/dist/commands/setup/tenancy/templates/organizations.test.ts.template

@@ -199,7 +199,6 @@ describe('organizations service', () => {
             email: 'second-owner@example.com',
             hashedPassword: 'x',
             salt: 'x',
-            fullName: 'Second Owner',
           },
         })
         await db.membership.create({
@@ -233,7 +232,6 @@ describe('organizations service', () => {
             email: 'invitee@example.com',
             hashedPassword: 'x',
             salt: 'x',
-            fullName: 'Invitee',
           },
         })
 
@@ -255,7 +253,6 @@ describe('organizations service', () => {
             email: 'invitee@example.com',
             hashedPassword: 'x',
             salt: 'x',
-            fullName: 'Invitee',
           },
         })
 
@@ -278,7 +275,6 @@ describe('organizations service', () => {
             email: 'first@example.com',
             hashedPassword: 'x',
             salt: 'x',
-            fullName: 'First User',
           },
         })
         const secondUser = await db.user.create({
@@ -286,7 +282,6 @@ describe('organizations service', () => {
             email: 'second@example.com',
             hashedPassword: 'x',
             salt: 'x',
-            fullName: 'Second User',
           },
         })
 
@@ -308,7 +303,6 @@ describe('organizations service', () => {
             email: 'invitee@example.com',
             hashedPassword: 'x',
             salt: 'x',
-            fullName: 'Invitee',
           },
         })
 
@@ -355,7 +349,6 @@ describe('organizations service', () => {
           email: 'invitee@example.com',
           hashedPassword: 'x',
           salt: 'x',
-          fullName: 'Invitee',
         },
       })
 
@@ -375,7 +368,6 @@ describe('organizations service', () => {
         email: 'brand-new@example.com',
         hashedPassword: 'x',
         salt: 'x',
-        fullName: 'Brand New',
       },
     })
 

package/dist/commands/setup/tenancy/templates/organizations.ts.template

@@ -321,7 +321,7 @@ export const removeMember: MutationResolvers['removeMember'] = async ({
 
 export const Membership: MembershipRelationResolvers = {
   organization: (_obj, { root }) =>
-    db.membership.findUnique({ where: { id: root?.id } }).organization(),
+    db.membership.findUniqueOrThrow({ where: { id: root.id } }).organization(),
 }
 
 interface EnsureDefaultOrganizationArgs {

package/dist/commands/setup/tenancy/templates/requireMembership.test.ts.template

@@ -7,7 +7,7 @@ import requireMembership from './requireMembership.js'
  * selects more fields than these tests need.
  */
 const asCurrentUser = (user: { id: string; memberships?: unknown[] }) =>
-  user as unknown as typeof context.currentUser
+  user as unknown as NonNullable<typeof context.currentUser>
 
 describe('requireMembership directive', () => {
   it('declares the directive sdl as schema, with the correct name', () => {

package/dist/commands/setup/tenancy/tenancyHandler.js

@@ -57,7 +57,7 @@ const SIGNUP_SNIPPET = `
 
     await ensureDefaultOrganization({
       currentUser: user,
-      invitationToken: userAttributes.invitationToken,
+      invitationToken: userAttributes?.invitationToken,
     })
 
     return user

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

@@ -6,7 +6,6 @@ import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { colors as c } from "@cedarjs/cli-helpers/colors";
 import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
-import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
 import {
   addRootPackages,
   addWorkspacePackages
@@ -14,36 +13,24 @@ import {
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, usingVSCode } from "../../../../lib/index.js";
-const tailwindDirectives = [
-  "@tailwind base;",
-  "@tailwind components;",
-  "@tailwind utilities;"
-];
-const tailwindDirectivesExist = (indexCSS) => tailwindDirectives.every(
-  (tailwindDirective) => indexCSS.includes(tailwindDirective)
-);
-const tailwindImportsAndNotes = [
+import { insertPluginsBeforeCedar } from "../../deploy/helpers/index.js";
+const tailwindImport = "@import 'tailwindcss';";
+const tailwindImportRegExp = /@import\s+['"]tailwindcss['"]/;
+const tailwindImportAndNotes = [
   "/**",
   " * START --- SETUP TAILWINDCSS EDIT",
   " *",
-  ` * \`${formatCedarCommand(["setup", "ui", "tailwindcss"])}\` placed these directives here`,
+  ` * \`${formatCedarCommand(["setup", "ui", "tailwindcss"])}\` placed this import here`,
   " * to inject Tailwind's styles into your CSS.",
   " * For more information, see: https://tailwindcss.com/docs/installation",
   " */",
-  ...tailwindDirectives,
+  tailwindImport,
   "/**",
   " * END --- SETUP TAILWINDCSS EDIT",
   " */\n"
 ];
-const recommendedVSCodeExtensions = [
-  "csstools.postcss",
-  "bradlc.vscode-tailwindcss"
-];
+const recommendedVSCodeExtensions = ["bradlc.vscode-tailwindcss"];
 const recommendationTexts = {
-  "csstools.postcss": terminalLink(
-    "PostCSS Language Support",
-    "https://marketplace.visualstudio.com/items?itemName=csstools.postcss"
-  ),
   "bradlc.vscode-tailwindcss": terminalLink(
     "Tailwind CSS IntelliSense",
     "https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss"
@@ -87,9 +74,8 @@ const handler = async ({
   const rwPaths = getPaths();
   const projectPackages = ["prettier-plugin-tailwindcss@^0.8.0"];
   const webWorkspacePackages = [
-    "postcss",
-    "tailwindcss@^3.4.17",
-    "autoprefixer"
+    "tailwindcss@^4.3.3",
+    "@tailwindcss/vite@^4.3.3"
   ];
   const tasks = new Listr(
     [
@@ -140,62 +126,45 @@ const handler = async ({
         }
       },
       {
-        title: "Configuring PostCSS...",
-        task: () => {
-          const postCSSConfigPath = rwPaths.web.postcss;
-          if (!force && fs.existsSync(postCSSConfigPath)) {
+        title: "Adding the Tailwind CSS plugin to the Vite config...",
+        task: (_ctx, task) => {
+          const viteConfigPath = rwPaths.web.viteConfig;
+          if (!viteConfigPath || !fs.existsSync(viteConfigPath)) {
+            throw new Error("Could not find web/vite.config.{ts,js}");
+          }
+          const viteConfig = fs.readFileSync(viteConfigPath, "utf-8");
+          if (viteConfig.includes("@tailwindcss/vite")) {
+            task.skip("The Tailwind CSS Vite plugin is already configured");
+            return;
+          }
+          const viteConfigWithPlugin = insertPluginsBeforeCedar({
+            content: viteConfig,
+            pluginCodes: ["tailwindcss()"]
+          });
+          if (!viteConfigWithPlugin) {
             throw new Error(
-              "PostCSS config already exists.\nUse --force to override existing config."
+              `Could not find \`cedar()\` in the plugins array in ${viteConfigPath}.
+Add \`import tailwindcss from '@tailwindcss/vite'\` to the top of the file and \`tailwindcss()\` to the plugins array yourself, and then run this command again.`
             );
-          } else {
-            const postCSSConfig = fs.readFileSync(
-              path.join(
-                import.meta.dirname,
-                "../templates/postcss.config.cjs.template"
-              ),
-              "utf-8"
-            );
-            fs.mkdirSync(path.dirname(postCSSConfigPath), { recursive: true });
-            return fs.writeFileSync(postCSSConfigPath, postCSSConfig);
           }
-        }
-      },
-      {
-        title: "Initializing Tailwind CSS...",
-        task: async () => {
-          const tailwindConfigPath = path.join(
-            rwPaths.web.config,
-            "tailwind.config.cjs"
+          const tailwindPluginImport = "import tailwindcss from '@tailwindcss/vite'\n";
+          const importAnchor = /^import .* from ['"]vite['"]/m.exec(viteConfigWithPlugin) ?? /^import /m.exec(viteConfigWithPlugin);
+          const insertAt = importAnchor?.index ?? 0;
+          fs.writeFileSync(
+            viteConfigPath,
+            viteConfigWithPlugin.slice(0, insertAt) + tailwindPluginImport + viteConfigWithPlugin.slice(insertAt)
           );
-          if (fs.existsSync(tailwindConfigPath)) {
-            if (force) {
-              fs.unlinkSync(tailwindConfigPath);
-            } else {
-              throw new Error(
-                "Tailwind CSS config already exists.\nUse --force to override existing config."
-              );
-            }
-          }
-          await runBin("tailwindcss", ["init", tailwindConfigPath], {
-            cwd: rwPaths.web.base
-          });
-          const tailwindConfig = fs.readFileSync(tailwindConfigPath, "utf-8");
-          const newTailwindConfig = 'const { join } = require("node:path");\n\n' + tailwindConfig.replace(
-            "content: []",
-            "content: [join(__dirname, '../src/**/*.{js,jsx,ts,tsx}')]"
-          ).replace("export default {", "module.exports = {");
-          fs.writeFileSync(tailwindConfigPath, newTailwindConfig);
         }
       },
       {
-        title: "Adding directives to index.css...",
+        title: "Adding Tailwind CSS import to index.css...",
         task: (_ctx, task) => {
           const INDEX_CSS_PATH = path.join(rwPaths.web.src, "index.css");
           const indexCSS = fs.readFileSync(INDEX_CSS_PATH, "utf-8");
-          if (tailwindDirectivesExist(indexCSS)) {
-            task.skip("Directives already exist in index.css");
+          if (tailwindImportRegExp.test(indexCSS)) {
+            task.skip("Tailwind CSS import already exists in index.css");
           } else {
-            const newIndexCSS = tailwindImportsAndNotes.join("\n") + indexCSS;
+            const newIndexCSS = tailwindImportAndNotes.join("\n") + indexCSS;
             fs.writeFileSync(INDEX_CSS_PATH, newIndexCSS);
           }
         }
@@ -276,7 +245,9 @@ const handler = async ({
             "activeClassName",
             "errorClassName"
           ];
+          const fileAssociations = { "*.css": "tailwindcss" };
           let newSettingsJson = {
+            ["files.associations"]: fileAssociations,
             ["tailwindCSS.classAttributes"]: classAttributes
           };
           if (fs.existsSync(VS_CODE_SETTINGS_PATH)) {
@@ -294,8 +265,13 @@ const handler = async ({
             const mergedClassAttributes = Array.from(
               /* @__PURE__ */ new Set([...classAttributes, ...originalTwClassAttributesJson])
             );
+            const existingAssociations = originalSettingsJson["files.associations"];
             newSettingsJson = {
               ...originalSettingsJson,
+              ["files.associations"]: {
+                ...existingAssociations && typeof existingAssociations === "object" && !Array.isArray(existingAssociations) ? existingAssociations : {},
+                ...fileAssociations
+              },
               ["tailwindCSS.classAttributes"]: mergedClassAttributes
             };
           }
@@ -306,34 +282,38 @@ const handler = async ({
         }
       },
       {
-        title: "Adding tailwind config entry in prettier...",
+        title: "Adding tailwind stylesheet entry in prettier...",
         task: async (_ctx) => {
           const prettierConfigPath = path.join(
             rwPaths.base,
             "prettier.config.cjs"
           );
           const prettierConfig = fs.readFileSync(prettierConfigPath, "utf-8");
-          const tailwindConfigPath = path.relative(
-            rwPaths.base,
-            path.posix.join(rwPaths.web.config, "tailwind.config.cjs")
-          ).replaceAll("\\", "/");
+          const tailwindStylesheetPath = path.relative(rwPaths.base, path.join(rwPaths.web.src, "index.css")).replaceAll("\\", "/");
+          const tailwindStylesheetEntry = `tailwindStylesheet: './${tailwindStylesheetPath}',`;
           let newPrettierConfig = prettierConfig;
-          if (newPrettierConfig.includes("tailwindConfig: ")) {
-            if (force) {
-              newPrettierConfig = newPrettierConfig.replace(
-                /tailwindConfig: .*(,)?/,
-                `tailwindConfig: './${tailwindConfigPath}',`
+          const stringEntryRegExp = /tailwindStylesheet:\s*(['"`])[^'"`\n]*\1,?/;
+          if (newPrettierConfig.includes("tailwindStylesheet")) {
+            if (!force) {
+              throw new Error(
+                "tailwindStylesheet setting already exists in prettier configuration.\nUse --force to override existing config."
               );
-            } else {
+            }
+            if (!stringEntryRegExp.test(newPrettierConfig)) {
               throw new Error(
-                "tailwindConfig setting already exists in prettier configuration.\nUse --force to override existing config."
+                `Could not update the tailwindStylesheet setting in ${prettierConfigPath}.
+Set it to './${tailwindStylesheetPath}' yourself.`
               );
             }
+            newPrettierConfig = newPrettierConfig.replace(
+              stringEntryRegExp,
+              tailwindStylesheetEntry
+            );
           } else {
             newPrettierConfig = newPrettierConfig.replace(
               /,(\n\s*)(\}\n?)$/,
               `,
-  tailwindConfig: './${tailwindConfigPath}',$1$2`
+  ${tailwindStylesheetEntry}$1$2`
             );
           }
           fs.writeFileSync(prettierConfigPath, newPrettierConfig);

package/dist/commands/setup/uploads/gitignore.js

@@ -0,0 +1,17 @@
+const UPLOADS_GITIGNORE_ENTRY = "api/.uploads";
+function transformGitignore(source) {
+  const activeLines = source.split("\n").map((line) => line.trimEnd()).filter((line) => line.length > 0 && !line.startsWith("#"));
+  if (activeLines.includes(UPLOADS_GITIGNORE_ENTRY)) {
+    return source;
+  }
+  if (/^dev\.db\*$/m.test(source)) {
+    return source.replace(/^(dev\.db\*)$/m, `$1
+${UPLOADS_GITIGNORE_ENTRY}`);
+  }
+  const prefix = source === "" || source.endsWith("\n") ? source : source + "\n";
+  return prefix + UPLOADS_GITIGNORE_ENTRY + "\n";
+}
+export {
+  UPLOADS_GITIGNORE_ENTRY,
+  transformGitignore
+};

package/dist/commands/setup/uploads/serverFile.js

@@ -1,3 +1,4 @@
+import { isBuiltin } from "node:module";
 const START_LINE = /^([ \t]*)await server\.start\(\)/m;
 const FACTORY_IMPORT = /import\s*\{[^}]*\bcreateAuthDecoder\b[^}]*\}\s*from\s*['"](@cedarjs\/auth-[a-z0-9-]+-api)['"]/;
 const DECODER_IMPORT = /import\s*\{[^}]*\bauthDecoder\b[^}]*\}\s*from\s*['"](@cedarjs\/auth-[a-z0-9-]+-api)['"]/;
@@ -48,21 +49,20 @@ function hasBinding(source, name) {
   return importedBindings(source).has(name) || declared.test(source);
 }
 function uploadsServerImports(source, auth) {
-  const packageSpecs = [];
-  const srcSpecs = [];
+  const specs = [];
   if (auth) {
     if (auth.usesFactory) {
       if (!hasBinding(source, "authDecoder")) {
-        packageSpecs.push({
+        specs.push({
           names: ["createAuthDecoder"],
           from: auth.decoderPackage
         });
       }
     } else {
-      packageSpecs.push({ names: ["authDecoder"], from: auth.decoderPackage });
+      specs.push({ names: ["authDecoder"], from: auth.decoderPackage });
     }
   }
-  packageSpecs.push({
+  specs.push({
     names: auth ? ["cedarUploadsPlugin", "createUploadAuthenticator"] : ["cedarUploadsPlugin"],
     from: "@cedarjs/uploads"
   });
@@ -71,20 +71,97 @@ function uploadsServerImports(source, auth) {
     if (auth.usesFactory && !hasBinding(source, "authDecoder")) {
       authNames.unshift("cookieName");
     }
-    srcSpecs.push({ names: authNames, from: "src/lib/auth" });
+    specs.push({ names: authNames, from: "src/lib/auth" });
   }
-  srcSpecs.push({ names: ["db"], from: "src/lib/db" });
-  srcSpecs.push({ names: ["targets"], from: "src/lib/uploads" });
-  const render = (specs) => specs.map((spec) => ({
+  specs.push({ names: ["db"], from: "src/lib/db" });
+  specs.push({ names: ["targets"], from: "src/lib/uploads" });
+  return specs.map((spec) => ({
     ...spec,
     names: spec.names.filter((name) => !hasBinding(source, name))
-  })).filter((spec) => spec.names.length > 0).map((spec) => `import { ${spec.names.join(", ")} } from '${spec.from}'`);
-  const packageLines = render(packageSpecs);
-  const srcLines = render(srcSpecs);
-  if (packageLines.length > 0 && srcLines.length > 0) {
-    return [...packageLines, "", ...srcLines];
+  })).filter((spec) => spec.names.length > 0).map((spec) => ({
+    line: `import { ${spec.names.join(", ")} } from '${spec.from}'`,
+    from: spec.from
+  }));
+}
+function findImports(lines) {
+  const imports = [];
+  for (let start = 0; start < lines.length; start++) {
+    if (!/^import\b/.test(lines[start])) {
+      continue;
+    }
+    const sideEffect = /^import\s*['"]([^'"]+)['"]/.exec(lines[start]);
+    if (sideEffect) {
+      imports.push({ start, end: start, from: sideEffect[1] });
+      continue;
+    }
+    for (let end = start; end < lines.length; end++) {
+      const from = /\bfrom\s*['"]([^'"]+)['"]/.exec(lines[end]);
+      if (from) {
+        imports.push({ start, end, from: from[1] });
+        start = end;
+        break;
+      }
+    }
+  }
+  return imports;
+}
+function importGroup(from) {
+  if (isBuiltin(from)) {
+    return 0;
+  }
+  if (from === "react") {
+    return 1;
+  }
+  if (from.startsWith("@cedarjs/")) {
+    return 3;
+  }
+  if (from.startsWith("src/")) {
+    return /^src\/[^/]+\/.+\.(?:sdl\.)?(?:js|ts)$/.test(from) ? 4 : 5;
   }
-  return [...packageLines, ...srcLines];
+  if (from === ".." || from.startsWith("../")) {
+    return 6;
+  }
+  if (/^\.\/?(?:index(?:\.[jt]sx?)?)?$/.test(from)) {
+    return 8;
+  }
+  if (from.startsWith("./")) {
+    return 7;
+  }
+  return 2;
+}
+function compareSpecifiers(a, b) {
+  const segmentsA = a.toLowerCase().split("/");
+  const segmentsB = b.toLowerCase().split("/");
+  for (let i = 0; i < Math.min(segmentsA.length, segmentsB.length); i++) {
+    if (segmentsA[i] !== segmentsB[i]) {
+      return segmentsA[i] < segmentsB[i] ? -1 : 1;
+    }
+  }
+  return segmentsA.length - segmentsB.length;
+}
+function insertImport(lines, serverImport) {
+  const imports = findImports(lines);
+  const group = importGroup(serverImport.from);
+  const sameGroup = imports.filter((i) => importGroup(i.from) === group);
+  if (sameGroup.length > 0) {
+    const next = sameGroup.find(
+      (i) => compareSpecifiers(i.from, serverImport.from) > 0
+    );
+    const at2 = next ? next.start : sameGroup[sameGroup.length - 1].end + 1;
+    return [...lines.slice(0, at2), serverImport.line, ...lines.slice(at2)];
+  }
+  const earlier = imports.filter((i) => importGroup(i.from) < group);
+  if (earlier.length > 0) {
+    const at2 = Math.max(...earlier.map((i) => i.end)) + 1;
+    const inserted = ["", serverImport.line];
+    if (at2 < lines.length && lines[at2].trim() !== "") {
+      inserted.push("");
+    }
+    return [...lines.slice(0, at2), ...inserted, ...lines.slice(at2)];
+  }
+  const later = imports.find((i) => importGroup(i.from) > group);
+  const at = later ? later.start : 0;
+  return [...lines.slice(0, at), serverImport.line, "", ...lines.slice(at)];
 }
 function uploadsServerRegistration(source, auth) {
   if (!auth) {
@@ -122,18 +199,7 @@ function addUploadsPlugin(source, { auth = null } = {}) {
   if (!start) {
     throw new Error("CEDAR_UPLOADS_ERR_NO_START");
   }
-  const lines = source.split("\n");
-  let lastImport = -1;
-  for (const [index, line] of lines.entries()) {
-    if (/^import\s/.test(line)) {
-      lastImport = index;
-    }
-  }
-  const withImports = [
-    ...lines.slice(0, lastImport + 1),
-    ...uploadsServerImports(source, auth),
-    ...lines.slice(lastImport + 1)
-  ].join("\n");
+  const withImports = uploadsServerImports(source, auth).reduce(insertImport, source.split("\n")).join("\n");
   return withImports.replace(
     START_LINE,
     (line) => `${uploadsServerRegistration(source, auth)}