@cedarjs/cli 6.0.0-canary.2928 → 6.0.0-canary.2930

package/dist/commands/generate/package/filesTask.js

@@ -8,6 +8,7 @@ const files = async ({
   fileName,
   typescript,
   tests: generateTests = true,
+  esm = false,
   ...rest
 }) => {
   const extension = typescript ? ".ts" : ".js";
@@ -58,6 +59,17 @@ const files = async ({
       outputPath: path.join(folderName, "src", `${fileName}.test${extension}`)
     });
     outputFiles.push(testFile);
+    if (esm) {
+      const vitestConfigFile = await templateForFile({
+        name,
+        side: "packages",
+        generator: "package",
+        templatePath: "vitest.config.ts.template",
+        templateVars: { folderName, ...rest },
+        outputPath: path.join(folderName, `vitest.config${extension}`)
+      });
+      outputFiles.push(vitestConfigFile);
+    }
   }
   return outputFiles.reduce(async (accP, [outputPath, content]) => {
     const acc = await accP;

package/dist/commands/generate/package/packageHandler.js

@@ -11,7 +11,7 @@ import { workspacePackageSpecifier } from "@cedarjs/cli-helpers/packageManager";
 import { runScript, runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
 import { installPackages } from "@cedarjs/cli-helpers/packageManager/packages";
 import { addWorkspaceDir } from "@cedarjs/cli-helpers/packageManager/workspaces";
-import { getConfig } from "@cedarjs/project-config";
+import { getConfig, projectIsEsm } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
@@ -32,8 +32,10 @@ async function updateTsconfig(task) {
       path: path.join(getPaths().api.base, "tsconfig.json"),
       expectedModule: "node20",
       // While Cedar doesn't officially endorse NodeNext, it will still work
-      // here, so we'll keep it
-      acceptable: ["node20", "nodenext"]
+      // here, so we'll keep it. ESNext is also acceptable: it's the current
+      // create-cedar-app default, paired with `moduleResolution: bundler` so
+      // extensionless scaffold/generator imports resolve correctly.
+      acceptable: ["node20", "nodenext", "esnext"]
     },
     {
       name: "web",
@@ -338,7 +340,12 @@ const handler = async ({
       {
         title: "Generating package files...",
         task: async (ctx) => {
-          packageFiles = await files({ ...ctx.nameVariants, ...rest });
+          packageFiles = await files({
+            ...ctx.nameVariants,
+            // Only Vitest projects get a config generated for them
+            esm: projectIsEsm(),
+            ...rest
+          });
           return writeFilesTask(packageFiles, { overwriteExisting: force });
         }
       },

package/dist/commands/generate/package/templates/test.ts.template

@@ -1,7 +1,7 @@
 import { ${camelName} } from './index.js'
 
 describe('${camelName}', () => {
-  it('should not throw any errors', async () => {
-    expect(${camelName}()).not.toThrow()
+  it('should not throw any errors', () => {
+    expect(() => ${camelName}()).not.toThrow()
   })
 })

package/dist/commands/generate/package/templates/vitest.config.ts.template

@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    name: '${folderName}',
+    // Enables global test APIs like describe, it, expect
+    globals: true,
+  },
+})

package/dist/commands/test/testHandlerEsm.js

@@ -59,10 +59,10 @@ const handler = async ({
     vitestArgs.push("--run");
   }
   if (!others["config"]) {
+    sides.forEach((side) => vitestArgs.push("--project", side));
     if (!sides.length) {
       project.workspaces().forEach((side) => sides.push(side));
     }
-    sides.forEach((side) => vitestArgs.push("--project", side));
   }
   try {
     const cacheDirDb = `file:${ensurePosixPath(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2928",
+  "version": "6.0.0-canary.2930",
   "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.2928",
-    "@cedarjs/babel-config": "6.0.0-canary.2928",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2928",
-    "@cedarjs/internal": "6.0.0-canary.2928",
-    "@cedarjs/prerender": "6.0.0-canary.2928",
-    "@cedarjs/project-config": "6.0.0-canary.2928",
-    "@cedarjs/structure": "6.0.0-canary.2928",
-    "@cedarjs/telemetry": "6.0.0-canary.2928",
-    "@cedarjs/utils": "6.0.0-canary.2928",
-    "@cedarjs/vite": "6.0.0-canary.2928",
-    "@cedarjs/web-server": "6.0.0-canary.2928",
+    "@cedarjs/api-server": "6.0.0-canary.2930",
+    "@cedarjs/babel-config": "6.0.0-canary.2930",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2930",
+    "@cedarjs/internal": "6.0.0-canary.2930",
+    "@cedarjs/prerender": "6.0.0-canary.2930",
+    "@cedarjs/project-config": "6.0.0-canary.2930",
+    "@cedarjs/structure": "6.0.0-canary.2930",
+    "@cedarjs/telemetry": "6.0.0-canary.2930",
+    "@cedarjs/utils": "6.0.0-canary.2930",
+    "@cedarjs/vite": "6.0.0-canary.2930",
+    "@cedarjs/web-server": "6.0.0-canary.2930",
     "@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.2928",
+    "@cedarjs/framework-tools": "6.0.0-canary.2930",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.68.1",