@cedarjs/internal 7.0.0-canary.2984 → 7.0.0-canary.2985

package/dist/build/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AA6CtE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAI9D,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAyVD,eAAO,MAAM,gBAAgB,iHAiE5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAwCtE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAI9D,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA8UD,eAAO,MAAM,gBAAgB,iHA+D5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/build/api.js

@@ -14,12 +14,7 @@ import {
   getApiSideBabelPluginsForVite,
   transformWithBabel
 } from "@cedarjs/babel-config";
-import {
-  getConfig,
-  getPaths,
-  projectSideIsEsm,
-  resolveFile
-} from "@cedarjs/project-config";
+import { getConfig, getPaths, resolveFile } from "@cedarjs/project-config";
 import { findApiFiles } from "../files.js";
 import {
   applyGqlormInject,
@@ -79,7 +74,6 @@ const runCedarBabelTransformsPlugin = {
       fileContents = applyJobPathInjector(fileContents, args.path, getPaths().api.jobs) ?? fileContents;
       const normalizedPath = normalizePath(args.path);
       const cedarPaths = getPaths();
-      const isEsm = projectSideIsEsm("api");
       const apiBabelConfigPath = getApiSideBabelConfigPath();
       let code = fileContents;
       if (apiBabelConfigPath) {
@@ -98,9 +92,7 @@ const runCedarBabelTransformsPlugin = {
       code = applyImportExtensions(code, args.path);
       const functionsDir = normalizePath(cedarPaths.api.functions);
       if (normalizedPath.startsWith(functionsDir + "/")) {
-        code = applyHandlerAlsWrapping(code, {
-          projectIsEsm: isEsm
-        }) ?? code;
+        code = applyHandlerAlsWrapping(code) ?? code;
       }
       if (normalizedPath.startsWith(normalizePath(cedarPaths.api.src) + "/")) {
         code = applyOtelWrapping(code, args.path, cedarPaths.api.src) ?? code;
@@ -178,7 +170,6 @@ function createDirectoryNamedImportVitePlugin() {
 }
 function createCedarViteApiPlugin() {
   const cedarConfig = getConfig();
-  const isEsm = projectSideIsEsm("api");
   return {
     name: "cedar-vite-api-babel-transform",
     enforce: "pre",
@@ -223,9 +214,7 @@ function createCedarViteApiPlugin() {
       outputCode = applyImportExtensions(outputCode, id);
       const functionsDir = normalizePath(cedarPaths.api.functions);
       if (normalizedId.startsWith(functionsDir + "/")) {
-        outputCode = applyHandlerAlsWrapping(outputCode, {
-          projectIsEsm: isEsm
-        }) ?? outputCode;
+        outputCode = applyHandlerAlsWrapping(outputCode) ?? outputCode;
       }
       if (!transformedCode) {
         if (outputCode === code) {
@@ -245,8 +234,6 @@ function createCedarViteApiPlugin() {
 }
 const buildApiWithVite = async () => {
   const cedarPaths = getPaths();
-  const isEsm = projectSideIsEsm("api");
-  const format = isEsm ? "es" : "cjs";
   const apiFiles = findApiFiles();
   const input = {};
   for (const f of apiFiles) {
@@ -263,7 +250,7 @@ const buildApiWithVite = async () => {
       rollupOptions: {
         input,
         output: {
-          format,
+          format: "es",
           preserveModules: true,
           preserveModulesRoot: cedarPaths.api.src,
           entryFileNames: "[name].js",
@@ -344,13 +331,12 @@ async function fixSourceMaps(distDir, srcDir) {
 }
 function getEsbuildOptions(files) {
   const cedarPaths = getPaths();
-  const format = projectSideIsEsm("api") ? "esm" : "cjs";
   return {
     absWorkingDir: cedarPaths.api.base,
     entryPoints: files,
     platform: "node",
     target: "node24",
-    format,
+    format: "esm",
     allowOverwrite: true,
     bundle: false,
     // Registration order matters: cedarApiGraphqlPlugin (narrow filter) must

package/dist/build/esbuild-plugin-api-graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAsB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAiHzB,CAAA"}
+{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAsB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA8GzB,CAAA"}

package/dist/build/esbuild-plugin-api-graphql.js

@@ -5,7 +5,7 @@ import {
   getApiSideBabelPluginsForVite,
   transformWithBabel
 } from "@cedarjs/babel-config";
-import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
+import { getConfig, getPaths } from "@cedarjs/project-config";
 import {
   applyGqlormInject,
   applyGraphqlOptionsExtract
@@ -59,9 +59,7 @@ const cedarApiGraphqlPlugin = {
       if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
         code = applyOtelWrapping(code, args.path, getPaths().api.src) ?? code;
       }
-      code = applyHandlerAlsWrapping(code, {
-        projectIsEsm: projectSideIsEsm("api")
-      }) ?? code;
+      code = applyHandlerAlsWrapping(code) ?? code;
       return {
         contents: code,
         // Babel output is always plain JS. Without Babel the contents are

package/dist/build/esbuild-plugin-handler-als-wrapping.d.ts

@@ -1,4 +1,2 @@
-export declare function applyHandlerAlsWrapping(code: string, { projectIsEsm }?: {
-    projectIsEsm?: boolean;
-}): string | null;
+export declare function applyHandlerAlsWrapping(code: string): string | null;
 //# sourceMappingURL=esbuild-plugin-handler-als-wrapping.d.ts.map

package/dist/build/esbuild-plugin-handler-als-wrapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-plugin-handler-als-wrapping.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-handler-als-wrapping.ts"],"names":[],"mappings":"AAOA,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,EAAE,YAAoB,EAAE,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACxD,MAAM,GAAG,IAAI,CA0Cf"}
+{"version":3,"file":"esbuild-plugin-handler-als-wrapping.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-handler-als-wrapping.ts"],"names":[],"mappings":"AAOA,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsCnE"}

package/dist/build/esbuild-plugin-handler-als-wrapping.js

@@ -1,4 +1,4 @@
-function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
+function applyHandlerAlsWrapping(code) {
   const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   const handlerMatch = handlerRe.exec(code);
   if (!handlerMatch) {
@@ -6,8 +6,7 @@ function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   }
   const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
   const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
-  const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
-  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '${storePath}'
+  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '@cedarjs/context/dist/store.js'
 `;
   const handlerStart = handlerMatch.index;
   const before = code.slice(0, handlerStart);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "7.0.0-canary.2984",
+  "version": "7.0.0-canary.2985",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -121,14 +121,14 @@
     "@babel/parser": "7.29.8",
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/traverse": "7.29.8",
-    "@cedarjs/api": "7.0.0-canary.2984",
-    "@cedarjs/babel-config": "7.0.0-canary.2984",
-    "@cedarjs/cli-helpers": "7.0.0-canary.2984",
-    "@cedarjs/graphql-server": "7.0.0-canary.2984",
-    "@cedarjs/project-config": "7.0.0-canary.2984",
-    "@cedarjs/router": "7.0.0-canary.2984",
-    "@cedarjs/structure": "7.0.0-canary.2984",
-    "@cedarjs/utils": "7.0.0-canary.2984",
+    "@cedarjs/api": "7.0.0-canary.2985",
+    "@cedarjs/babel-config": "7.0.0-canary.2985",
+    "@cedarjs/cli-helpers": "7.0.0-canary.2985",
+    "@cedarjs/graphql-server": "7.0.0-canary.2985",
+    "@cedarjs/project-config": "7.0.0-canary.2985",
+    "@cedarjs/router": "7.0.0-canary.2985",
+    "@cedarjs/structure": "7.0.0-canary.2985",
+    "@cedarjs/utils": "7.0.0-canary.2985",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -166,7 +166,7 @@
     "vite-tsconfig-paths": "^6.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.0.0-canary.2984",
+    "@cedarjs/framework-tools": "7.0.0-canary.2985",
     "@jridgewell/trace-mapping": "0.3.31",
     "@oxc-project/types": "^0.144.0",
     "concurrently": "9.2.4",