@ryanatkn/gro 0.152.0 → 0.153.1

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 (79) 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.js +2 -2
  15. package/dist/format_directory.js +2 -2
  16. package/dist/gen.d.ts +2 -2
  17. package/dist/gen.d.ts.map +1 -1
  18. package/dist/gro.config.default.d.ts +4 -4
  19. package/dist/gro.config.default.d.ts.map +1 -1
  20. package/dist/gro.config.default.js +22 -12
  21. package/dist/gro_config.d.ts +4 -1
  22. package/dist/gro_config.d.ts.map +1 -1
  23. package/dist/gro_plugin_server.d.ts +5 -5
  24. package/dist/gro_plugin_server.d.ts.map +1 -1
  25. package/dist/gro_plugin_server.js +9 -6
  26. package/dist/gro_plugin_sveltekit_app.js +2 -2
  27. package/dist/loader.js +2 -2
  28. package/dist/package.d.ts +10 -10
  29. package/dist/package.d.ts.map +1 -1
  30. package/dist/package.js +17 -20
  31. package/dist/package_json.d.ts +0 -1
  32. package/dist/package_json.d.ts.map +1 -1
  33. package/dist/package_json.js +0 -1
  34. package/dist/paths.d.ts.map +1 -1
  35. package/dist/paths.js +3 -3
  36. package/dist/run_gen.js +2 -2
  37. package/dist/run_task.js +2 -2
  38. package/dist/search_fs.d.ts +1 -0
  39. package/dist/search_fs.d.ts.map +1 -1
  40. package/dist/search_fs.js +8 -0
  41. package/dist/{sveltekit_config.d.ts → svelte_config.d.ts} +16 -10
  42. package/dist/svelte_config.d.ts.map +1 -0
  43. package/dist/{sveltekit_config.js → svelte_config.js} +16 -12
  44. package/dist/sveltekit_helpers.d.ts +3 -3
  45. package/dist/sveltekit_helpers.d.ts.map +1 -1
  46. package/dist/sveltekit_helpers.js +8 -8
  47. package/dist/sveltekit_shim_app.d.ts +2 -2
  48. package/dist/sveltekit_shim_app.d.ts.map +1 -1
  49. package/dist/task.d.ts +2 -2
  50. package/dist/task.d.ts.map +1 -1
  51. package/dist/upgrade.task.d.ts.map +1 -1
  52. package/dist/upgrade.task.js +8 -0
  53. package/package.json +7 -7
  54. package/src/lib/changeset.task.ts +2 -2
  55. package/src/lib/constants.ts +1 -1
  56. package/src/lib/esbuild_helpers.ts +2 -2
  57. package/src/lib/esbuild_plugin_external_worker.ts +3 -3
  58. package/src/lib/esbuild_plugin_svelte.ts +5 -5
  59. package/src/lib/esbuild_plugin_sveltekit_shim_app.ts +3 -3
  60. package/src/lib/filer.ts +2 -2
  61. package/src/lib/format_directory.ts +2 -2
  62. package/src/lib/gen.ts +2 -2
  63. package/src/lib/gro.config.default.ts +25 -12
  64. package/src/lib/gro_config.ts +4 -0
  65. package/src/lib/gro_plugin_server.ts +14 -11
  66. package/src/lib/gro_plugin_sveltekit_app.ts +2 -2
  67. package/src/lib/loader.ts +2 -2
  68. package/src/lib/package.ts +17 -20
  69. package/src/lib/package_json.ts +0 -5
  70. package/src/lib/paths.ts +3 -3
  71. package/src/lib/run_gen.ts +2 -2
  72. package/src/lib/run_task.ts +2 -2
  73. package/src/lib/search_fs.ts +9 -0
  74. package/src/lib/{sveltekit_config.ts → svelte_config.ts} +31 -21
  75. package/src/lib/sveltekit_helpers.ts +10 -8
  76. package/src/lib/sveltekit_shim_app.ts +3 -3
  77. package/src/lib/task.ts +3 -3
  78. package/src/lib/upgrade.task.ts +9 -0
  79. package/dist/sveltekit_config.d.ts.map +0 -1
package/dist/package.js CHANGED
@@ -1,7 +1,7 @@
1
1
  // generated by src/lib/package.gen.ts
