@ryanatkn/gro 0.151.2 → 0.153.0

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 (93) hide show
  1. package/dist/changeset.task.js +2 -2
  2. package/dist/constants.d.ts +1 -1
  3. package/dist/constants.d.ts.map +1 -1
  4. package/dist/constants.js +1 -1
  5. package/dist/esbuild_helpers.d.ts +2 -2
  6. package/dist/esbuild_helpers.d.ts.map +1 -1
  7. package/dist/esbuild_plugin_external_worker.d.ts +3 -3
  8. package/dist/esbuild_plugin_external_worker.d.ts.map +1 -1
  9. package/dist/esbuild_plugin_svelte.d.ts +2 -2
  10. package/dist/esbuild_plugin_svelte.d.ts.map +1 -1
  11. package/dist/esbuild_plugin_svelte.js +2 -2
  12. package/dist/esbuild_plugin_sveltekit_shim_app.d.ts +3 -3
  13. package/dist/esbuild_plugin_sveltekit_shim_app.d.ts.map +1 -1
  14. package/dist/filer.d.ts +1 -0
  15. package/dist/filer.d.ts.map +1 -1
  16. package/dist/filer.js +10 -9
  17. package/dist/format_directory.js +2 -2
  18. package/dist/gen.d.ts +2 -2
  19. package/dist/gen.d.ts.map +1 -1
  20. package/dist/gro.config.default.d.ts +4 -4
  21. package/dist/gro.config.default.d.ts.map +1 -1
  22. package/dist/gro.config.default.js +22 -12
  23. package/dist/gro_config.d.ts +4 -1
  24. package/dist/gro_config.d.ts.map +1 -1
  25. package/dist/gro_plugin_server.d.ts +5 -5
  26. package/dist/gro_plugin_server.d.ts.map +1 -1
  27. package/dist/gro_plugin_server.js +9 -6
  28. package/dist/gro_plugin_sveltekit_app.js +2 -2
  29. package/dist/invoke_task.js +1 -1
  30. package/dist/loader.js +2 -2
  31. package/dist/package.d.ts +14 -17
  32. package/dist/package.d.ts.map +1 -1
  33. package/dist/package.js +29 -33
  34. package/dist/package_json.d.ts +0 -1
  35. package/dist/package_json.d.ts.map +1 -1
  36. package/dist/package_json.js +0 -1
  37. package/dist/paths.d.ts.map +1 -1
  38. package/dist/paths.js +3 -3
  39. package/dist/run_gen.js +2 -2
  40. package/dist/run_task.js +2 -2
  41. package/dist/search_fs.d.ts +1 -0
  42. package/dist/search_fs.d.ts.map +1 -1
  43. package/dist/search_fs.js +8 -0
  44. package/dist/{sveltekit_config.d.ts → svelte_config.d.ts} +16 -10
  45. package/dist/svelte_config.d.ts.map +1 -0
  46. package/dist/{sveltekit_config.js → svelte_config.js} +16 -12
  47. package/dist/sveltekit_helpers.d.ts +3 -3
  48. package/dist/sveltekit_helpers.d.ts.map +1 -1
  49. package/dist/sveltekit_helpers.js +8 -8
  50. package/dist/sveltekit_shim_app.d.ts +2 -2
  51. package/dist/sveltekit_shim_app.d.ts.map +1 -1
  52. package/dist/sveltekit_shim_app.js +1 -1
  53. package/dist/sveltekit_shim_app_state.d.ts +5 -0
  54. package/dist/sveltekit_shim_app_state.d.ts.map +1 -0
  55. package/dist/sveltekit_shim_app_state.js +26 -0
  56. package/dist/task.d.ts +2 -2
  57. package/dist/task.d.ts.map +1 -1
  58. package/dist/upgrade.task.d.ts +12 -0
  59. package/dist/upgrade.task.d.ts.map +1 -1
  60. package/dist/upgrade.task.js +29 -1
  61. package/package.json +17 -17
  62. package/src/lib/changeset.task.ts +2 -2
  63. package/src/lib/constants.ts +1 -1
  64. package/src/lib/esbuild_helpers.ts +2 -2
  65. package/src/lib/esbuild_plugin_external_worker.ts +3 -3
  66. package/src/lib/esbuild_plugin_svelte.ts +5 -5
  67. package/src/lib/esbuild_plugin_sveltekit_shim_app.ts +3 -3
  68. package/src/lib/filer.ts +13 -9
  69. package/src/lib/format_directory.ts +2 -2
  70. package/src/lib/gen.ts +2 -2
  71. package/src/lib/gro.config.default.ts +25 -12
  72. package/src/lib/gro_config.ts +4 -0
  73. package/src/lib/gro_plugin_server.ts +14 -11
  74. package/src/lib/gro_plugin_sveltekit_app.ts +2 -2
  75. package/src/lib/invoke_task.ts +1 -1
  76. package/src/lib/loader.ts +2 -2
  77. package/src/lib/package.ts +29 -33
  78. package/src/lib/package_json.ts +0 -5
  79. package/src/lib/paths.ts +3 -3
  80. package/src/lib/run_gen.ts +2 -2
  81. package/src/lib/run_task.ts +2 -2
  82. package/src/lib/search_fs.ts +9 -0
  83. package/src/lib/{sveltekit_config.ts → svelte_config.ts} +31 -21
  84. package/src/lib/sveltekit_helpers.ts +10 -8
  85. package/src/lib/sveltekit_shim_app.ts +4 -4
  86. package/src/lib/sveltekit_shim_app_state.ts +35 -0
  87. package/src/lib/task.ts +3 -3
  88. package/src/lib/upgrade.task.ts +43 -1
  89. package/dist/sveltekit_config.d.ts.map +0 -1
  90. package/dist/sveltekit_shim_app_stores.d.ts +0 -6
  91. package/dist/sveltekit_shim_app_stores.d.ts.map +0 -1
  92. package/dist/sveltekit_shim_app_stores.js +0 -17
  93. package/src/lib/sveltekit_shim_app_stores.ts +0 -28
