@cedarjs/vite 5.0.4-next.167 → 5.0.4

package/dist/api/vite-plugin-cedar-vitest-api-preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-vitest-api-preset.d.ts","sourceRoot":"","sources":["../../src/api/vite-plugin-cedar-vitest-api-preset.ts"],"names":[],"mappings":"AAUA,wBAAgB,iBAAiB,kEAShC"}
+{"version":3,"file":"vite-plugin-cedar-vitest-api-preset.d.ts","sourceRoot":"","sources":["../../src/api/vite-plugin-cedar-vitest-api-preset.ts"],"names":[],"mappings":"AAQA,wBAAgB,iBAAiB,kEAOhC"}

package/dist/api/vite-plugin-cedar-vitest-api-preset.js

@@ -3,13 +3,9 @@ import {
   cedarVitestApiConfigPlugin,
   trackDbImportsPlugin
 } from "@cedarjs/testing/api/vitest";
-import { cedarImportDirPlugin } from "../plugins/vite-plugin-cedar-import-dir.js";
-import { cedarjsJobPathInjectorPlugin } from "../plugins/vite-plugin-cedarjs-job-path-injector.js";
 import { cedarjsResolveCedarStyleImportsPlugin } from "../plugins/vite-plugin-cedarjs-resolve-cedar-style-imports.js";
 function cedarVitestPreset() {
   return [
-    cedarImportDirPlugin(),
-    cedarjsJobPathInjectorPlugin(),
     cedarVitestApiConfigPlugin(),
     autoImportsPlugin(),
     cedarjsResolveCedarStyleImportsPlugin(),

package/dist/apiDevMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AAkE7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAoMlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}
+{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,MAAM,CAAA;AA2BrD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAgFlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}

package/dist/apiDevMiddleware.js

@@ -1,47 +1,17 @@
-import fs from "node:fs";
 import { glob } from "node:fs/promises";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import ansis from "ansis";
 import { normalizePath } from "vite";
-import { gqlPlugin as gqlTagPlugin } from "vite-plugin-graphql-tag";
-import tsPathsMod from "vite-tsconfig-paths";
-const tsconfigPaths = (
-  // @ts-expect-error – .default only exists at runtime in CJS double-wrap
-  // interop
-  tsPathsMod.default?.default || tsPathsMod.default || tsPathsMod
-);
 import { buildCedarContext, wrapLegacyHandler } from "@cedarjs/api/runtime";
 import {
-  getApiSideBabelConfigPath,
-  getApiSideBabelPluginsForVite,
+  getApiSideBabelPlugins,
   transformWithBabel
 } from "@cedarjs/babel-config";
 import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
 import { createGraphQLYoga } from "@cedarjs/graphql-server";
-import { applyGqlormInject } from "@cedarjs/internal/dist/build/api-graphql-transforms.js";
-import { getConfig, getPaths } from "@cedarjs/project-config";
-import { generateDiffSourceMap } from "./lib/generateDiffSourceMap.js";
+import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
-import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
-import { cedarDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedar-directory-named-import.js";
-import { applyGraphqlOptionsExtract } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
-import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
-import { cedarApiLogFormatterDevPlugin } from "./plugins/vite-plugin-cedar-log-formatter-dev.js";
-import { applyOtelWrapping } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
-import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
-function resolveWithExtensions(id) {
-  if (fs.existsSync(id) && fs.statSync(id).isFile()) {
-    return id;
-  }
-  for (const ext of [".js", ".ts", ".jsx", ".tsx", ".mjs", ".mts"]) {
-    const withExt = id + ext;
-    if (fs.existsSync(withExt)) {
-      return withExt;
-    }
-  }
-  return id;
-}
 const LAMBDA_FUNCTIONS = {};
 let graphqlYoga = null;
 let loadApiFunctionsInFlight = null;
@@ -145,8 +115,12 @@ async function internalLoadApiFunctions(viteServer) {
 async function createApiViteServer() {
   const cedarPaths = getPaths();
   const cedarConfig = getConfig();
+  const isEsm = projectSideIsEsm("api");
   const normalizedBase = normalizePath(cedarPaths.base);
-  const babelPlugins = getApiSideBabelConfigPath() ? getApiSideBabelPluginsForVite() : null;
+  const babelPlugins = getApiSideBabelPlugins({
+    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
+    projectIsEsm: isEsm
+  });
   const workspacePkgSourceMap = Object.fromEntries(
     Object.entries(getWorkspacePackageAliases(cedarPaths, cedarConfig)).map(
       ([name, sourceFile]) => [name, normalizePath(sourceFile)]
@@ -166,36 +140,6 @@ async function createApiViteServer() {
       alias: workspacePkgSourceMap
     },
     plugins: [
-      // tsconfigPaths resolves user-defined tsconfig.json `paths` aliases; it
-      // replaces the Babel module-resolver's tsconfig-paths handling for dev.
-      tsconfigPaths(),
-      cedarApiLogFormatterDevPlugin(),
-      {
-        name: "cedar-api-src-redirect",
-        enforce: "pre",
-        resolveId(id, importer) {
-          const normalizedImporter = importer && normalizePath(importer);
-          const normalizedApiSrc = normalizePath(cedarPaths.api.src);
-          if (!normalizedImporter?.startsWith(`${normalizedApiSrc}/`)) {
-            return null;
-          }
-          if (id.startsWith("src/")) {
-            return resolveWithExtensions(
-              path.join(cedarPaths.api.src, id.slice(4))
-            );
-          }
-          return null;
-        }
-      },
-      cedarImportDirPlugin(),
-      cedarDirectoryNamedImportPlugin(),
-      cedarAutoImportsPlugin(),
-      cedarjsJobPathInjectorPlugin(),
-      (() => {
-        const p = gqlTagPlugin();
-        p.enforce = "post";
-        return p;
-      })(),
       {
         name: "cedar-api-babel-transform",
         enforce: "pre",
@@ -210,51 +154,11 @@ async function createApiViteServer() {
             return null;
           }
           try {
-            let sourceCode = code;
-            let sourceMap = null;
-            if (normalizePath(id).endsWith("/graphql.ts") || normalizePath(id).endsWith("/graphql.js")) {
-              const extracted = applyGraphqlOptionsExtract(sourceCode);
-              if (extracted) {
-                sourceCode = extracted.code;
-                sourceMap = extracted.map;
-              }
-              const injected = applyGqlormInject(sourceCode, id);
-              if (injected) {
-                sourceCode = injected;
-                sourceMap = null;
-              }
-            }
-            if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
-              const relativePath = normalizePath(id).slice(
-                normalizedBase.length + "/api/src/".length
-              );
-              const apiFolder = relativePath.split("/")[0] ?? "?";
-              const wrapped = applyOtelWrapping(sourceCode, id, apiFolder);
-              if (wrapped) {
-                sourceCode = wrapped;
-                sourceMap = null;
-              }
-            }
-            if (!babelPlugins) {
-              if (sourceCode === code) {
-                return null;
-              }
-              return {
-                code: sourceCode,
-                map: sourceMap ?? generateDiffSourceMap(code, sourceCode)
-              };
-            }
-            const inputSourceMap = sourceCode === code ? null : sourceMap ?? generateDiffSourceMap(code, sourceCode);
-            if (inputSourceMap) {
-              inputSourceMap.sources = [id];
-            }
             const result = await transformWithBabel(
-              sourceCode,
+              code,
               id,
               babelPlugins,
-              true,
-              true,
-              inputSourceMap ?? void 0
+              true
             );
             if (!result?.code) {
               return null;

package/dist/buildApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA6DA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBAya3B"}
+{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA+BA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBA8U3B"}

package/dist/buildApp.js

@@ -3,37 +3,16 @@ import path from "node:path";
 import { catchAllEntry, getAllEntries } from "@universal-deploy/store";
 import { catchAll } from "@universal-deploy/vite";
 import { createBuilder, normalizePath } from "vite";
-import { gqlPlugin as gqlTagPlugin } from "vite-plugin-graphql-tag";
-import tsPathsMod from "vite-tsconfig-paths";
-const tsconfigPaths = (
-  // @ts-expect-error – .default only exists at runtime in CJS double-wrap
-  // interop
-  tsPathsMod.default?.default || tsPathsMod.default || tsPathsMod
-);
 import {
-  getApiSideBabelConfigPath,
-  getApiSideBabelPluginsForVite,
+  getApiSideBabelPlugins,
   transformWithBabel
 } from "@cedarjs/babel-config";
-import {
-  applyEsmExtensions,
-  applySrcAlias
-} from "@cedarjs/internal/dist/build/api.js";
 import { findApiFiles } from "@cedarjs/internal/dist/files.js";
 import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
-import { generateDiffSourceMap } from "./lib/generateDiffSourceMap.js";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
-import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
-import { cedarDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedar-directory-named-import.js";
-import { cedarGqlormInjectPlugin } from "./plugins/vite-plugin-cedar-gqlorm-inject.js";
-import { cedarGraphqlOptionsExtractPlugin } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
-import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
-import { cedarMockCellDataPlugin } from "./plugins/vite-plugin-cedar-mock-cell-data.js";
-import { cedarOtelWrappingPlugin } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
-import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
-import { handlerAlsWrappingPlugin } from "./plugins/vite-plugin-handler-als-wrapping.js";
+import { cedarContextWrappingPlugin } from "./plugins/vite-plugin-cedar-context-wrapping.js";
 function resolveWithExtensions(id) {
-  if (fs.existsSync(id) && fs.statSync(id).isFile()) {
+  if (fs.existsSync(id)) {
     return id;
   }
   for (const ext of [".js", ".ts", ".jsx", ".tsx", ".mjs", ".mts"]) {
@@ -120,19 +99,16 @@ async function buildCedarApp({
       };
     }
   }
+  const babelPlugins = workspace.includes("api") ? getApiSideBabelPlugins({
+    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
+    projectIsEsm: projectSideIsEsm("api")
+  }) : null;
   const workspacePkgSourceMap = workspace.includes("api") ? Object.fromEntries(
     Object.entries(getWorkspacePackageAliases(cedarPaths, cedarConfig)).map(
       ([name, sourceFile]) => [name, normalizePath(sourceFile)]
     )
   ) : {};
   const plugins = [
-    tsconfigPaths(),
-    cedarAutoImportsPlugin(),
-    (() => {
-      const p = gqlTagPlugin();
-      p.enforce = "post";
-      return p;
-    })(),
     // Suppress noisy warnings from third-party dependencies across all
     // environments by injecting onwarn into every environment's rollupOptions.
     {
@@ -235,9 +211,7 @@ async function buildCedarApp({
       name: "cedar-api-src-redirect",
       enforce: "pre",
       resolveId(id, importer) {
-        const normalizedImporter = importer && normalizePath(importer);
-        const normalizedApiSrc = normalizePath(cedarPaths.api.src);
-        if (!normalizedImporter?.startsWith(`${normalizedApiSrc}/`)) {
+        if (!importer?.startsWith(cedarPaths.api.src)) {
           return null;
         }
         if (id.startsWith("src/")) {
@@ -250,18 +224,11 @@ async function buildCedarApp({
     });
   }
   if (workspace.includes("api")) {
-    plugins.push(cedarGraphqlOptionsExtractPlugin());
-    plugins.push(cedarGqlormInjectPlugin());
-    plugins.push(cedarImportDirPlugin());
-    plugins.push(cedarDirectoryNamedImportPlugin());
-    plugins.push(cedarOtelWrappingPlugin());
-    plugins.push(cedarjsJobPathInjectorPlugin());
     plugins.push(
-      handlerAlsWrappingPlugin({ projectIsEsm: projectSideIsEsm("api") })
+      cedarContextWrappingPlugin({ projectIsEsm: projectSideIsEsm("api") })
     );
   }
-  plugins.push(cedarMockCellDataPlugin());
-  if (workspace.includes("api")) {
+  if (babelPlugins) {
     plugins.push({
       name: "cedar-vite-api-babel-transform",
       enforce: "pre",
@@ -275,47 +242,19 @@ async function buildCedarApp({
         if (!normalizePath(id).startsWith(normalizePath(cedarPaths.api.base))) {
           return null;
         }
-        const babelPlugins = getApiSideBabelConfigPath() ? getApiSideBabelPluginsForVite() : null;
-        const fromDirRelativeToApiSrc = path.relative(
-          cedarPaths.api.src,
-          path.dirname(id)
-        );
-        const applyImportRewrites = (source) => {
-          let rewritten = applySrcAlias(source, fromDirRelativeToApiSrc);
-          if (projectSideIsEsm("api")) {
-            rewritten = applyEsmExtensions(rewritten, id);
-          }
-          return rewritten;
-        };
-        const rewrittenCode = applyImportRewrites(code);
-        if (!babelPlugins) {
-          if (rewrittenCode === code) {
-            return null;
-          }
-          return {
-            code: rewrittenCode,
-            map: generateDiffSourceMap(code, rewrittenCode)
-          };
-        }
-        const inputSourceMap = rewrittenCode === code ? null : generateDiffSourceMap(code, rewrittenCode);
-        if (inputSourceMap) {
-          inputSourceMap.sources = [id];
-        }
         const transformedCode = await transformWithBabel(
-          rewrittenCode,
+          code,
           id,
           babelPlugins,
-          true,
-          true,
-          inputSourceMap ?? void 0
+          true
         );
-        if (!transformedCode?.code) {
-          return null;
+        if (transformedCode?.code) {
+          return {
+            code: transformedCode.code,
+            map: transformedCode.map ?? null
+          };
         }
-        return {
-          code: applyImportRewrites(transformedCode.code),
-          map: transformedCode.map ?? null
-        };
+        return null;
       }
     });
   }

package/dist/buildRouteHooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildRouteHooks.d.ts","sourceRoot":"","sources":["../src/buildRouteHooks.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AA2BpD,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,KAAK,iBA+Ef"}
+{"version":3,"file":"buildRouteHooks.d.ts","sourceRoot":"","sources":["../src/buildRouteHooks.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAGpD,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,KAAK,iBA0Cf"}

package/dist/buildRouteHooks.js

@@ -1,55 +1,26 @@
 import fs from "node:fs";
-import path from "node:path";
 import { build as esbuildBuild } from "esbuild";
-import { gqlPlugin } from "vite-plugin-graphql-tag";
 import {
   getRouteHookBabelPlugins,
   transformWithBabel
 } from "@cedarjs/babel-config";
 import { findRouteHooksSrc } from "@cedarjs/internal/dist/files.js";
 import { getPaths } from "@cedarjs/project-config";
-const GQL_TAG_PLUGIN_NAME = "rwjs-babel-graphql-tag";
-const gqlPluginResult = gqlPlugin();
-if (!gqlPluginResult || Array.isArray(gqlPluginResult) || !("transform" in gqlPluginResult) || !gqlPluginResult.transform) {
-  throw new Error("vite-plugin-graphql-tag did not return the expected shape");
-}
-const transform = gqlPluginResult.transform;
-if (typeof transform !== "object" || !("handler" in transform)) {
-  throw new Error("vite-plugin-graphql-tag did not return the expected shape");
-}
-const gqlTransform = transform.handler;
 async function buildRouteHooks(verbose, rwPaths) {
   const allRouteHooks = findRouteHooksSrc();
   const runRwBabelTransformsPlugin = {
-    name: "cedar-esbuild-babel-transform",
+    name: "rw-esbuild-babel-transform",
     setup(build) {
       build.onLoad({ filter: /\.(js|ts|tsx|jsx)$/ }, async (args) => {
         const fileContents = await fs.promises.readFile(args.path, "utf-8");
-        const babelPlugins = getRouteHookBabelPlugins().filter(
-          (p) => !(Array.isArray(p) && p[2] === GQL_TAG_PLUGIN_NAME)
-        );
         const transformedCode = await transformWithBabel(
           fileContents,
           args.path,
-          babelPlugins
+          [...getRouteHookBabelPlugins()]
         );
         if (transformedCode?.code) {
-          const mockCtx = {
-            warn(msg) {
-              console.warn(`[gql-plugin] ${msg}`);
-            },
-            error(err) {
-              throw new Error(String(err));
-            }
-          };
-          const gqlResult = await gqlTransform.call(
-            mockCtx,
-            transformedCode.code,
-            args.path
-          );
-          const gqlCode = gqlResult && typeof gqlResult === "object" && "code" in gqlResult ? gqlResult.code : void 0;
           return {
-            contents: gqlCode ?? transformedCode.code,
+            contents: transformedCode.code,
             loader: "js"
           };
         }
@@ -70,10 +41,7 @@ async function buildRouteHooks(verbose, rwPaths) {
     plugins: [runRwBabelTransformsPlugin],
     packages: "external",
     logLevel: verbose ? "info" : "error",
-    outdir: rwPaths.web.distRouteHooks,
-    alias: {
-      "api/src": path.join(getPaths().api.base, "src")
-    }
+    outdir: rwPaths.web.distRouteHooks
   });
 }
 export {