@cedarjs/vite 6.0.0-canary.2652 → 6.0.0-canary.2657

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AAkC7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAiHlE;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"}
1
+ {"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AA+D7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CA6IlE;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"}
@@ -1,9 +1,16 @@
1
+ import fs from "node:fs";
1
2
  import { glob } from "node:fs/promises";
2
3
  import path from "node:path";
3
4
  import { pathToFileURL } from "node:url";
4
5
  import ansis from "ansis";
5
6
  import { normalizePath } from "vite";
6
7
  import { gqlPlugin as gqlTagPlugin } from "vite-plugin-graphql-tag";
8
+ import tsPathsMod from "vite-tsconfig-paths";
9
+ const tsconfigPaths = (
10
+ // @ts-expect-error – .default only exists at runtime in CJS double-wrap
11
+ // interop
12
+ tsPathsMod.default?.default || tsPathsMod.default || tsPathsMod
13
+ );
7
14
  import { buildCedarContext, wrapLegacyHandler } from "@cedarjs/api/runtime";
8
15
  import {
9
16
  getApiSideBabelPlugins,
@@ -15,10 +22,23 @@ import { applyGqlormInject } from "@cedarjs/internal/dist/build/api-graphql-tran
15
22
  import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
16
23
  import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
17
24
  import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
25
+ import { cedarDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedar-directory-named-import.js";
18
26
  import { applyGraphqlOptionsExtract } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
19
27
  import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
20
28
  import { applyOtelWrapping } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
21
29
  import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
30
+ function resolveWithExtensions(id) {
31
+ if (fs.existsSync(id) && fs.statSync(id).isFile()) {
32
+ return id;
33
+ }
34
+ for (const ext of [".js", ".ts", ".jsx", ".tsx", ".mjs", ".mts"]) {
35
+ const withExt = id + ext;
36
+ if (fs.existsSync(withExt)) {
37
+ return withExt;
38
+ }
39
+ }
40
+ return id;
41
+ }
22
42
  const LAMBDA_FUNCTIONS = {};
23
43
  let graphqlYoga = null;
24
44
  let loadApiFunctionsInFlight = null;
@@ -147,7 +167,28 @@ async function createApiViteServer() {
147
167
  alias: workspacePkgSourceMap
148
168
  },
149
169
  plugins: [
170
+ // tsconfigPaths resolves user-defined tsconfig.json `paths` aliases; it
171
+ // replaces the Babel module-resolver's tsconfig-paths handling for dev.
172
+ tsconfigPaths(),
173
+ {
174
+ name: "cedar-api-src-redirect",
175
+ enforce: "pre",
176
+ resolveId(id, importer) {
177
+ const normalizedImporter = importer && normalizePath(importer);
178
+ const normalizedApiSrc = normalizePath(cedarPaths.api.src);
179
+ if (!normalizedImporter?.startsWith(`${normalizedApiSrc}/`)) {
180
+ return null;
181
+ }
182
+ if (id.startsWith("src/")) {
183
+ return resolveWithExtensions(
184
+ path.join(cedarPaths.api.src, id.slice(4))
185
+ );
186
+ }
187
+ return null;
188
+ }
189
+ },
150
190
  cedarImportDirPlugin(),
191
+ cedarDirectoryNamedImportPlugin(),
151
192
  cedarAutoImportsPlugin(),
152
193
  cedarjsJobPathInjectorPlugin(),
153
194
  (() => {
@@ -1 +1 @@
1
- {"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAsDA,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,iBAkW3B"}
1
+ {"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAuDA,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,iBAmW3B"}
package/dist/buildApp.js CHANGED
@@ -18,6 +18,7 @@ import { findApiFiles } from "@cedarjs/internal/dist/files.js";
18
18
  import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
19
19
  import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
20
20
  import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
21
+ import { cedarDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedar-directory-named-import.js";
21
22
  import { cedarGqlormInjectPlugin } from "./plugins/vite-plugin-cedar-gqlorm-inject.js";
22
23
  import { cedarGraphqlOptionsExtractPlugin } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
23
24
  import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
@@ -250,6 +251,7 @@ async function buildCedarApp({
250
251
  plugins.push(cedarGraphqlOptionsExtractPlugin());
251
252
  plugins.push(cedarGqlormInjectPlugin());
252
253
  plugins.push(cedarImportDirPlugin());
254
+ plugins.push(cedarDirectoryNamedImportPlugin());
253
255
  plugins.push(cedarOtelWrappingPlugin());
254
256
  plugins.push(cedarjsJobPathInjectorPlugin());
255
257
  plugins.push(
@@ -35,12 +35,14 @@ __export(apiDevMiddleware_exports, {
35
35
  startApiDevMiddleware: () => startApiDevMiddleware
36
36
  });
37
37
  module.exports = __toCommonJS(apiDevMiddleware_exports);
38
+ var import_node_fs = __toESM(require("node:fs"), 1);
38
39
  var import_promises = require("node:fs/promises");
39
40
  var import_node_path = __toESM(require("node:path"), 1);
40
41
  var import_node_url = require("node:url");
41
42
  var import_ansis = __toESM(require("ansis"), 1);
42
43
  var import_vite = require("vite");
43
44
  var import_vite_plugin_graphql_tag = require("vite-plugin-graphql-tag");
45
+ var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
44
46
  var import_runtime = require("@cedarjs/api/runtime");
45
47
  var import_babel_config = require("@cedarjs/babel-config");
46
48
  var import_store = require("@cedarjs/context/dist/store");
@@ -49,10 +51,28 @@ var import_api_graphql_transforms = require("@cedarjs/internal/dist/build/api-gr
49
51
  var import_project_config = require("@cedarjs/project-config");
50
52
  var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
51
53
  var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
54
+ var import_vite_plugin_cedar_directory_named_import = require("./plugins/vite-plugin-cedar-directory-named-import.js");
52
55
  var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
53
56
  var import_vite_plugin_cedar_import_dir = require("./plugins/vite-plugin-cedar-import-dir.js");
54
57
  var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
55
58
  var import_vite_plugin_cedarjs_job_path_injector = require("./plugins/vite-plugin-cedarjs-job-path-injector.js");
59
+ const tsconfigPaths = (
60
+ // @ts-expect-error – .default only exists at runtime in CJS double-wrap
61
+ // interop
62
+ import_vite_tsconfig_paths.default.default?.default || import_vite_tsconfig_paths.default.default || import_vite_tsconfig_paths.default
63
+ );
64
+ function resolveWithExtensions(id) {
65
+ if (import_node_fs.default.existsSync(id) && import_node_fs.default.statSync(id).isFile()) {
66
+ return id;
67
+ }
68
+ for (const ext of [".js", ".ts", ".jsx", ".tsx", ".mjs", ".mts"]) {
69
+ const withExt = id + ext;
70
+ if (import_node_fs.default.existsSync(withExt)) {
71
+ return withExt;
72
+ }
73
+ }
74
+ return id;
75
+ }
56
76
  const LAMBDA_FUNCTIONS = {};
57
77
  let graphqlYoga = null;
58
78
  let loadApiFunctionsInFlight = null;
@@ -181,7 +201,28 @@ async function createApiViteServer() {
181
201
  alias: workspacePkgSourceMap
182
202
  },
183
203
  plugins: [
204
+ // tsconfigPaths resolves user-defined tsconfig.json `paths` aliases; it
205
+ // replaces the Babel module-resolver's tsconfig-paths handling for dev.
206
+ tsconfigPaths(),
207
+ {
208
+ name: "cedar-api-src-redirect",
209
+ enforce: "pre",
210
+ resolveId(id, importer) {
211
+ const normalizedImporter = importer && (0, import_vite.normalizePath)(importer);
212
+ const normalizedApiSrc = (0, import_vite.normalizePath)(cedarPaths.api.src);
213
+ if (!normalizedImporter?.startsWith(`${normalizedApiSrc}/`)) {
214
+ return null;
215
+ }
216
+ if (id.startsWith("src/")) {
217
+ return resolveWithExtensions(
218
+ import_node_path.default.join(cedarPaths.api.src, id.slice(4))
219
+ );
220
+ }
221
+ return null;
222
+ }
223
+ },
184
224
  (0, import_vite_plugin_cedar_import_dir.cedarImportDirPlugin)(),
225
+ (0, import_vite_plugin_cedar_directory_named_import.cedarDirectoryNamedImportPlugin)(),
185
226
  (0, import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin)(),
186
227
  (0, import_vite_plugin_cedarjs_job_path_injector.cedarjsJobPathInjectorPlugin)(),
187
228
  (() => {
@@ -43,6 +43,7 @@ var import_files = require("@cedarjs/internal/dist/files.js");
43
43
  var import_project_config = require("@cedarjs/project-config");
44
44
  var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
45
45
  var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
46
+ var import_vite_plugin_cedar_directory_named_import = require("./plugins/vite-plugin-cedar-directory-named-import.js");
46
47
  var import_vite_plugin_cedar_gqlorm_inject = require("./plugins/vite-plugin-cedar-gqlorm-inject.js");
47
48
  var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
48
49
  var import_vite_plugin_cedar_import_dir = require("./plugins/vite-plugin-cedar-import-dir.js");
@@ -280,6 +281,7 @@ async function buildCedarApp({
280
281
  plugins.push((0, import_vite_plugin_cedar_graphql_options_extract.cedarGraphqlOptionsExtractPlugin)());
281
282
  plugins.push((0, import_vite_plugin_cedar_gqlorm_inject.cedarGqlormInjectPlugin)());
282
283
  plugins.push((0, import_vite_plugin_cedar_import_dir.cedarImportDirPlugin)());
284
+ plugins.push((0, import_vite_plugin_cedar_directory_named_import.cedarDirectoryNamedImportPlugin)());
283
285
  plugins.push((0, import_vite_plugin_cedar_otel_wrapping.cedarOtelWrappingPlugin)());
284
286
  plugins.push((0, import_vite_plugin_cedarjs_job_path_injector.cedarjsJobPathInjectorPlugin)());
285
287
  plugins.push(
@@ -3,5 +3,5 @@
3
3
  * buildFeServer -> buildRscFeServer -> rscBuildClient
4
4
  * Generate the client bundle
5
5
  */
6
- export declare function rscBuildClient(clientEntryFiles: Record<string, string>): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputAsset | import("rollup").OutputChunk)[]]>;
6
+ export declare function rscBuildClient(clientEntryFiles: Record<string, string>): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputChunk | import("rollup").OutputAsset)[]]>;
7
7
  //# sourceMappingURL=rscBuildClient.d.ts.map
@@ -3,5 +3,5 @@
3
3
  * buildFeServer -> buildRscFeServer -> rscBuildForServer
4
4
  * Generate the output to be used by the rsc worker (not the actual server!)
5
5
  */
6
- export declare function rscBuildForServer(clientEntryFiles: Record<string, string>, serverEntryFiles: Record<string, string>, customModules: Record<string, string>): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputAsset | import("rollup").OutputChunk)[]]>;
6
+ export declare function rscBuildForServer(clientEntryFiles: Record<string, string>, serverEntryFiles: Record<string, string>, customModules: Record<string, string>): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputChunk | import("rollup").OutputAsset)[]]>;
7
7
  //# sourceMappingURL=rscBuildForServer.d.ts.map
@@ -5,5 +5,5 @@
5
5
  export declare function rscBuildForSsr({ clientEntryFiles, verbose, }: {
6
6
  clientEntryFiles: Record<string, string>;
7
7
  verbose?: boolean;
8
- }): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputAsset | import("rollup").OutputChunk)[]]>;
8
+ }): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputChunk | import("rollup").OutputAsset)[]]>;
9
9
  //# sourceMappingURL=rscBuildForSsr.d.ts.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cedarjs/vite",
3
- "version": "6.0.0-canary.2652",
3
+ "version": "6.0.0-canary.2657",
4
4
  "description": "Vite configuration package for CedarJS",
5
5
  "repository": {
6
6
  "type": "git",
@@ -63,15 +63,15 @@
63
63
  "@babel/parser": "7.29.7",
64
64
  "@babel/traverse": "7.29.7",
65
65
  "@babel/types": "7.29.7",
66
- "@cedarjs/api": "6.0.0-canary.2652",
67
- "@cedarjs/babel-config": "6.0.0-canary.2652",
68
- "@cedarjs/context": "6.0.0-canary.2652",
69
- "@cedarjs/cookie-jar": "6.0.0-canary.2652",
70
- "@cedarjs/graphql-server": "6.0.0-canary.2652",
71
- "@cedarjs/internal": "6.0.0-canary.2652",
72
- "@cedarjs/project-config": "6.0.0-canary.2652",
73
- "@cedarjs/server-store": "6.0.0-canary.2652",
74
- "@cedarjs/testing": "6.0.0-canary.2652",
66
+ "@cedarjs/api": "6.0.0-canary.2657",
67
+ "@cedarjs/babel-config": "6.0.0-canary.2657",
68
+ "@cedarjs/context": "6.0.0-canary.2657",
69
+ "@cedarjs/cookie-jar": "6.0.0-canary.2657",
70
+ "@cedarjs/graphql-server": "6.0.0-canary.2657",
71
+ "@cedarjs/internal": "6.0.0-canary.2657",
72
+ "@cedarjs/project-config": "6.0.0-canary.2657",
73
+ "@cedarjs/server-store": "6.0.0-canary.2657",
74
+ "@cedarjs/testing": "6.0.0-canary.2657",
75
75
  "@fastify/url-data": "6.0.3",
76
76
  "@swc/core": "1.15.41",
77
77
  "@universal-deploy/store": "^0.2.1",
@@ -108,9 +108,9 @@
108
108
  },
109
109
  "devDependencies": {
110
110
  "@arethetypeswrong/cli": "0.18.5",
111
- "@cedarjs/auth": "6.0.0-canary.2652",
112
- "@cedarjs/router": "6.0.0-canary.2652",
113
- "@cedarjs/web": "6.0.0-canary.2652",
111
+ "@cedarjs/auth": "6.0.0-canary.2657",
112
+ "@cedarjs/router": "6.0.0-canary.2657",
113
+ "@cedarjs/web": "6.0.0-canary.2657",
114
114
  "@hyrious/esbuild-plugin-commonjs": "0.2.6",
115
115
  "@jridgewell/trace-mapping": "0.3.31",
116
116
  "@types/aws-lambda": "8.10.162",