2
2
  export const package_json = {
3
3
  name: '@ryanatkn/gro',
4
- version: '0.152.0',
4
+ version: '0.153.1',
5
5
  description: 'task runner and toolkit extending SvelteKit',
6
6
  motto: 'generate, run, optimize',
7
7
  glyph: '🌰',
@@ -56,7 +56,7 @@ export const package_json = {
56
56
  '@changesets/changelog-git': '^0.2.1',
57
57
  '@changesets/types': '^6.1.0',
58
58
  '@ryanatkn/eslint-config': '^0.8.0',
59
- '@ryanatkn/fuz': '^0.139.1',
59
+ '@ryanatkn/fuz': '^0.139.2',
60
60
  '@ryanatkn/moss': '^0.26.0',
61
61
  '@sveltejs/adapter-static': '^3.0.8',
62
62
  '@sveltejs/kit': '^2.20.8',
@@ -72,7 +72,7 @@ export const package_json = {
72
72
  'typescript-eslint': '^8.31.1',
73
73
  uvu: '^0.5.6',
74
74
  },
75
- optionalDependencies: { '@ryanatkn/moss': '^0.26.0' },
75
+ optionalDependencies: { '@ryanatkn/moss': '^0.27.0' },
76
76
  prettier: {
77
77
  plugins: ['prettier-plugin-svelte'],
78
78
  useTabs: true,
@@ -206,14 +206,11 @@ export const package_json = {
206
206
  './run.task.js': { types: './dist/run.task.d.ts', default: './dist/run.task.js' },
207
207
  './search_fs.js': { types: './dist/search_fs.d.ts', default: './dist/search_fs.js' },
208
208
  './src_json.js': { types: './dist/src_json.d.ts', default: './dist/src_json.js' },
209
+ './svelte_config.js': { types: './dist/svelte_config.d.ts', default: './dist/svelte_config.js' },
209
210
  './svelte_helpers.js': {
210
211
  types: './dist/svelte_helpers.d.ts',
211
212
  default: './dist/svelte_helpers.js',
212
213
  },
213
- './sveltekit_config.js': {
214
- types: './dist/sveltekit_config.d.ts',
215
- default: './dist/sveltekit_config.js',
216
- },
217
214
  './sveltekit_helpers.js': {
218
215
  types: './dist/sveltekit_helpers.d.ts',
219
216
  default: './dist/sveltekit_helpers.js',
@@ -260,7 +257,7 @@ export const package_json = {
260
257
  };
261
258
  export const src_json = {
262
259
  name: '@ryanatkn/gro',
263
- version: '0.152.0',
260
+ version: '0.153.1',
264
261
  modules: {
265
262
  '.': {
266
263
  path: 'index.ts',
@@ -375,7 +372,7 @@ export const src_json = {
375
372
  { name: 'GRO_DEV_DIR', kind: 'variable' },
376
373
  { name: 'GRO_CONFIG_PATH', kind: 'variable' },
377
374
  { name: 'README_FILENAME', kind: 'variable' },
378
- { name: 'SVELTEKIT_CONFIG_FILENAME', kind: 'variable' },
375
+ { name: 'SVELTE_CONFIG_FILENAME', kind: 'variable' },
379
376
  { name: 'VITE_CONFIG_FILENAME', kind: 'variable' },
380
377
  { name: 'NODE_MODULES_DIRNAME', kind: 'variable' },
381
378
  { name: 'LOCKFILE_FILENAME', kind: 'variable' },
@@ -711,7 +708,6 @@ export const src_json = {
711
708
  { name: 'update_package_json', kind: 'function' },
712
709
  { name: 'to_package_exports', kind: 'function' },
713
710
  { name: 'parse_repo_url', kind: 'function' },
714
- { name: 'is_dep', kind: 'function' },
715
711
  { name: 'has_dep', kind: 'function' },
716
712
  { name: 'Package_Json_Dep', kind: 'type' },
717
713
  { name: 'extract_deps', kind: 'function' },
@@ -847,6 +843,7 @@ export const src_json = {
847
843
  declarations: [
848
844
  { name: 'Search_Fs_Options', kind: 'type' },
849
845
  { name: 'search_fs', kind: 'function' },
846
+ { name: 'find_first_existing_file', kind: 'function' },
850
847
  ],
851
848
  },
852
849
  './src_json.js': {
@@ -862,6 +859,16 @@ export const src_json = {
862
859
  { name: 'to_src_modules', kind: 'function' },
863
860
  ],
864
861
  },
862
+ './svelte_config.js': {
863
+ path: 'svelte_config.ts',
864
+ declarations: [
865
+ { name: 'load_svelte_config', kind: 'function' },
866
+ { name: 'Parsed_Svelte_Config', kind: 'type' },
867
+ { name: 'parse_svelte_config', kind: 'function' },
868
+ { name: 'to_default_compile_module_options', kind: 'function' },
869
+ { name: 'default_svelte_config', kind: 'variable' },
870
+ ],
871
+ },
865
872
  './svelte_helpers.js': {
866
873
  path: 'svelte_helpers.ts',
867
874
  declarations: [
@@ -869,16 +876,6 @@ export const src_json = {
869
876
  { name: 'SVELTE_RUNES_MATCHER', kind: 'variable' },
870
877
  ],
871
878
  },
872
- './sveltekit_config.js': {
873
- path: 'sveltekit_config.ts',
874
- declarations: [
875
- { name: 'load_sveltekit_config', kind: 'function' },
876
- { name: 'Parsed_Sveltekit_Config', kind: 'type' },
877
- { name: 'init_sveltekit_config', kind: 'function' },
878
- { name: 'to_default_compile_module_options', kind: 'function' },
879
- { name: 'default_sveltekit_config', kind: 'variable' },
880
- ],
881
- },
882
879
  './sveltekit_helpers.js': {
883
880
  path: 'sveltekit_helpers.ts',
884
881
  declarations: [
@@ -382,7 +382,6 @@ export declare const parse_repo_url: (package_json: Package_Json) => {
382
382
  owner: string;
383
383
  repo: string;
384
384
  } | undefined;
385
- export declare const is_dep: (dep_name: string, package_json?: Package_Json) => boolean;
386
385
  export declare const has_dep: (dep_name: string, package_json?: Package_Json) => boolean;
387
386
  export interface Package_Json_Dep {
388
387
  name: string;
@@ -1 +1 @@
1
- {"version":3,"file":"package_json.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/package_json.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package_json.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/package_json.ts"],"names":[],"mappings":"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"}
@@ -275,7 +275,6 @@ const parse_or_throw_formatted_error = (name, schema, value) => {
275
275
  }
276
276
  return parsed.data;
277
277
  };
278
- export const is_dep = (dep_name, package_json = load_package_json()) => package_json.name === dep_name;
279
278
  export const has_dep = (dep_name, package_json = load_package_json()) => !!package_json.devDependencies?.[dep_name] ||
280
279
  !!package_json.dependencies?.[dep_name] ||
281
280
  !!package_json.peerDependencies?.[dep_name];
@@ -1 +1 @@
1
- {"version":3,"file":"paths.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/paths.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AASvC,eAAO,MAAM,WAAW,QAA8C,CAAC;AACvE,eAAO,MAAM,QAAQ,QAA2B,CAAC;AACjD,eAAO,MAAM,OAAO,QAAiB,CAAC;AACtC,eAAO,MAAM,cAAc,QAAiD,CAAC;AAE7E,MAAM,WAAW,KAAK;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,YAAY,GAAI,UAAU,MAAM,KAAG,KAW/C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,OAAO,KAAG,KAA4C,CAAC;AACvF,eAAO,MAAM,SAAS,GAAI,IAAI,OAAO,KAAG,OAAwD,CAAC;AAGjG,eAAO,MAAM,YAAY,GAAI,IAAI,OAAO,EAAE,SAAmB,KAAG,MACnC,CAAC;AAG9B,eAAO,MAAM,oBAAoB,GAAI,SAAS,OAAO,EAAE,SAAwB,KAAG,MACtD,CAAC;AAI7B,eAAO,MAAM,oBAAoB,GAAI,WAAW,MAAM,EAAE,SAA0B,KAAG,OAC3D,CAAC;AAE3B,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,SAAqB,KAAG,MAMhE,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,eAAe,MAAM,KAAG,MAGvE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,KAAK,OAA8B,CAAC;AAEjD,eAAO,MAAM,eAAe,SAAS,CAAC;AAYtC,eAAO,MAAM,WAAW,SAAsC,CAAC;AAC/D;;GAEG;AACH,eAAO,MAAM,SAAS,OAA2D,CAAC;AAClF,eAAO,MAAM,YAAY,QAAgD,CAAC"}
1
+ {"version":3,"file":"paths.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/paths.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AASvC,eAAO,MAAM,WAAW,QAA2C,CAAC;AACpE,eAAO,MAAM,QAAQ,QAA2B,CAAC;AACjD,eAAO,MAAM,OAAO,QAAiB,CAAC;AACtC,eAAO,MAAM,cAAc,QAA8C,CAAC;AAE1E,MAAM,WAAW,KAAK;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,YAAY,GAAI,UAAU,MAAM,KAAG,KAW/C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,OAAO,KAAG,KAA4C,CAAC;AACvF,eAAO,MAAM,SAAS,GAAI,IAAI,OAAO,KAAG,OAAwD,CAAC;AAGjG,eAAO,MAAM,YAAY,GAAI,IAAI,OAAO,EAAE,SAAmB,KAAG,MACnC,CAAC;AAG9B,eAAO,MAAM,oBAAoB,GAAI,SAAS,OAAO,EAAE,SAAwB,KAAG,MACtD,CAAC;AAI7B,eAAO,MAAM,oBAAoB,GAAI,WAAW,MAAM,EAAE,SAA0B,KAAG,OAC3D,CAAC;AAE3B,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,SAAqB,KAAG,MAMhE,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,eAAe,MAAM,KAAG,MAGvE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,KAAK,OAA8B,CAAC;AAEjD,eAAO,MAAM,eAAe,SAAS,CAAC;AAYtC,eAAO,MAAM,WAAW,SAAsC,CAAC;AAC/D;;GAEG;AACH,eAAO,MAAM,SAAS,OAA2D,CAAC;AAClF,eAAO,MAAM,YAAY,QAAgD,CAAC"}
package/dist/paths.js CHANGED
@@ -3,17 +3,17 @@ import { fileURLToPath } from 'node:url';
3
3
  import { strip_end } from '@ryanatkn/belt/string.js';
4
4
  import { styleText as st } from 'node:util';
5
5
  import { GRO_CONFIG_PATH, GRO_DEV_DIR, GRO_DIR, SOURCE_DIR, SVELTEKIT_DIST_DIRNAME, } from './constants.js';
6
- import { default_sveltekit_config } from './sveltekit_config.js';
6
+ import { default_svelte_config } from './svelte_config.js';
7
7
  /*
8
8
 
9
9
  A path `id` is an absolute path to the source/.gro/dist directory.
10
10
  It's the same name that Rollup uses.
11
11
 
12
12
  */
13
- export const LIB_DIRNAME = basename(default_sveltekit_config.lib_path);
13
+ export const LIB_DIRNAME = basename(default_svelte_config.lib_path);
14
14
  export const LIB_PATH = SOURCE_DIR + LIB_DIRNAME;
15
15
  export const LIB_DIR = LIB_PATH + '/';
16
- export const ROUTES_DIRNAME = basename(default_sveltekit_config.routes_path);
16
+ export const ROUTES_DIRNAME = basename(default_svelte_config.routes_path);
17
17
  export const create_paths = (root_dir) => {
18
18
  // TODO remove reliance on trailing slash towards windows support
19
19
  const root = strip_end(root_dir, '/') + '/';
package/dist/run_gen.js CHANGED
@@ -2,7 +2,7 @@ import { styleText as st } from 'node:util';
2
2
  import { print_error } from '@ryanatkn/belt/print.js';
3
3
  import { to_gen_result, } from './gen.js';
4
4
  import { print_path, to_root_path } from './paths.js';
5
- import { default_sveltekit_config } from './sveltekit_config.js';
5
+ import { default_svelte_config } from './svelte_config.js';
6
6
  export const GEN_NO_PROD_MESSAGE = 'gen runs only during development';
7
7
  export const run_gen = async (gen_modules, config, log, timings, format_file) => {
8
8
  let input_count = 0;
@@ -15,7 +15,7 @@ export const run_gen = async (gen_modules, config, log, timings, format_file) =>
15
15
  // Perform code generation by calling `gen` on the module.
16
16
  const gen_ctx = {
17
17
  config,
18
- sveltekit_config: default_sveltekit_config,
18
+ svelte_config: default_svelte_config,
19
19
  origin_id: id,
20
20
  origin_path: to_root_path(id),
21
21
  log,
package/dist/run_task.js CHANGED
@@ -4,7 +4,7 @@ import { System_Logger } from '@ryanatkn/belt/log.js';
4
4
  import { parse_args } from './args.js';
5
5
  import { log_task_help } from './task_logging.js';
6
6
  import { Task_Error } from './task.js';
7
- import { default_sveltekit_config } from './sveltekit_config.js';
7
+ import { default_svelte_config } from './svelte_config.js';
8
8
  export const run_task = async (task_meta, unparsed_args, invoke_task, config, filer, timings) => {
9
9
  const { task } = task_meta.mod;
10
10
  const log = new System_Logger(print_log_label(task_meta.name));
@@ -28,7 +28,7 @@ export const run_task = async (task_meta, unparsed_args, invoke_task, config, fi
28
28
  output = await task.run({
29
29
  args,
30
30
  config,
31
- sveltekit_config: default_sveltekit_config,
31
+ svelte_config: default_svelte_config,
32
32
  filer,
33
33
  log,
34
34
  timings,
@@ -22,4 +22,5 @@ export interface Search_Fs_Options {
22
22
  cwd?: string | null;
23
23
  }
24
24
  export declare const search_fs: (dir: string, options?: Search_Fs_Options) => Array<Resolved_Path>;
25
+ export declare const find_first_existing_file: (paths: Array<string>) => string | null;
25
26
  //# sourceMappingURL=search_fs.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"search_fs.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/search_fs.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,WAAW,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,WAAW,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IACjC;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1C;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,KAAK,MAAM,CAAC,CAAC;IACzE;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,GACrB,KAAK,MAAM,EACX,UAAS,iBAAgC,KACvC,KAAK,CAAC,aAAa,CAwBrB,CAAC"}
1
+ {"version":3,"file":"search_fs.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/search_fs.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,WAAW,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,WAAW,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IACjC;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1C;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,KAAK,MAAM,CAAC,CAAC;IACzE;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,GACrB,KAAK,MAAM,EACX,UAAS,iBAAgC,KACvC,KAAK,CAAC,aAAa,CAwBrB,CAAC;AAmCF,eAAO,MAAM,wBAAwB,GAAI,OAAO,KAAK,CAAC,MAAM,CAAC,KAAG,MAAM,GAAG,IAOxE,CAAC"}
package/dist/search_fs.js CHANGED
@@ -42,3 +42,11 @@ const crawl = (dir, paths, filters, file_filter, include_directories, base_dir)
42
42
  }
43
43
  return paths;
44
44
  };
45
+ export const find_first_existing_file = (paths) => {
46
+ for (const path of paths) {
47
+ if (existsSync(path)) {
48
+ return path;
49
+ }
50
+ }
51
+ return null;
52
+ };
@@ -1,20 +1,23 @@
1
- import type { Config as SveltekitConfig } from '@sveltejs/kit';
1
+ import type { Config as SvelteConfig } from '@sveltejs/kit';
2
2
  import type { CompileOptions, ModuleCompileOptions, PreprocessorGroup } from 'svelte/compiler';
3
3
  /**
4
4
  * Loads a SvelteKit config at `dir`.
5
5
  * @returns `null` if no config is found
6
6
  */
7
- export declare const load_sveltekit_config: (dir?: string) => Promise<SveltekitConfig | null>;
7
+ export declare const load_svelte_config: ({ dir, config_filename, }?: {
8
+ dir?: string;
9
+ config_filename?: string;
10
+ }) => Promise<SvelteConfig | null>;
8
11
  /**
9
12
  * A subset of SvelteKit's config in a form that Gro uses
10
13
  * because SvelteKit doesn't expose its config resolver.
11
14
  * Flattens things out to keep them simple and easy to pass around,
12
- * and doesn't deal with most properties.
15
+ * and doesn't deal with most properties, but includes the full `svelte_config`.
13
16
  * The `base` and `assets` in particular are renamed for clarity with Gro's internal systems,
14
17
  * so these properties become first-class vocabulary inside Gro.
15
18
  */
16
- export interface Parsed_Sveltekit_Config {
17
- sveltekit_config: SveltekitConfig | null;
19
+ export interface Parsed_Svelte_Config {
20
+ svelte_config: SvelteConfig | null;
18
21
  alias: Record<string, string>;
19
22
  base_url: '' | `/${string}` | undefined;
20
23
  assets_url: '' | `http://${string}` | `https://${string}` | undefined;
@@ -39,13 +42,16 @@ export interface Parsed_Sveltekit_Config {
39
42
  }
40
43
  /**
41
44
  * Returns Gro-relevant properties of a SvelteKit config
42
- * as a convenience wrapper around `load_sveltekit_config`.
45
+ * as a convenience wrapper around `load_svelte_config`.
43
46
  * Needed because SvelteKit doesn't expose its config resolver.
44
47
  */
45
- export declare const init_sveltekit_config: (dir_or_config?: string | SveltekitConfig) => Promise<Parsed_Sveltekit_Config>;
46
- export declare const to_default_compile_module_options: ({ dev, generate, filename, rootDir, }: CompileOptions) => ModuleCompileOptions;
48
+ export declare const parse_svelte_config: ({ dir_or_config, config_filename, }?: {
49
+ dir_or_config?: string | SvelteConfig;
50
+ config_filename?: string;
51
+ }) => Promise<Parsed_Svelte_Config>;
52
+ export declare const to_default_compile_module_options: ({ dev, generate, filename, rootDir, warningFilter, }: CompileOptions) => ModuleCompileOptions;
47
53
  /**
48
54
  * The parsed SvelteKit config for the cwd, cached globally at the module level.
49
55
  */
50
- export declare const default_sveltekit_config: Parsed_Sveltekit_Config;
51
- //# sourceMappingURL=sveltekit_config.d.ts.map
56
+ export declare const default_svelte_config: Parsed_Svelte_Config;
57
+ //# sourceMappingURL=svelte_config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"svelte_config.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/svelte_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,IAAI,YAAY,EAAC,MAAM,eAAe,CAAC;AAC1D,OAAO,KAAK,EAAC,cAAc,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAY7F;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAU,4BAGtC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAgB,KAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAMvF,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB;IAEpC,aAAa,EAAE,YAAY,GAAG,IAAI,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,QAAQ,EAAE,EAAE,GAAG,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,UAAU,EAAE,EAAE,GAAG,UAAU,MAAM,EAAE,GAAG,WAAW,MAAM,EAAE,GAAG,SAAS,CAAC;IAGtE;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,sBAAsB,EAAE,cAAc,CAAC;IACvC,6BAA6B,EAAE,oBAAoB,CAAC;IACpD,oBAAoB,EAAE,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC;CAC/E;AAGD;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAU,sCAGvC;IACF,aAAa,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC;CACV,KAAG,OAAO,CAAC,oBAAoB,CA8C9C,CAAC;AAEF,eAAO,MAAM,iCAAiC,GAAI,sDAM/C,cAAc,KAAG,oBAA2E,CAAC;AAEhG;;GAEG;AACH,eAAO,MAAM,qBAAqB,sBAA8B,CAAC"}
@@ -1,5 +1,6 @@
1
1
  import { join } from 'node:path';
2
- import { SVELTEKIT_CONFIG_FILENAME } from './constants.js';
2
+ import { EMPTY_OBJECT } from '@ryanatkn/belt/object.js';
3
+ import { SVELTE_CONFIG_FILENAME } from './constants.js';
3
4
  /*
4
5
 
5
6
  This module is intended to have minimal dependencies to avoid over-imports in the CLI.
@@ -9,9 +10,9 @@ This module is intended to have minimal dependencies to avoid over-imports in th
9
10
  * Loads a SvelteKit config at `dir`.
10
11
  * @returns `null` if no config is found
11
12
  */
12
- export const load_sveltekit_config = async (dir = process.cwd()) => {
13
+ export const load_svelte_config = async ({ dir = process.cwd(), config_filename = SVELTE_CONFIG_FILENAME, } = EMPTY_OBJECT) => {
13
14
  try {
14
- return (await import(join(dir, SVELTEKIT_CONFIG_FILENAME))).default;
15
+ return (await import(join(dir, config_filename))).default;
15
16
  }
16
17
  catch (_err) {
17
18
  return null;
@@ -20,12 +21,15 @@ export const load_sveltekit_config = async (dir = process.cwd()) => {
20
21
  // TODO currently incomplete and hack - maybe rethink
21
22
  /**
22
23
  * Returns Gro-relevant properties of a SvelteKit config
23
- * as a convenience wrapper around `load_sveltekit_config`.
24
+ * as a convenience wrapper around `load_svelte_config`.
24
25
  * Needed because SvelteKit doesn't expose its config resolver.
25
26
  */
26
- export const init_sveltekit_config = async (dir_or_config = process.cwd()) => {
27
- const sveltekit_config = typeof dir_or_config === 'string' ? await load_sveltekit_config(dir_or_config) : dir_or_config;
28
- const kit = sveltekit_config?.kit;
27
+ export const parse_svelte_config = async ({ dir_or_config = process.cwd(), // TODO maybe not the best API, maybe a type union? `({svelte_config} | {dir}) & {config_filename}`
28
+ config_filename = SVELTE_CONFIG_FILENAME, } = EMPTY_OBJECT) => {
29
+ const svelte_config = typeof dir_or_config === 'string'
30
+ ? await load_svelte_config({ dir: dir_or_config, config_filename })
31
+ : dir_or_config;
32
+ const kit = svelte_config?.kit;
29
33
  const alias = { $lib: 'src/lib', ...kit?.alias };
30
34
  const base_url = kit?.paths?.base;
31
35
  const assets_url = kit?.paths?.assets;
@@ -36,16 +40,16 @@ export const init_sveltekit_config = async (dir_or_config = process.cwd()) => {
36
40
  const env_dir = kit?.env?.dir;
37
41
  const private_prefix = kit?.env?.privatePrefix;
38
42
  const public_prefix = kit?.env?.publicPrefix;
39
- const svelte_compile_options = sveltekit_config?.compilerOptions ?? {};
43
+ const svelte_compile_options = svelte_config?.compilerOptions ?? {};
40
44
  // Change the default to `generate: 'server'`,
41
45
  // because SvelteKit handles the client in the normal cases.
42
46
  if (svelte_compile_options.generate === undefined) {
43
47
  svelte_compile_options.generate = 'server';
44
48
  }
45
49
  const svelte_compile_module_options = to_default_compile_module_options(svelte_compile_options); // TODO will kit have these separately?
46
- const svelte_preprocessors = sveltekit_config?.preprocess;
50
+ const svelte_preprocessors = svelte_config?.preprocess;
47
51
  return {
48
- sveltekit_config,
52
+ svelte_config,
49
53
  alias,
50
54
  base_url,
51
55
  assets_url,
@@ -60,8 +64,8 @@ export const init_sveltekit_config = async (dir_or_config = process.cwd()) => {
60
64
  svelte_preprocessors,
61
65
  };
62
66
  };
63
- export const to_default_compile_module_options = ({ dev, generate, filename, rootDir, }) => ({ dev, generate, filename, rootDir });
67
+ export const to_default_compile_module_options = ({ dev, generate, filename, rootDir, warningFilter, }) => ({ dev, generate, filename, rootDir, warningFilter });
64
68
  /**
65
69
  * The parsed SvelteKit config for the cwd, cached globally at the module level.
66
70
  */
67
- export const default_sveltekit_config = await init_sveltekit_config(); // always load it to keep things simple ahead
71
+ export const default_svelte_config = await parse_svelte_config(); // always load it to keep things simple ahead
@@ -1,7 +1,7 @@
1
1
  import type { Result } from '@ryanatkn/belt/result.js';
2
2
  import type { Logger } from '@ryanatkn/belt/log.js';
3
3
  import { Package_Json } from './package_json.js';
4
- import { type Parsed_Sveltekit_Config } from './sveltekit_config.js';
4
+ import { type Parsed_Svelte_Config } from './svelte_config.js';
5
5
  import { type Cli } from './cli.js';
6
6
  export declare const SVELTEKIT_CLI = "svelte-kit";
7
7
  export declare const SVELTE_CHECK_CLI = "svelte-check";
@@ -10,10 +10,10 @@ export declare const SVELTE_PACKAGE_DEP_NAME = "@sveltejs/package";
10
10
  export declare const VITE_CLI = "vite";
11
11
  export declare const SVELTEKIT_ENV_MATCHER: RegExp;
12
12
  export declare const SVELTEKIT_GLOBAL_SPECIFIER: RegExp;
13
- export declare const has_sveltekit_app: () => Result<object, {
13
+ export declare const has_sveltekit_app: (svelte_config_path?: string) => Result<object, {
14
14
  message: string;
15
15
  }>;
16
- export declare const has_sveltekit_library: (package_json: Package_Json, sveltekit_config?: Parsed_Sveltekit_Config, dep_name?: string) => Result<object, {
16
+ export declare const has_sveltekit_library: (package_json: Package_Json, svelte_config?: Parsed_Svelte_Config, dep_name?: string) => Result<object, {
17
17
  message: string;
18
18
  }>;
19
19
  export declare const sveltekit_sync: (sveltekit_cli?: string | Cli, pm_cli?: string) => Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"sveltekit_helpers.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/sveltekit_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAGlD,OAAO,EAAC,YAAY,EAAU,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAA2B,KAAK,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAmC,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AAIpE,eAAO,MAAM,aAAa,eAAe,CAAC;AAE1C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AACnD,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAE3D,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,eAAO,MAAM,qBAAqB,QAAgD,CAAC;AACnF,eAAO,MAAM,0BAA0B,QAAmB,CAAC;AAE3D,eAAO,MAAM,iBAAiB,QAAO,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAMpE,CAAC;AAEF,eAAO,MAAM,qBAAqB,GACjC,cAAc,YAAY,EAC1B,mBAAkB,uBAAkD,EACpE,iBAAkC,KAChC,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAkBlC,CAAC;AAEF,eAAO,MAAM,cAAc,GAC1B,gBAAe,MAAM,GAAG,GAAmB,EAC3C,eAAuB,KACrB,OAAO,CAAC,IAAI,CASd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,2BAA2B,GACvC,gBAAe,MAAM,GAAG,GAAmB,KACzC,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kCAAkC,GAC9C,gBAAe,MAAM,GAAG,GAAmB,KACzC,OAAO,CAAC,IAAI,CAUd,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACtC;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,kBAAkB,GAC9B,cAAc,YAAY,EAC1B,SAAS,sBAAsB,GAAG,SAAS,EAC3C,KAAK,MAAM,GAAG,GAAG,EACjB,KAAK,MAAM,EACX,QAAQ,MAAM,KACZ,OAAO,CAAC,IAAI,CAmBd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GACjC,WAAW,MAAM,EACjB,SAAS,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAC9B,MASF,CAAC"}
1
+ {"version":3,"file":"sveltekit_helpers.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/sveltekit_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAGlD,OAAO,EAAC,YAAY,EAAU,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAwB,KAAK,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AAEpF,OAAO,EAAmC,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AAIpE,eAAO,MAAM,aAAa,eAAe,CAAC;AAE1C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AACnD,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAE3D,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,eAAO,MAAM,qBAAqB,QAAgD,CAAC;AACnF,eAAO,MAAM,0BAA0B,QAAmB,CAAC;AAE3D,eAAO,MAAM,iBAAiB,GAC7B,qBAAoB,MAA+B,KACjD,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAMlC,CAAC;AAEF,eAAO,MAAM,qBAAqB,GACjC,cAAc,YAAY,EAC1B,gBAAe,oBAA4C,EAC3D,iBAAkC,KAChC,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAkBlC,CAAC;AAEF,eAAO,MAAM,cAAc,GAC1B,gBAAe,MAAM,GAAG,GAAmB,EAC3C,eAAuB,KACrB,OAAO,CAAC,IAAI,CASd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,2BAA2B,GACvC,gBAAe,MAAM,GAAG,GAAmB,KACzC,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kCAAkC,GAC9C,gBAAe,MAAM,GAAG,GAAmB,KACzC,OAAO,CAAC,IAAI,CAUd,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACtC;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,kBAAkB,GAC9B,cAAc,YAAY,EAC1B,SAAS,sBAAsB,GAAG,SAAS,EAC3C,KAAK,MAAM,GAAG,GAAG,EACjB,KAAK,MAAM,EACX,QAAQ,MAAM,KACZ,OAAO,CAAC,IAAI,CAmBd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,qBAAqB,GACjC,WAAW,MAAM,EACjB,SAAS,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAC9B,MASF,CAAC"}
@@ -1,8 +1,8 @@
1
1
  import { existsSync } from 'node:fs';
2
2
  import { join } from 'node:path';
3
3
  import { Package_Json, has_dep } from './package_json.js';
4
- import { default_sveltekit_config } from './sveltekit_config.js';
5
- import { SVELTEKIT_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME, PM_CLI_DEFAULT } from './constants.js';
4
+ import { default_svelte_config } from './svelte_config.js';
5
+ import { SVELTE_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME, PM_CLI_DEFAULT } from './constants.js';
6
6
  import { find_cli, spawn_cli, to_cli_name } from './cli.js';
7
7
  import { Task_Error } from './task.js';
8
8
  import { serialize_args, to_forwarded_args } from './args.js';
@@ -13,20 +13,20 @@ export const SVELTE_PACKAGE_DEP_NAME = '@sveltejs/package';
13
13
  export const VITE_CLI = 'vite';
14
14
  export const SVELTEKIT_ENV_MATCHER = /^\$env\/(static|dynamic)\/(public|private)$/;
15
15
  export const SVELTEKIT_GLOBAL_SPECIFIER = /^\$(env|app)\//;
16
- export const has_sveltekit_app = () => {
17
- if (!existsSync(SVELTEKIT_CONFIG_FILENAME)) {
18
- return { ok: false, message: `no SvelteKit config found at ${SVELTEKIT_CONFIG_FILENAME}` };
16
+ export const has_sveltekit_app = (svelte_config_path = SVELTE_CONFIG_FILENAME) => {
17
+ if (!existsSync(svelte_config_path)) {
18
+ return { ok: false, message: `no SvelteKit config found at ${SVELTE_CONFIG_FILENAME}` };
19
19
  }
20
20
  // TODO check for routes?
21
21
  return { ok: true };
22
22
  };
23
- export const has_sveltekit_library = (package_json, sveltekit_config = default_sveltekit_config, dep_name = SVELTE_PACKAGE_DEP_NAME) => {
23
+ export const has_sveltekit_library = (package_json, svelte_config = default_svelte_config, dep_name = SVELTE_PACKAGE_DEP_NAME) => {
24
24
  const has_sveltekit_app_result = has_sveltekit_app();
25
25
  if (!has_sveltekit_app_result.ok) {
26
26
  return has_sveltekit_app_result;
27
27
  }
28
- if (!existsSync(sveltekit_config.lib_path)) {
29
- return { ok: false, message: `no SvelteKit lib directory found at ${sveltekit_config.lib_path}` };
28
+ if (!existsSync(svelte_config.lib_path)) {
29
+ return { ok: false, message: `no SvelteKit lib directory found at ${svelte_config.lib_path}` };
30
30
  }
31
31
  if (!has_dep(dep_name, package_json)) {
32
32
  return {
@@ -1,4 +1,4 @@
1
- import type { Parsed_Sveltekit_Config } from './sveltekit_config.js';
1
+ import type { Parsed_Svelte_Config } from './svelte_config.js';
2
2
  export declare const SVELTEKIT_SHIM_APP_PATHS_MATCHER: RegExp;
3
3
  export declare const SVELTEKIT_SHIM_APP_ENVIRONMENT_MATCHER: RegExp;
4
4
  /**
@@ -6,6 +6,6 @@ export declare const SVELTEKIT_SHIM_APP_ENVIRONMENT_MATCHER: RegExp;
6
6
  * @see https://kit.svelte.dev/docs/modules
7
7
  */
8
8
  export declare const sveltekit_shim_app_specifiers: Map<string, string>;
9
- export declare const render_sveltekit_shim_app_paths: (base_url?: Parsed_Sveltekit_Config["base_url"], assets_url?: Parsed_Sveltekit_Config["assets_url"]) => string;
9
+ export declare const render_sveltekit_shim_app_paths: (base_url?: Parsed_Svelte_Config["base_url"], assets_url?: Parsed_Svelte_Config["assets_url"]) => string;
10
10
  export declare const render_sveltekit_shim_app_environment: (dev: boolean) => string;
11
11
  //# sourceMappingURL=sveltekit_shim_app.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sveltekit_shim_app.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/sveltekit_shim_app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAEnE,eAAO,MAAM,gCAAgC,QAA0C,CAAC;AACxF,eAAO,MAAM,sCAAsC,QAAgD,CAAC;AAEpG;;;GAGG;AACH,eAAO,MAAM,6BAA6B,qBAMxC,CAAC;AAEH,eAAO,MAAM,+BAA+B,GAC3C,WAAU,uBAAuB,CAAC,UAAU,CAAM,EAClD,aAAY,uBAAuB,CAAC,YAAY,CAAM,KACpD,MAKF,CAAC;AAMF,eAAO,MAAM,qCAAqC,GACjD,KAAK,OAAO,KACV,MAOF,CAAC"}
1
+ {"version":3,"file":"sveltekit_shim_app.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/sveltekit_shim_app.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AAE7D,eAAO,MAAM,gCAAgC,QAA0C,CAAC;AACxF,eAAO,MAAM,sCAAsC,QAAgD,CAAC;AAEpG;;;GAGG;AACH,eAAO,MAAM,6BAA6B,qBAMxC,CAAC;AAEH,eAAO,MAAM,+BAA+B,GAC3C,WAAU,oBAAoB,CAAC,UAAU,CAAM,EAC/C,aAAY,oBAAoB,CAAC,YAAY,CAAM,KACjD,MAKF,CAAC;AAMF,eAAO,MAAM,qCAAqC,GACjD,KAAK,OAAO,KACV,MAOF,CAAC"}
package/dist/task.d.ts CHANGED
@@ -5,7 +5,7 @@ import type { Result } from '@ryanatkn/belt/result.js';
5
5
  import type { Args } from './args.js';
6
6
  import type { Path_Id } from './path.js';
7
7
  import type { Gro_Config } from './gro_config.js';
8
- import type { Parsed_Sveltekit_Config } from './sveltekit_config.js';
8
+ import type { Parsed_Svelte_Config } from './svelte_config.js';
9
9
  import { type Input_Path, type Resolved_Input_File, type Resolved_Input_Path } from './input_path.js';
10
10
  import { type Load_Modules_Failure, type Module_Meta } from './modules.js';
11
11
  import type { Filer } from './filer.js';
@@ -18,7 +18,7 @@ T_Args_Schema extends z.ZodType = z.ZodType, T_Return = unknown> {
18
18
  export interface Task_Context<T_Args = object> {
19
19
  args: T_Args;
20
20
  config: Gro_Config;
21
- sveltekit_config: Parsed_Sveltekit_Config;
21
+ svelte_config: Parsed_Svelte_Config;
22
22
  filer: Filer;
23
23
  log: Logger;
24
24
  timings: Timings;
@@ -1 +1 @@
1
- {"version":3,"file":"task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/task.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/task.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/upgrade.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAGtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAOhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BP,CAAC;AACX,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CAkE3B,CAAC"}
1
+ {"version":3,"file":"upgrade.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/upgrade.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAGtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAOhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BP,CAAC;AACX,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA2E3B,CAAC"}
@@ -48,9 +48,11 @@ export const task = {
48
48
  await git_pull(origin);
49
49
  }
50
50
  if (delete_node_modules) {
51
+ log.info(`deleting node_modules at `, node_modules_path);
51
52
  rmSync(node_modules_path, { recursive: true, force: true });
52
53
  }
53
54
  if (delete_lockfile) {
55
+ log.info(`deleting lockfile at`, lockfile_path);
54
56
  rmSync(lockfile_path, { force: true });
55
57
  }
56
58
  const package_json = load_package_json();
@@ -73,6 +75,12 @@ export const task = {
73
75
  }
74
76
  install_args.push(...serialize_args(to_forwarded_args(config.pm_cli)));
75
77
  await spawn(config.pm_cli, install_args);
78
+ // If we deleted the lockfile or node modules, `npm install` again
79
+ // to fix a recurring npm bug getting the lockfile to its final state.
80
+ if (!dry && (delete_node_modules || delete_lockfile)) {
81
+ log.info(`installing again to fix npm lockfile bugs`);
82
+ await spawn(config.pm_cli, ['install']);
83
+ }
76
84
  // Sync in a new process to pick up any changes after installing, avoiding some errors.
77
85
  await spawn_cli('gro', ['sync', '--no-install']); // don't install because we do above
78
86
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ryanatkn/gro",
3
- "version": "0.152.0",
3
+ "version": "0.153.1",
4
4
  "description": "task runner and toolkit extending SvelteKit",
5
5
  "motto": "generate, run, optimize",
6
6
  "glyph": "🌰",
@@ -69,7 +69,7 @@
69
69
  "@changesets/changelog-git": "^0.2.1",
70
70
  "@changesets/types": "^6.1.0",
71
71
  "@ryanatkn/eslint-config": "^0.8.0",
72
- "@ryanatkn/fuz": "^0.139.1",
72
+ "@ryanatkn/fuz": "^0.139.2",
73
73
  "@ryanatkn/moss": "^0.26.0",
74
74
  "@sveltejs/adapter-static": "^3.0.8",
75
75
  "@sveltejs/kit": "^2.20.8",
@@ -86,7 +86,7 @@
86
86
  "uvu": "^0.5.6"
87
87
  },
88
88
  "optionalDependencies": {
89
- "@ryanatkn/moss": "^0.26.0"
89
+ "@ryanatkn/moss": "^0.27.0"
90
90
  },
91
91
  "prettier": {
92
92
  "plugins": [
@@ -384,14 +384,14 @@
384
384
  "types": "./dist/src_json.d.ts",
385
385
  "default": "./dist/src_json.js"
386
386
  },
387
+ "./svelte_config.js": {
388
+ "types": "./dist/svelte_config.d.ts",
389
+ "default": "./dist/svelte_config.js"
390
+ },
387
391
  "./svelte_helpers.js": {
388
392
  "types": "./dist/svelte_helpers.d.ts",
389
393
  "default": "./dist/svelte_helpers.js"
390
394
  },
391
- "./sveltekit_config.js": {
392
- "types": "./dist/sveltekit_config.d.ts",
393
- "default": "./dist/sveltekit_config.js"
394
- },
395
395
  "./sveltekit_helpers.js": {
396
396
  "types": "./dist/sveltekit_helpers.d.ts",
397
397
  "default": "./dist/sveltekit_helpers.js"
@@ -75,7 +75,7 @@ export const task: Task<Args> = {
75
75
  changeset_cli,
76
76
  },
77
77
  log,
78
- sveltekit_config,
78
+ svelte_config,
79
79
  config,
80
80
  } = ctx;
81
81
 
@@ -93,7 +93,7 @@ export const task: Task<Args> = {
93
93
 
94
94
  const package_json = load_package_json();
95
95
 
96
- const has_sveltekit_library_result = has_sveltekit_library(package_json, sveltekit_config);
96
+ const has_sveltekit_library_result = has_sveltekit_library(package_json, svelte_config);
97
97
  if (!has_sveltekit_library_result.ok) {
98
98
  throw new Task_Error(
99
99
  'Failed to find SvelteKit library: ' + has_sveltekit_library_result.message,
@@ -17,7 +17,7 @@ export const GRO_DIR = GRO_DIRNAME + '/';
17
17
  export const GRO_DEV_DIR = GRO_DEV_DIRNAME + '/';
18
18
  export const GRO_CONFIG_PATH = 'gro.config.ts';
19
19
  export const README_FILENAME = 'README.md';
20
- export const SVELTEKIT_CONFIG_FILENAME = 'svelte.config.js';
20
+ export const SVELTE_CONFIG_FILENAME = 'svelte.config.js';
21
21
  export const VITE_CONFIG_FILENAME = 'vite.config.ts';
22
22
  export const NODE_MODULES_DIRNAME = 'node_modules';
23
23
  export const LOCKFILE_FILENAME = 'package-lock.json';
@@ -2,7 +2,7 @@ import {styleText as st} from 'node:util';
2
2
  import type {Logger} from '@ryanatkn/belt/log.js';
3
3
  import type * as esbuild from 'esbuild';
4
4
 
5
- import type {Parsed_Sveltekit_Config} from './sveltekit_config.js';
5
+ import type {Parsed_Svelte_Config} from './svelte_config.js';
6
6
 
7
7
  export const print_build_result = (log: Logger, build_result: esbuild.BuildResult): void => {
8
8
  for (const error of build_result.errors) {
@@ -28,7 +28,7 @@ const import_meta_env = 'import.' + 'meta.env.'; // eslint-disable-line no-usele
28
28
  */
29
29
  export const to_define_import_meta_env = (
30
30
  dev: boolean,
31
- base_url: Parsed_Sveltekit_Config['base_url'],
31
+ base_url: Parsed_Svelte_Config['base_url'],
32
32
  ssr = true,
33
33
  mode = dev ? 'development' : 'production',
34
34
  ): Record<string, string> => ({