@cedarjs/vite 6.0.0-canary.2647 → 6.0.0-canary.2654

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.
Files changed (7) hide show
  1. package/dist/apiDevMiddleware.d.ts.map +1 -1
  2. package/dist/apiDevMiddleware.js +2 -0
  3. package/dist/buildApp.d.ts.map +1 -1
  4. package/dist/buildApp.js +6 -2
  5. package/dist/cjs/apiDevMiddleware.js +2 -0
  6. package/dist/cjs/buildApp.js +6 -2
  7. package/package.json +13 -13
package/dist/apiDevMiddleware.d.ts.map CHANGED
@@ -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":"AAOA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AAmC7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAkHlE;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 CHANGED
@@ -15,6 +15,7 @@ import { applyGqlormInject } from "@cedarjs/internal/dist/build/api-graphql-tran
15
15
  import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
16
16
  import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
17
17
  import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
18
+ import { cedarDirectoryNamedImportPlugin } from "./plugins/vite-plugin-cedar-directory-named-import.js";
18
19
  import { applyGraphqlOptionsExtract } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
19
20
  import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
20
21
  import { applyOtelWrapping } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
@@ -148,6 +149,7 @@ async function createApiViteServer() {
148
149
  },
149
150
  plugins: [
150
151
  cedarImportDirPlugin(),
152
+ cedarDirectoryNamedImportPlugin(),
151
153
  cedarAutoImportsPlugin(),
152
154
  cedarjsJobPathInjectorPlugin(),
153
155
  (() => {
package/dist/buildApp.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAiDA,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,iBA2V3B"}
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";
@@ -26,7 +27,7 @@ import { cedarOtelWrappingPlugin } from "./plugins/vite-plugin-cedar-otel-wrappi
26
27
  import { cedarjsJobPathInjectorPlugin } from "./plugins/vite-plugin-cedarjs-job-path-injector.js";
27
28
  import { handlerAlsWrappingPlugin } from "./plugins/vite-plugin-handler-als-wrapping.js";
28
29
  function resolveWithExtensions(id) {
29
- if (fs.existsSync(id)) {
30
+ if (fs.existsSync(id) && fs.statSync(id).isFile()) {
30
31
  return id;
31
32
  }
32
33
  for (const ext of [".js", ".ts", ".jsx", ".tsx", ".mjs", ".mts"]) {
@@ -232,7 +233,9 @@ async function buildCedarApp({
232
233
  name: "cedar-api-src-redirect",
233
234
  enforce: "pre",
234
235
  resolveId(id, importer) {
235
- if (!importer?.startsWith(cedarPaths.api.src)) {
236
+ const normalizedImporter = importer && normalizePath(importer);
237
+ const normalizedApiSrc = normalizePath(cedarPaths.api.src);
238
+ if (!normalizedImporter?.startsWith(`${normalizedApiSrc}/`)) {
236
239
  return null;
237
240
  }
238
241
  if (id.startsWith("src/")) {
@@ -248,6 +251,7 @@ async function buildCedarApp({
248
251
  plugins.push(cedarGraphqlOptionsExtractPlugin());
249
252
  plugins.push(cedarGqlormInjectPlugin());
250
253
  plugins.push(cedarImportDirPlugin());
254
+ plugins.push(cedarDirectoryNamedImportPlugin());
251
255
  plugins.push(cedarOtelWrappingPlugin());
252
256
  plugins.push(cedarjsJobPathInjectorPlugin());
253
257
  plugins.push(
package/dist/cjs/apiDevMiddleware.js CHANGED
@@ -49,6 +49,7 @@ var import_api_graphql_transforms = require("@cedarjs/internal/dist/build/api-gr
49
49
  var import_project_config = require("@cedarjs/project-config");
50
50
  var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
51
51
  var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
52
+ var import_vite_plugin_cedar_directory_named_import = require("./plugins/vite-plugin-cedar-directory-named-import.js");
52
53
  var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
53
54
  var import_vite_plugin_cedar_import_dir = require("./plugins/vite-plugin-cedar-import-dir.js");
54
55
  var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
@@ -182,6 +183,7 @@ async function createApiViteServer() {
182
183
  },
183
184
  plugins: [
184
185
  (0, import_vite_plugin_cedar_import_dir.cedarImportDirPlugin)(),
186
+ (0, import_vite_plugin_cedar_directory_named_import.cedarDirectoryNamedImportPlugin)(),
185
187
  (0, import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin)(),
186
188
  (0, import_vite_plugin_cedarjs_job_path_injector.cedarjsJobPathInjectorPlugin)(),
187
189
  (() => {
package/dist/cjs/buildApp.js CHANGED
@@ -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");
@@ -56,7 +57,7 @@ const tsconfigPaths = (
56
57
  import_vite_tsconfig_paths.default.default?.default || import_vite_tsconfig_paths.default.default || import_vite_tsconfig_paths.default
57
58
  );
58
59
  function resolveWithExtensions(id) {
59
- if (import_node_fs.default.existsSync(id)) {
60
+ if (import_node_fs.default.existsSync(id) && import_node_fs.default.statSync(id).isFile()) {
60
61
  return id;
61
62
  }
62
63
  for (const ext of [".js", ".ts", ".jsx", ".tsx", ".mjs", ".mts"]) {
@@ -262,7 +263,9 @@ async function buildCedarApp({
262
263
  name: "cedar-api-src-redirect",
263
264
  enforce: "pre",
264
265
  resolveId(id, importer) {
265
- if (!importer?.startsWith(cedarPaths.api.src)) {
266
+ const normalizedImporter = importer && (0, import_vite2.normalizePath)(importer);
267
+ const normalizedApiSrc = (0, import_vite2.normalizePath)(cedarPaths.api.src);
268
+ if (!normalizedImporter?.startsWith(`${normalizedApiSrc}/`)) {
266
269
  return null;
267
270
  }
268
271
  if (id.startsWith("src/")) {
@@ -278,6 +281,7 @@ async function buildCedarApp({
278
281
  plugins.push((0, import_vite_plugin_cedar_graphql_options_extract.cedarGraphqlOptionsExtractPlugin)());
279
282
  plugins.push((0, import_vite_plugin_cedar_gqlorm_inject.cedarGqlormInjectPlugin)());
280
283
  plugins.push((0, import_vite_plugin_cedar_import_dir.cedarImportDirPlugin)());
284
+ plugins.push((0, import_vite_plugin_cedar_directory_named_import.cedarDirectoryNamedImportPlugin)());
281
285
  plugins.push((0, import_vite_plugin_cedar_otel_wrapping.cedarOtelWrappingPlugin)());
282
286
  plugins.push((0, import_vite_plugin_cedarjs_job_path_injector.cedarjsJobPathInjectorPlugin)());
283
287
  plugins.push(
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cedarjs/vite",
3
- "version": "6.0.0-canary.2647",
3
+ "version": "6.0.0-canary.2654",
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.2647",
67
- "@cedarjs/babel-config": "6.0.0-canary.2647",
68
- "@cedarjs/context": "6.0.0-canary.2647",
69
- "@cedarjs/cookie-jar": "6.0.0-canary.2647",
70
- "@cedarjs/graphql-server": "6.0.0-canary.2647",
71
- "@cedarjs/internal": "6.0.0-canary.2647",
72
- "@cedarjs/project-config": "6.0.0-canary.2647",
73
- "@cedarjs/server-store": "6.0.0-canary.2647",
74
- "@cedarjs/testing": "6.0.0-canary.2647",
66
+ "@cedarjs/api": "6.0.0-canary.2654",
67
+ "@cedarjs/babel-config": "6.0.0-canary.2654",
68
+ "@cedarjs/context": "6.0.0-canary.2654",
69
+ "@cedarjs/cookie-jar": "6.0.0-canary.2654",
70
+ "@cedarjs/graphql-server": "6.0.0-canary.2654",
71
+ "@cedarjs/internal": "6.0.0-canary.2654",
72
+ "@cedarjs/project-config": "6.0.0-canary.2654",
73
+ "@cedarjs/server-store": "6.0.0-canary.2654",
74
+ "@cedarjs/testing": "6.0.0-canary.2654",
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.2647",
112
- "@cedarjs/router": "6.0.0-canary.2647",
113
- "@cedarjs/web": "6.0.0-canary.2647",
111
+ "@cedarjs/auth": "6.0.0-canary.2654",
112
+ "@cedarjs/router": "6.0.0-canary.2654",
113
+ "@cedarjs/web": "6.0.0-canary.2654",
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",