@@ -47,7 +47,7 @@ export const task = {
47
47
  summary: 'call changeset with gro patterns',
48
48
  Args,
49
49
  run: async (ctx) => {
50
- const { invoke_task, args: { _: [message], minor, major, dir, access: access_arg, changelog, dep, origin, changeset_cli, }, log, sveltekit_config, config, } = ctx;
50
+ const { invoke_task, args: { _: [message], minor, major, dir, access: access_arg, changelog, dep, origin, changeset_cli, }, log, svelte_config, config, } = ctx;
51
51
  if (!message && (minor || major))
52
52
  throw new Task_Error('cannot bump version without a message');
53
53
  if (minor && major)
@@ -58,7 +58,7 @@ export const task = {
58
58
  throw new Task_Error('changeset command not found: install @changesets/cli locally or globally');
59
59
  }
60
60
  const package_json = load_package_json();
61
- const has_sveltekit_library_result = has_sveltekit_library(package_json, sveltekit_config);
61
+ const has_sveltekit_library_result = has_sveltekit_library(package_json, svelte_config);
62
62
  if (!has_sveltekit_library_result.ok) {
63
63
  throw new Task_Error('Failed to find SvelteKit library: ' + has_sveltekit_library_result.message);
64
64
  }
@@ -8,7 +8,7 @@ export declare const GRO_DIR: string;
8
8
  export declare const GRO_DEV_DIR: string;
9
9
  export declare const GRO_CONFIG_PATH = "gro.config.ts";
10
10
  export declare const README_FILENAME = "README.md";
11
- export declare const SVELTEKIT_CONFIG_FILENAME = "svelte.config.js";
11
+ export declare const SVELTE_CONFIG_FILENAME = "svelte.config.js";
12
12
  export declare const VITE_CONFIG_FILENAME = "vite.config.ts";
13
13
  export declare const NODE_MODULES_DIRNAME = "node_modules";
14
14
  export declare const LOCKFILE_FILENAME = "package-lock.json";
@@ -1 +1 @@
1
- {"version":3,"file":"constants.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/constants.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,WAAW,SAAS,CAAC;AAClC,eAAO,MAAM,eAAe,UAAU,CAAC;AACvC,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,eAAe,QAAuB,CAAC;AACpD,eAAO,MAAM,UAAU,QAAuB,CAAC;AAC/C,eAAO,MAAM,OAAO,QAAoB,CAAC;AACzC,eAAO,MAAM,WAAW,QAAwB,CAAC;AACjD,eAAO,MAAM,eAAe,kBAAkB,CAAC;AAC/C,eAAO,MAAM,eAAe,cAAc,CAAC;AAC3C,eAAO,MAAM,yBAAyB,qBAAqB,CAAC;AAC5D,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AACrD,eAAO,MAAM,oBAAoB,iBAAiB,CAAC;AACnD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AACnD,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAC/C,eAAO,MAAM,sBAAsB,SAAS,CAAC;AAC7C,eAAO,MAAM,yBAAyB,QAAkC,CAAC;AACzE,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,WAAW,SAAS,CAAC;AAClC,eAAO,MAAM,iBAAiB,kBAAkB,CAAC;AAEjD,eAAO,MAAM,UAAU,QAAwB,CAAC;AAChD,eAAO,MAAM,UAAU,QAAwB,CAAC;AAChD,eAAO,MAAM,YAAY,QAAY,CAAC;AACtC,qDAAqD;AACrD,eAAO,MAAM,qBAAqB,QAAiD,CAAC;AACpF,eAAO,MAAM,kBAAkB,QAAO,CAAC;AAEvC,eAAO,MAAM,cAAc,SAAS,CAAC;AACrC,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,oBAAoB,aAAa,CAAC"}
1
+ {"version":3,"file":"constants.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/constants.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,WAAW,SAAS,CAAC;AAClC,eAAO,MAAM,eAAe,UAAU,CAAC;AACvC,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,eAAe,QAAuB,CAAC;AACpD,eAAO,MAAM,UAAU,QAAuB,CAAC;AAC/C,eAAO,MAAM,OAAO,QAAoB,CAAC;AACzC,eAAO,MAAM,WAAW,QAAwB,CAAC;AACjD,eAAO,MAAM,eAAe,kBAAkB,CAAC;AAC/C,eAAO,MAAM,eAAe,cAAc,CAAC;AAC3C,eAAO,MAAM,sBAAsB,qBAAqB,CAAC;AACzD,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AACrD,eAAO,MAAM,oBAAoB,iBAAiB,CAAC;AACnD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AACnD,eAAO,MAAM,uBAAuB,UAAU,CAAC;AAC/C,eAAO,MAAM,sBAAsB,SAAS,CAAC;AAC7C,eAAO,MAAM,yBAAyB,QAAkC,CAAC;AACzE,eAAO,MAAM,cAAc,YAAY,CAAC;AACxC,eAAO,MAAM,WAAW,SAAS,CAAC;AAClC,eAAO,MAAM,iBAAiB,kBAAkB,CAAC;AAEjD,eAAO,MAAM,UAAU,QAAwB,CAAC;AAChD,eAAO,MAAM,UAAU,QAAwB,CAAC;AAChD,eAAO,MAAM,YAAY,QAAY,CAAC;AACtC,qDAAqD;AACrD,eAAO,MAAM,qBAAqB,QAAiD,CAAC;AACpF,eAAO,MAAM,kBAAkB,QAAO,CAAC;AAEvC,eAAO,MAAM,cAAc,SAAS,CAAC;AACrC,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,oBAAoB,aAAa,CAAC"}
package/dist/constants.js CHANGED
@@ -15,7 +15,7 @@ export const GRO_DIR = GRO_DIRNAME + '/';
15
15
  export const GRO_DEV_DIR = GRO_DEV_DIRNAME + '/';
16
16
  export const GRO_CONFIG_PATH = 'gro.config.ts';
17
17
  export const README_FILENAME = 'README.md';
18
- export const SVELTEKIT_CONFIG_FILENAME = 'svelte.config.js';
18
+ export const SVELTE_CONFIG_FILENAME = 'svelte.config.js';
19
19
  export const VITE_CONFIG_FILENAME = 'vite.config.ts';
20
20
  export const NODE_MODULES_DIRNAME = 'node_modules';
21
21
  export const LOCKFILE_FILENAME = 'package-lock.json';
@@ -1,6 +1,6 @@
1
1
  import type { Logger } from '@ryanatkn/belt/log.js';
2
2
  import type * as esbuild from 'esbuild';
3
- import type { Parsed_Sveltekit_Config } from './sveltekit_config.js';
3
+ import type { Parsed_Svelte_Config } from './svelte_config.js';
4
4
  export declare const print_build_result: (log: Logger, build_result: esbuild.BuildResult) => void;
5
5
  /**
6
6
  * Creates an esbuild `define` shim for Vite's `import.meta\.env`.
@@ -11,6 +11,6 @@ export declare const print_build_result: (log: Logger, build_result: esbuild.Bui
11
11
  * @param mode
12
12
  * @returns
13
13
  */
14
- export declare const to_define_import_meta_env: (dev: boolean, base_url: Parsed_Sveltekit_Config["base_url"], ssr?: boolean, mode?: string) => Record<string, string>;
14
+ export declare const to_define_import_meta_env: (dev: boolean, base_url: Parsed_Svelte_Config["base_url"], ssr?: boolean, mode?: string) => Record<string, string>;
15
15
  export declare const default_ts_transform_options: esbuild.TransformOptions;
16
16
  //# sourceMappingURL=esbuild_helpers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"esbuild_helpers.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/esbuild_helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,KAAK,OAAO,MAAM,SAAS,CAAC;AAExC,OAAO,KAAK,EAAC,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAEnE,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,EAAE,cAAc,OAAO,CAAC,WAAW,KAAG,IAOnF,CAAC;AAMF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,GACrC,KAAK,OAAO,EACZ,UAAU,uBAAuB,CAAC,UAAU,CAAC,EAC7C,aAAU,EACV,aAAyC,KACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAQtB,CAAC;AAEH,eAAO,MAAM,4BAA4B,EAAE,OAAO,CAAC,gBAMlD,CAAC"}
1
+ {"version":3,"file":"esbuild_helpers.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/esbuild_helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,KAAK,OAAO,MAAM,SAAS,CAAC;AAExC,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AAE7D,eAAO,MAAM,kBAAkB,GAAI,KAAK,MAAM,EAAE,cAAc,OAAO,CAAC,WAAW,KAAG,IAOnF,CAAC;AAMF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,GACrC,KAAK,OAAO,EACZ,UAAU,oBAAoB,CAAC,UAAU,CAAC,EAC1C,aAAU,EACV,aAAyC,KACvC,MAAM,CAAC,MAAM,EAAE,MAAM,CAQtB,CAAC;AAEH,eAAO,MAAM,4BAA4B,EAAE,OAAO,CAAC,gBAMlD,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import * as esbuild from 'esbuild';
2
2
  import type { Logger } from '@ryanatkn/belt/log.js';
3
3
  import type { CompileOptions, ModuleCompileOptions, PreprocessorGroup } from 'svelte/compiler';
4
- import type { Parsed_Sveltekit_Config } from './sveltekit_config.js';
4
+ import type { Parsed_Svelte_Config } from './svelte_config.js';
5
5
  export interface Esbuild_Plugin_External_Worker_Options {
6
6
  dev: boolean;
7
7
  build_options: esbuild.BuildOptions;
@@ -10,8 +10,8 @@ export interface Esbuild_Plugin_External_Worker_Options {
10
10
  svelte_compile_module_options?: ModuleCompileOptions;
11
11
  svelte_preprocessors?: PreprocessorGroup | Array<PreprocessorGroup>;
12
12
  alias?: Record<string, string>;
13
- base_url?: Parsed_Sveltekit_Config['base_url'];
14
- assets_url?: Parsed_Sveltekit_Config['assets_url'];
13
+ base_url?: Parsed_Svelte_Config['base_url'];
14
+ assets_url?: Parsed_Svelte_Config['assets_url'];
15
15
  public_prefix?: string;
16
16
  private_prefix?: string;
17
17
  env_dir?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"esbuild_plugin_external_worker.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/esbuild_plugin_external_worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAC,cAAc,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAS7F,OAAO,KAAK,EAAC,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAGnE,MAAM,WAAW,sCAAsC;IACtD,GAAG,EAAE,OAAO,CAAC;IACb,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,sBAAsB,CAAC,EAAE,cAAc,CAAC;IACxC,6BAA6B,CAAC,EAAE,oBAAoB,CAAC;IACrD,oBAAoB,CAAC,EAAE,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAC/C,UAAU,CAAC,EAAE,uBAAuB,CAAC,YAAY,CAAC,CAAC;IACnD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,8BAA8B,GAAI,6MAgB5C,sCAAsC,KAAG,OAAO,CAAC,MA4ClD,CAAC"}
1
+ {"version":3,"file":"esbuild_plugin_external_worker.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/esbuild_plugin_external_worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAC,cAAc,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAS7F,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AAG7D,MAAM,WAAW,sCAAsC;IACtD,GAAG,EAAE,OAAO,CAAC;IACb,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,sBAAsB,CAAC,EAAE,cAAc,CAAC;IACxC,6BAA6B,CAAC,EAAE,oBAAoB,CAAC;IACrD,oBAAoB,CAAC,EAAE,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAC5C,UAAU,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,8BAA8B,GAAI,6MAgB5C,sCAAsC,KAAG,OAAO,CAAC,MA4ClD,CAAC"}
@@ -1,9 +1,9 @@
1
1
  import * as esbuild from 'esbuild';
2
2
  import { type CompileOptions, type ModuleCompileOptions, type PreprocessorGroup } from 'svelte/compiler';
3
- import { type Parsed_Sveltekit_Config } from './sveltekit_config.js';
3
+ import { type Parsed_Svelte_Config } from './svelte_config.js';
4
4
  export interface Esbuild_Plugin_Svelte_Options {
5
5
  dev: boolean;
6
- base_url: Parsed_Sveltekit_Config['base_url'];
6
+ base_url: Parsed_Svelte_Config['base_url'];
7
7
  dir?: string;
8
8
  svelte_compile_options?: CompileOptions;
9
9
  svelte_compile_module_options?: ModuleCompileOptions;
@@ -1 +1 @@
1
- {"version":3,"file":"esbuild_plugin_svelte.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/esbuild_plugin_svelte.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,EAIN,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EAGN,KAAK,uBAAuB,EAC5B,MAAM,uBAAuB,CAAC;AAG/B,MAAM,WAAW,6BAA6B;IAC7C,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAC9C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,sBAAsB,CAAC,EAAE,cAAc,CAAC;IACxC,6BAA6B,CAAC,EAAE,oBAAoB,CAAC;IACrD,oBAAoB,CAAC,EAAE,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpE,oBAAoB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;IAChD,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;CACtC;AAED,eAAO,MAAM,qBAAqB,GAAI,SAAS,6BAA6B,KAAG,OAAO,CAAC,MAmEtF,CAAC"}
1
+ {"version":3,"file":"esbuild_plugin_svelte.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/esbuild_plugin_svelte.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,EAIN,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EAGN,KAAK,oBAAoB,EACzB,MAAM,oBAAoB,CAAC;AAG5B,MAAM,WAAW,6BAA6B;IAC7C,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAC3C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,sBAAsB,CAAC,EAAE,cAAc,CAAC;IACxC,6BAA6B,CAAC,EAAE,oBAAoB,CAAC;IACrD,oBAAoB,CAAC,EAAE,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpE,oBAAoB,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC;IAChD,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;CACtC;AAED,eAAO,MAAM,qBAAqB,GAAI,SAAS,6BAA6B,KAAG,OAAO,CAAC,MAmEtF,CAAC"}
@@ -4,10 +4,10 @@ import { readFile } from 'node:fs/promises';
4
4
  import { relative } from 'node:path';
5
5
  import { SVELTE_MATCHER, SVELTE_RUNES_MATCHER } from './svelte_helpers.js';
6
6
  import { to_define_import_meta_env, default_ts_transform_options } from './esbuild_helpers.js';
7
- import { default_sveltekit_config, to_default_compile_module_options, } from './sveltekit_config.js';
7
+ import { default_svelte_config, to_default_compile_module_options, } from './svelte_config.js';
8
8
  import { TS_MATCHER } from './constants.js';
9
9
  export const esbuild_plugin_svelte = (options) => {
10
- const { dev, base_url, dir = process.cwd(), svelte_compile_options = default_sveltekit_config.svelte_compile_options, svelte_compile_module_options = to_default_compile_module_options(svelte_compile_options), svelte_preprocessors, ts_transform_options = default_ts_transform_options, is_ts = (f) => TS_MATCHER.test(f), } = options;
10
+ const { dev, base_url, dir = process.cwd(), svelte_compile_options = default_svelte_config.svelte_compile_options, svelte_compile_module_options = to_default_compile_module_options(svelte_compile_options), svelte_preprocessors, ts_transform_options = default_ts_transform_options, is_ts = (f) => TS_MATCHER.test(f), } = options;
11
11
  const final_ts_transform_options = {
12
12
  ...ts_transform_options,
13
13
  define: to_define_import_meta_env(dev, base_url),
@@ -1,9 +1,9 @@
1
1
  import type * as esbuild from 'esbuild';
2
- import type { Parsed_Sveltekit_Config } from './sveltekit_config.js';
2
+ import type { Parsed_Svelte_Config } from './svelte_config.js';
3
3
  export interface Esbuild_Plugin_Sveltekit_Shim_App_Options {
4
4
  dev: boolean;
5
- base_url: Parsed_Sveltekit_Config['base_url'];
6
- assets_url: Parsed_Sveltekit_Config['assets_url'];
5
+ base_url: Parsed_Svelte_Config['base_url'];
6
+ assets_url: Parsed_Svelte_Config['assets_url'];
7
7
  }
8
8
  export declare const esbuild_plugin_sveltekit_shim_app: ({ dev, base_url, assets_url, }: Esbuild_Plugin_Sveltekit_Shim_App_Options) => esbuild.Plugin;
9
9
  //# sourceMappingURL=esbuild_plugin_sveltekit_shim_app.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"esbuild_plugin_sveltekit_shim_app.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/esbuild_plugin_sveltekit_shim_app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,SAAS,CAAC;AAOxC,OAAO,KAAK,EAAC,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAGnE,MAAM,WAAW,yCAAyC;IACzD,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAC9C,UAAU,EAAE,uBAAuB,CAAC,YAAY,CAAC,CAAC;CAClD;AAED,eAAO,MAAM,iCAAiC,GAAI,gCAI/C,yCAAyC,KAAG,OAAO,CAAC,MAqBrD,CAAC"}
1
+ {"version":3,"file":"esbuild_plugin_sveltekit_shim_app.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/esbuild_plugin_sveltekit_shim_app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,OAAO,MAAM,SAAS,CAAC;AAOxC,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AAG7D,MAAM,WAAW,yCAAyC;IACzD,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAC3C,UAAU,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;CAC/C;AAED,eAAO,MAAM,iCAAiC,GAAI,gCAI/C,yCAAyC,KAAG,OAAO,CAAC,MAqBrD,CAAC"}
package/dist/filer.d.ts CHANGED
@@ -25,6 +25,7 @@ export interface Filer_Options {
25
25
  watch_dir?: typeof watch_dir;
26
26
  watch_dir_options?: Partial<Omit_Strict<Watch_Dir_Options, 'on_change'>>;
27
27
  package_json_cache?: Record<string, Package_Json>;
28
+ log?: Logger;
28
29
  }
29
30
  export declare class Filer {
30
31
  #private;
@@ -1 +1 @@
1
- {"version":3,"file":"filer.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/filer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAKzD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EACN,SAAS,EAET,KAAK,cAAc,EACnB,KAAK,iBAAiB,EAEtB,MAAM,gBAAgB,CAAC;AAMxB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAIpD,MAAM,WAAW,WAAW;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;AAEzF,MAAM,WAAW,aAAa;IAC7B,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;IACzE,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CAClD;AAED,qBAAa,KAAK;;IACjB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAa;gBAK1C,OAAO,GAAE,aAA4B;IAWjD,SAAS,GAAI,IAAI,OAAO,KAAG,WAAW,GAAG,SAAS,CAEhD;IAEF,aAAa,GAAI,IAAI,OAAO,KAAG,WAAW,CAkBxC;IA6II,KAAK,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAKxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAa5B;AAGD,eAAO,MAAM,iBAAiB,GAC7B,aAAa,WAAW,EACxB,WAAW,CAAC,EAAE,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,EACnD,SAAS,WAAW,EACpB,UAAS,GAAG,CAAC,MAAM,CAAa,EAChC,WAAU,GAAG,CAAC,MAAM,CAAa,EACjC,MAAM,MAAM,KACV,GAAG,CAAC,MAAM,CAkBZ,CAAC"}
1
+ {"version":3,"file":"filer.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/filer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAKzD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EACN,SAAS,EAET,KAAK,cAAc,EACnB,KAAK,iBAAiB,EAEtB,MAAM,gBAAgB,CAAC;AAMxB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAIpD,MAAM,WAAW,WAAW;IAC3B,EAAE,EAAE,OAAO,CAAC;IAEZ;;;OAGG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;AAEzF,MAAM,WAAW,aAAa;IAC7B,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;IACzE,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAClD,GAAG,CAAC,EAAE,MAAM,CAAC;CACb;AAED,qBAAa,KAAK;;IACjB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAa;gBAO1C,OAAO,GAAE,aAA4B;IAYjD,SAAS,GAAI,IAAI,OAAO,KAAG,WAAW,GAAG,SAAS,CAEhD;IAEF,aAAa,GAAI,IAAI,OAAO,KAAG,WAAW,CAkBxC;IA4II,KAAK,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAKxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAa5B;AAGD,eAAO,MAAM,iBAAiB,GAC7B,aAAa,WAAW,EACxB,WAAW,CAAC,EAAE,EAAE,OAAO,KAAK,WAAW,GAAG,SAAS,EACnD,SAAS,WAAW,EACpB,UAAS,GAAG,CAAC,MAAM,CAAa,EAChC,WAAU,GAAG,CAAC,MAAM,CAAa,EACjC,MAAM,MAAM,KACV,GAAG,CAAC,MAAM,CAkBZ,CAAC"}
package/dist/filer.js CHANGED
@@ -9,18 +9,20 @@ import { watch_dir, } from './watch_dir.js';
9
9
  import { paths } from './paths.js';
10
10
  import { parse_imports } from './parse_imports.js';
11
11
  import { resolve_specifier } from './resolve_specifier.js';
12
- import { default_sveltekit_config } from './sveltekit_config.js';
12
+ import { default_svelte_config } from './svelte_config.js';
13
13
  import { map_sveltekit_aliases, SVELTEKIT_GLOBAL_SPECIFIER } from './sveltekit_helpers.js';
14
- const aliases = Object.entries(default_sveltekit_config.alias);
14
+ const aliases = Object.entries(default_svelte_config.alias);
15
15
  export class Filer {
16
16
  root_dir;
17
17
  files = new Map();
18
18
  #watch_dir;
19
19
  #watch_dir_options;
20
+ #log;
20
21
  constructor(options = EMPTY_OBJECT) {
21
22
  this.#watch_dir = options.watch_dir ?? watch_dir;
22
23
  this.#watch_dir_options = options.watch_dir_options ?? EMPTY_OBJECT;
23
24
  this.root_dir = resolve(options.watch_dir_options?.dir ?? paths.source);
25
+ this.#log = options.log;
24
26
  }
25
27
  #watching;
26
28
  #listeners = new Set();
@@ -67,6 +69,7 @@ export class Filer {
67
69
  continue;
68
70
  const path = map_sveltekit_aliases(specifier, aliases);
69
71
  let path_id;
72
+ // TODO can we replace `resolve_specifier` with `import.meta.resolve` completely now outside of esbuild plugins?
70
73
  if (path[0] === '.' || path[0] === '/') {
71
74
  const resolved = resolve_specifier(path, dir);
72
75
  path_id = resolved.path_id;
@@ -74,16 +77,14 @@ export class Filer {
74
77
  else {
75
78
  if (isBuiltin(path))
76
79
  continue;
80
+ const file_url = pathToFileURL(file.id);
77
81
  try {
78
- const file_url = pathToFileURL(file.id);
79
82
  path_id = fileURLToPath(import.meta.resolve(path, file_url.href));
80
83
  }
81
84
  catch (error) {
82
- // If it's imported from an external module, ignore any import errors.
83
- if (error.code === 'ERR_MODULE_NOT_FOUND' && file.external) {
84
- continue;
85
- }
86
- throw error;
85
+ // if resolving fails for any reason, just log and ignore it
86
+ this.#log?.error('[filer] failed to resolve path', path, file_url.href, error);
87
+ continue;
87
88
  }
88
89
  }
89
90
  dependencies_removed.delete(path_id);
@@ -205,7 +206,7 @@ export const filter_dependents = (source_file, get_by_id, filter, results = new
205
206
  }
206
207
  const dependent_source_file = get_by_id(dependent_id);
207
208
  if (!dependent_source_file) {
208
- log?.warn(`[filer.filter_dependents]: dependent source file ${dependent_id} not found for ${source_file.id}`);
209
+ log?.warn(`[filer.filter_dependents] dependent source file ${dependent_id} not found for ${source_file.id}`);
209
210
  continue;
210
211
  }
211
212
  filter_dependents(dependent_source_file, get_by_id, filter, results, searched);
@@ -1,12 +1,12 @@
1
1
  import { paths } from './paths.js';
2
- import { GITHUB_DIRNAME, README_FILENAME, SVELTEKIT_CONFIG_FILENAME, VITE_CONFIG_FILENAME, TSCONFIG_FILENAME, GRO_CONFIG_PATH, PM_CLI_DEFAULT, PRETTIER_CLI_DEFAULT, } from './constants.js';
2
+ import { GITHUB_DIRNAME, README_FILENAME, SVELTE_CONFIG_FILENAME, VITE_CONFIG_FILENAME, TSCONFIG_FILENAME, GRO_CONFIG_PATH, PM_CLI_DEFAULT, PRETTIER_CLI_DEFAULT, } from './constants.js';
3
3
  import { serialize_args, to_forwarded_args } from './args.js';
4
4
  import { spawn_cli, to_cli_name } from './cli.js';
5
5
  const EXTENSIONS_DEFAULT = 'ts,js,json,svelte,html,css,md,yml';
6
6
  const ROOT_PATHS_DEFAULT = `${[
7
7
  README_FILENAME,
8
8
  GRO_CONFIG_PATH,
9
- SVELTEKIT_CONFIG_FILENAME,
9
+ SVELTE_CONFIG_FILENAME,
10
10
  VITE_CONFIG_FILENAME,
11
11
  TSCONFIG_FILENAME,
12
12
  GITHUB_DIRNAME,
package/dist/gen.d.ts CHANGED
@@ -4,7 +4,7 @@ import type { Result } from '@ryanatkn/belt/result.js';
4
4
  import type { Timings } from '@ryanatkn/belt/timings.js';
5
5
  import type { Path_Id } from './path.js';
6
6
  import type { Gro_Config } from './gro_config.js';
7
- import type { Parsed_Sveltekit_Config } from './sveltekit_config.js';
7
+ import type { Parsed_Svelte_Config } from './svelte_config.js';
8
8
  import { type Load_Modules_Failure, type Module_Meta } from './modules.js';
9
9
  import { Input_Path, type Resolved_Input_File, type Resolved_Input_Path } from './input_path.js';
10
10
  export declare const GEN_FILE_PATTERN_TEXT = "gen";
@@ -23,7 +23,7 @@ export interface Gen_File {
23
23
  export type Gen = (ctx: Gen_Context) => Raw_Gen_Result | Promise<Raw_Gen_Result>;
24
24
  export interface Gen_Context {
25
25
  config: Gro_Config;
26
- sveltekit_config: Parsed_Sveltekit_Config;
26
+ svelte_config: Parsed_Svelte_Config;
27
27
  /**
28
28
  * Same as `import.meta.url` but in path form.
29
29
  */
package/dist/gen.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"gen.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gen.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gen.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gen.ts"],"names":[],"mappings":"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"}
@@ -2,11 +2,11 @@ import type { Create_Gro_Config } from './gro_config.js';
2
2
  /**
3
3
  * This is the default config that's passed to `gro.config.ts`
4
4
  * if it exists in the current project, and if not, this is the final config.
5
- * It looks at the project and tries to do the right thing:
5
+ * It looks at the SvelteKit config and filesystem and tries to do the right thing:
6
6
  *
7
- * - if `src/routes`, assumes a SvelteKit frontend
8
- * - if `src/lib`, assumes a Node library
9
- * - if `src/lib/server/server.ts`, assumes a Node server
7
+ * - if `src/routes`, assumes a SvelteKit frontend - respects `KitConfig.kit.files.routes`
8
+ * - if `src/lib`, assumes a Node library - respects `KitConfig.kit.files.lib`
9
+ * - if `src/lib/server/server.ts`, assumes a Node server - needs config
10
10
  */
11
11
  declare const config: Create_Gro_Config;
12
12
  export default config;
@@ -1 +1 @@
1
- {"version":3,"file":"gro.config.default.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gro.config.default.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQvD;;;;;;;;GAQG;AACH,QAAA,MAAM,MAAM,EAAE,iBA0Bb,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"gro.config.default.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gro.config.default.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAWvD;;;;;;;;GAQG;AACH,QAAA,MAAM,MAAM,EAAE,iBAkCb,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -1,31 +1,41 @@
1
+ import { resolve } from 'node:path';
1
2
  import { gro_plugin_sveltekit_library } from './gro_plugin_sveltekit_library.js';
2
3
  import { has_server, gro_plugin_server } from './gro_plugin_server.js';
3
4
  import { gro_plugin_sveltekit_app } from './gro_plugin_sveltekit_app.js';
4
5
  import { has_sveltekit_app, has_sveltekit_library } from './sveltekit_helpers.js';
5
6
  import { gro_plugin_gen } from './gro_plugin_gen.js';
6
- import { has_dep, is_dep, load_package_json } from './package_json.js';
7
+ import { has_dep, load_package_json } from './package_json.js';
8
+ import { find_first_existing_file } from './search_fs.js';
9
+ // TODO hacky, maybe extract utils?
7
10
  /**
8
11
  * This is the default config that's passed to `gro.config.ts`
9
12
  * if it exists in the current project, and if not, this is the final config.
10
- * It looks at the project and tries to do the right thing:
13
+ * It looks at the SvelteKit config and filesystem and tries to do the right thing:
11
14
  *
12
- * - if `src/routes`, assumes a SvelteKit frontend
13
- * - if `src/lib`, assumes a Node library
14
- * - if `src/lib/server/server.ts`, assumes a Node server
15
+ * - if `src/routes`, assumes a SvelteKit frontend - respects `KitConfig.kit.files.routes`
16
+ * - if `src/lib`, assumes a Node library - respects `KitConfig.kit.files.lib`
17
+ * - if `src/lib/server/server.ts`, assumes a Node server - needs config
15
18
  */
16
- const config = async (cfg) => {
19
+ const config = async (cfg, svelte_config) => {
17
20
  const package_json = load_package_json(); // TODO gets wastefully loaded by some plugins, maybe put in plugin/task context? how does that interact with `map_package_json`?
18
21
  const [has_moss_dep, has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] = await Promise.all([
19
- has_dep('@ryanatkn/moss', package_json) || is_dep('@ryanatkn/moss', package_json),
22
+ has_dep('@ryanatkn/moss', package_json),
20
23
  has_server(),
21
- has_sveltekit_library(package_json),
24
+ has_sveltekit_library(package_json, svelte_config),
22
25
  has_sveltekit_app(),
23
26
  ]);
27
+ const local_moss_plugin_path = find_first_existing_file([
28
+ './src/lib/gro_plugin_moss.ts',
29
+ './src/routes/gro_plugin_moss.ts',
30
+ ]);
31
+ // put things that generate files before SvelteKit so it can see them
24
32
  cfg.plugins = async () => [
25
- // put things that generate files before SvelteKit so it can see them
26
- has_moss_dep
27
- ? (await import('@ryanatkn/moss/gro_plugin_moss.js')).gro_plugin_moss()
28
- : null, // lazy load to avoid errors if it's not installed
33
+ // TODO probably belongs in the gen system
34
+ local_moss_plugin_path
35
+ ? (await import(resolve(local_moss_plugin_path))).gro_plugin_moss()
36
+ : has_moss_dep
37
+ ? (await import('@ryanatkn/moss/gro_plugin_moss.js')).gro_plugin_moss()
38
+ : null, // lazy load to avoid errors if it's not installed
29
39
  gro_plugin_gen(),
30
40
  has_server_result.ok ? gro_plugin_server() : null,
31
41
  has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,
@@ -1,6 +1,7 @@
1
1
  import type { Create_Config_Plugins } from './plugin.js';
2
2
  import type { Map_Package_Json } from './package_json.js';
3
3
  import type { Path_Filter, Path_Id } from './path.js';
4
+ import type { Parsed_Svelte_Config } from './svelte_config.js';
4
5
  /**
5
6
  * The config that users can extend via `gro.config.ts`.
6
7
  * This is exposed to users in places like tasks and genfiles.
@@ -35,6 +36,8 @@ export interface Gro_Config extends Raw_Gro_Config {
35
36
  * The CLI to use that's compatible with `npm install` and `npm link`. Defaults to `'npm'`.
36
37
  */
37
38
  pm_cli: string;
39
+ /** @default SVELTE_CONFIG_FILENAME */
40
+ svelte_config_filename?: string;
38
41
  }
39
42
  /**
40
43
  * The relaxed variant of `Gro_Config` that users can provide via `gro.config.ts`.
@@ -49,7 +52,7 @@ export interface Raw_Gro_Config {
49
52
  js_cli?: string;
50
53
  pm_cli?: string;
51
54
  }
52
- export type Create_Gro_Config = (base_config: Gro_Config) => Raw_Gro_Config | Promise<Raw_Gro_Config>;
55
+ export type Create_Gro_Config = (base_config: Gro_Config, svelte_config?: Parsed_Svelte_Config) => Raw_Gro_Config | Promise<Raw_Gro_Config>;
53
56
  export declare const create_empty_gro_config: () => Gro_Config;
54
57
  /**
55
58
  * The regexp used by default to exclude directories and files
@@ -1 +1 @@
1
- {"version":3,"file":"gro_config.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gro_config.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AAEpD;;;;GAIG;AACH,MAAM,WAAW,UAAW,SAAQ,cAAc;IACjD;;OAEG;IACH,OAAO,EAAE,qBAAqB,CAAC;IAC/B;;;;OAIG;IACH,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC1C;;;OAGG;IACH,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/B;;;OAGG;IACH,cAAc,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IACnC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC9B,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3C,cAAc,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,cAAc,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC/B,WAAW,EAAE,UAAU,KACnB,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE9C,eAAO,MAAM,uBAAuB,QAAO,UAYzC,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,QAUnC,CAAC;AAWF,eAAO,MAAM,wBAAwB,QAAwD,CAAC;AAE9F;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,YAAY,cAAc,KAAG,UAwBjE,CAAC;AAEF,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,iBAAiB,CAAC;CACrD;AAED,eAAO,MAAM,eAAe,GAAU,YAAgB,KAAG,OAAO,CAAC,UAAU,CAiB1E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,CACxC,aAAa,EAAE,GAAG,EAClB,WAAW,EAAE,MAAM,KACf,OAAO,CAAC,aAAa,IAAI,iBAS7B,CAAC"}
1
+ {"version":3,"file":"gro_config.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gro_config.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AAE7D;;;;GAIG;AACH,MAAM,WAAW,UAAW,SAAQ,cAAc;IACjD;;OAEG;IACH,OAAO,EAAE,qBAAqB,CAAC;IAC/B;;;;OAIG;IACH,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC1C;;;OAGG;IACH,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC/B;;;OAGG;IACH,cAAc,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IACnC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,sCAAsC;IACtC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC9B,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3C,cAAc,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,cAAc,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC/B,WAAW,EAAE,UAAU,EACvB,aAAa,CAAC,EAAE,oBAAoB,KAChC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE9C,eAAO,MAAM,uBAAuB,QAAO,UAYzC,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,QAUnC,CAAC;AAWF,eAAO,MAAM,wBAAwB,QAAwD,CAAC;AAE9F;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,YAAY,cAAc,KAAG,UAwBjE,CAAC;AAEF,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,iBAAiB,CAAC;CACrD;AAED,eAAO,MAAM,eAAe,GAAU,YAAgB,KAAG,OAAO,CAAC,UAAU,CAiB1E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,CACxC,aAAa,EAAE,GAAG,EAClB,WAAW,EAAE,MAAM,KACf,OAAO,CAAC,aAAa,IAAI,iBAS7B,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import * as esbuild from 'esbuild';
2
- import type { Config as SvelteKitConfig } from '@sveltejs/kit';
2
+ import type { Config as SvelteConfig } from '@sveltejs/kit';
3
3
  import type { Result } from '@ryanatkn/belt/result.js';
4
4
  import type { Plugin } from './plugin.js';
5
5
  export declare const SERVER_SOURCE_ID: Flavored<string, "Path_Id">;
@@ -22,7 +22,7 @@ export interface Gro_Plugin_Server_Options {
22
22
  */
23
23
  outpaths?: Create_Outpaths;
24
24
  /**
25
- * @default SvelteKit's `.env`, `.env.development`, and `.env.production`
25
+ * @default ```SvelteKit's `.env`, `.env.development`, and `.env.production````
26
26
  */
27
27
  env_files?: Array<string>;
28
28
  /**
@@ -30,9 +30,9 @@ export interface Gro_Plugin_Server_Options {
30
30
  */
31
31
  ambient_env?: Record<string, string>;
32
32
  /**
33
- * @default loaded from `${cwd}/${SVELTEKIT_CONFIG_FILENAME}`
33
+ * @default ```loaded from `${cwd}/${SVELTE_CONFIG_FILENAME}````
34
34
  */
35
- sveltekit_config?: SvelteKitConfig;
35
+ svelte_config?: SvelteConfig;
36
36
  /**
37
37
  * @default 'esnext'
38
38
  */
@@ -75,5 +75,5 @@ export interface Outpaths {
75
75
  outname: string;
76
76
  }
77
77
  export type Create_Outpaths = (dev: boolean) => Outpaths;
78
- export declare const gro_plugin_server: ({ entry_points, dir, outpaths, env_files, ambient_env, sveltekit_config, target, esbuild_build_options, rebuild_throttle_delay, cli_command, run, }?: Gro_Plugin_Server_Options) => Plugin;
78
+ export declare const gro_plugin_server: ({ entry_points, dir, outpaths, env_files, ambient_env, svelte_config, target, esbuild_build_options, rebuild_throttle_delay, cli_command, run, }?: Gro_Plugin_Server_Options) => Plugin;
79
79
  //# sourceMappingURL=gro_plugin_server.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"gro_plugin_server.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gro_plugin_server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,EAAC,MAAM,IAAI,eAAe,EAAC,MAAM,eAAe,CAAC;AAI7D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAIrD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAgBxC,eAAO,MAAM,gBAAgB,6BAA0D,CAAC;AAExF,eAAO,MAAM,UAAU,GAAI,kCAAuB,KAAG,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAKpF,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACzC;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;OAEG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC;;OAEG;IACH,gBAAgB,CAAC,EAAE,eAAe,CAAC;IACnC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC;IACrF;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACd;AAED,MAAM,WAAW,QAAQ;IACxB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAC;AAEzD,eAAO,MAAM,iBAAiB,GAAI,sJAgB/B,yBAA8B,KAAG,MAwJnC,CAAC"}
1
+ {"version":3,"file":"gro_plugin_server.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/gro_plugin_server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,EAAC,MAAM,IAAI,YAAY,EAAC,MAAM,eAAe,CAAC;AAI1D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAIrD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAgBxC,eAAO,MAAM,gBAAgB,6BAA0D,CAAC;AAExF,eAAO,MAAM,UAAU,GAAI,kCAAuB,KAAG,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAKpF,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACzC;;OAEG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;OAEG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC;;OAEG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC;IACrF;;;;OAIG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACd;AAED,MAAM,WAAW,QAAQ;IACxB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAC;AAEzD,eAAO,MAAM,iBAAiB,GAAI,mJAgB/B,yBAA8B,KAAG,MA2JnC,CAAC"}
@@ -8,7 +8,7 @@ import { throttle } from '@ryanatkn/belt/throttle.js';
8
8
  import { base_path_to_path_id, LIB_DIRNAME, paths } from './paths.js';
9
9
  import { GRO_DEV_DIRNAME, SERVER_DIST_PATH } from './constants.js';
10
10
  import { watch_dir } from './watch_dir.js';
11
- import { init_sveltekit_config, default_sveltekit_config } from './sveltekit_config.js';
11
+ import { parse_svelte_config, default_svelte_config } from './svelte_config.js';
12
12
  import { esbuild_plugin_sveltekit_shim_app } from './esbuild_plugin_sveltekit_shim_app.js';
13
13
  import { esbuild_plugin_sveltekit_shim_env } from './esbuild_plugin_sveltekit_shim_env.js';
14
14
  import { print_build_result, to_define_import_meta_env } from './esbuild_helpers.js';
@@ -28,7 +28,7 @@ export const gro_plugin_server = ({ entry_points = [SERVER_SOURCE_ID], dir = pro
28
28
  outdir: join(dir, dev ? GRO_DEV_DIRNAME : SERVER_DIST_PATH),
29
29
  outbase: paths.lib,
30
30
  outname: 'server/server.js',
31
- }), env_files, ambient_env, sveltekit_config, target = 'esnext', esbuild_build_options = identity, rebuild_throttle_delay = 1000, cli_command, run, // `dev` default is not available in this scope
31
+ }), env_files, ambient_env, svelte_config, target = 'esnext', esbuild_build_options = identity, rebuild_throttle_delay = 1000, cli_command, run, // `dev` default is not available in this scope
32
32
  } = {}) => {
33
33
  let build_ctx = null;
34
34
  let watcher = null;
@@ -37,10 +37,13 @@ export const gro_plugin_server = ({ entry_points = [SERVER_SOURCE_ID], dir = pro
37
37
  return {
38
38
  name: 'gro_plugin_server',
39
39
  setup: async ({ dev, watch, timings, log, config }) => {
40
- const parsed_sveltekit_config = !sveltekit_config && strip_end(dir, '/') === process.cwd()
41
- ? default_sveltekit_config
42
- : await init_sveltekit_config(sveltekit_config ?? dir);
43
- const { alias, base_url, assets_url, env_dir, private_prefix, public_prefix, svelte_compile_options, svelte_compile_module_options, svelte_preprocessors, } = parsed_sveltekit_config;
40
+ const parsed_svelte_config = !svelte_config && strip_end(dir, '/') === process.cwd()
41
+ ? default_svelte_config
42
+ : await parse_svelte_config({
43
+ dir_or_config: svelte_config ?? dir,
44
+ config_filename: config.svelte_config_filename,
45
+ });
46
+ const { alias, base_url, assets_url, env_dir, private_prefix, public_prefix, svelte_compile_options, svelte_compile_module_options, svelte_preprocessors, } = parsed_svelte_config;
44
47
  const { outbase, outdir, outname } = outpaths(dev);
45
48
  const server_outpath = join(outdir, outname);
46
49
  const timing_to_esbuild_create_context = timings.start('create build context');
@@ -6,7 +6,7 @@ import { Task_Error } from './task.js';
6
6
  import { find_cli, spawn_cli, spawn_cli_process } from './cli.js';
7
7
  import { serialize_src_json, create_src_json } from './src_json.js';
8
8
  import { EXPORTS_EXCLUDER_DEFAULT } from './gro_config.js';
9
- import { default_sveltekit_config } from './sveltekit_config.js';
9
+ import { default_svelte_config } from './svelte_config.js';
10
10
  import { SOURCE_DIRNAME } from './constants.js';
11
11
  import { VITE_CLI } from './sveltekit_helpers.js';
12
12
  export const gro_plugin_sveltekit_app = ({ host_target = 'github_pages', well_known_package_json, well_known_src_json, well_known_src_files, vite_cli = VITE_CLI, } = {}) => {
@@ -57,7 +57,7 @@ export const gro_plugin_sveltekit_app = ({ host_target = 'github_pages', well_kn
57
57
  // maybe a Vite middleware is best? what if this plugin added its plugin to your `vite.config.ts`?
58
58
  // copy files to `static` before building, in such a way
59
59
  // that's non-destructive to existing files and dirs and easy to clean up
60
- const { assets_path } = default_sveltekit_config;
60
+ const { assets_path } = default_svelte_config;
61
61
  const cleanups = [
62
62
  serialized_package_json
63
63
  ? create_temporarily(join(assets_path, '.well-known/package.json'), serialized_package_json)
@@ -34,7 +34,7 @@ import { Filer } from './filer.js';
34
34
  export const invoke_task = async (task_name, args, config, initial_filer, initial_timings) => {
35
35
  const log = new System_Logger(print_log_label(task_name || 'gro'));
36
36
  log.info('invoking', task_name ? st('cyan', task_name) : 'gro');
37
- const filer = initial_filer ?? new Filer();
37
+ const filer = initial_filer ?? new Filer({ log });
38
38
  const timings = initial_timings ?? new Timings();
39
39
  const total_timing = create_stopwatch();
40
40
  const finish = () => {
package/dist/loader.js CHANGED
@@ -6,7 +6,7 @@ import { escape_regexp } from '@ryanatkn/belt/regexp.js';
6
6
  import { readFileSync } from 'node:fs';
7
7
  import { render_env_shim_module } from './sveltekit_shim_env.js';
8
8
  import { render_sveltekit_shim_app_environment, render_sveltekit_shim_app_paths, SVELTEKIT_SHIM_APP_ENVIRONMENT_MATCHER, SVELTEKIT_SHIM_APP_PATHS_MATCHER, sveltekit_shim_app_specifiers, } from './sveltekit_shim_app.js';
9
- import { default_sveltekit_config } from './sveltekit_config.js';
9
+ import { default_svelte_config } from './svelte_config.js';
10
10
  import { SVELTE_MATCHER, SVELTE_RUNES_MATCHER } from './svelte_helpers.js';
11
11
  import { IS_THIS_GRO, paths } from './paths.js';
12
12
  import { JSON_MATCHER, NODE_MODULES_DIRNAME, TS_MATCHER } from './constants.js';
@@ -42,7 +42,7 @@ TODO how to improve that gnarly import line? was originally designed for the now
42
42
  // dev is always true in the loader
43
43
  const dev = true;
44
44
  const dir = paths.root;
45
- const { alias, base_url, assets_url, env_dir, private_prefix, public_prefix, svelte_compile_options, svelte_compile_module_options, svelte_preprocessors, } = default_sveltekit_config;
45
+ const { alias, base_url, assets_url, env_dir, private_prefix, public_prefix, svelte_compile_options, svelte_compile_module_options, svelte_preprocessors, } = default_svelte_config;
46
46
  const ts_transform_options = {
47
47
  ...default_ts_transform_options,
48
48
  define: to_define_import_meta_env(dev, base_url),
package/dist/package.d.ts CHANGED
@@ -363,11 +363,11 @@ export declare const package_json: {
363
363
  types: string;
364
364
  default: string;
365
365
  };
366
- './svelte_helpers.js': {
366
+ './svelte_config.js': {
367
367
  types: string;
368
368
  default: string;
369
369
  };
370
- './sveltekit_config.js': {
370
+ './svelte_helpers.js': {
371
371
  types: string;
372
372
  default: string;
373
373
  };
@@ -391,7 +391,7 @@ export declare const package_json: {
391
391
  types: string;
392
392
  default: string;
393
393
  };
394
- './sveltekit_shim_app_stores.js': {
394
+ './sveltekit_shim_app_state.js': {
395
395
  types: string;
396
396
  default: string;
397
397
  };
@@ -1030,14 +1030,7 @@ export declare const src_json: {
1030
1030
  kind: "function";
1031
1031
  })[];
1032
1032
  };
1033
- './svelte_helpers.js': {
1034
- path: string;
1035
- declarations: {
1036
- name: string;
1037
- kind: "variable";
1038
- }[];
1039
- };
1040
- './sveltekit_config.js': {
1033
+ './svelte_config.js': {
1041
1034
  path: string;
1042
1035
  declarations: ({
1043
1036
  name: string;
@@ -1050,6 +1043,13 @@ export declare const src_json: {
1050
1043
  kind: "variable";
1051
1044
  })[];
1052
1045
  };
1046
+ './svelte_helpers.js': {
1047
+ path: string;
1048
+ declarations: {
1049
+ name: string;
1050
+ kind: "variable";
1051
+ }[];
1052
+ };
1053
1053
  './sveltekit_helpers.js': {
1054
1054
  path: string;
1055
1055
  declarations: ({
@@ -1094,15 +1094,12 @@ export declare const src_json: {
1094
1094
  kind: "function";
1095
1095
  })[];
1096
1096
  };
1097
- './sveltekit_shim_app_stores.js': {
1097
+ './sveltekit_shim_app_state.js': {
1098
1098
  path: string;
1099
- declarations: ({
1100
- name: string;
1101
- kind: "function";
1102
- } | {
1099
+ declarations: {
1103
1100
  name: string;
1104
1101
  kind: "variable";
1105
- })[];
1102
+ }[];
1106
1103
  };
1107
1104
  './sveltekit_shim_app.js': {
1108
1105
  path: string;