@ryanatkn/gro 0.142.0 → 0.143.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 (90) hide show
  1. package/dist/build.task.js +1 -1
  2. package/dist/changeset.task.js +3 -3
  3. package/dist/check.task.d.ts.map +1 -1
  4. package/dist/check.task.js +4 -2
  5. package/dist/clean_fs.js +1 -1
  6. package/dist/cli.js +1 -1
  7. package/dist/{path_constants.d.ts → constants.d.ts} +4 -1
  8. package/dist/constants.d.ts.map +1 -0
  9. package/dist/{path_constants.js → constants.js} +3 -0
  10. package/dist/deploy.task.js +1 -1
  11. package/dist/dev.task.js +1 -1
  12. package/dist/esbuild_plugin_svelte.js +1 -1
  13. package/dist/esbuild_plugin_sveltekit_local_imports.js +1 -1
  14. package/dist/esbuild_plugin_sveltekit_shim_app.js +1 -1
  15. package/dist/esbuild_plugin_sveltekit_shim_env.js +1 -1
  16. package/dist/format.task.d.ts.map +1 -1
  17. package/dist/format.task.js +2 -2
  18. package/dist/format_directory.d.ts +1 -1
  19. package/dist/format_directory.d.ts.map +1 -1
  20. package/dist/format_directory.js +5 -6
  21. package/dist/gen.task.js +1 -1
  22. package/dist/gro_config.d.ts +7 -2
  23. package/dist/gro_config.d.ts.map +1 -1
  24. package/dist/gro_config.js +9 -7
  25. package/dist/gro_helpers.d.ts +1 -1
  26. package/dist/gro_helpers.d.ts.map +1 -1
  27. package/dist/gro_helpers.js +3 -3
  28. package/dist/gro_plugin_server.js +4 -4
  29. package/dist/gro_plugin_sveltekit_app.d.ts.map +1 -1
  30. package/dist/gro_plugin_sveltekit_app.js +5 -5
  31. package/dist/gro_plugin_sveltekit_library.js +3 -3
  32. package/dist/loader.js +1 -1
  33. package/dist/module.js +1 -1
  34. package/dist/moss_helpers.d.ts +1 -1
  35. package/dist/moss_helpers.d.ts.map +1 -1
  36. package/dist/moss_helpers.js +3 -3
  37. package/dist/package.d.ts +11 -11
  38. package/dist/package.d.ts.map +1 -1
  39. package/dist/package.js +39 -39
  40. package/dist/package_json.js +2 -2
  41. package/dist/package_meta.d.ts +1 -1
  42. package/dist/parse_imports.js +1 -1
  43. package/dist/paths.js +1 -1
  44. package/dist/publish.task.d.ts.map +1 -1
  45. package/dist/publish.task.js +4 -12
  46. package/dist/reinstall.task.js +10 -10
  47. package/dist/resolve_node_specifier.js +2 -2
  48. package/dist/run_task.js +1 -1
  49. package/dist/sveltekit_config.js +1 -1
  50. package/dist/sveltekit_helpers.d.ts +3 -3
  51. package/dist/sveltekit_helpers.d.ts.map +1 -1
  52. package/dist/sveltekit_helpers.js +7 -7
  53. package/dist/sync.task.js +5 -5
  54. package/package.json +6 -6
  55. package/src/lib/build.task.ts +1 -1
  56. package/src/lib/changeset.task.ts +3 -3
  57. package/src/lib/check.task.ts +4 -2
  58. package/src/lib/clean_fs.ts +1 -1
  59. package/src/lib/cli.ts +1 -1
  60. package/src/lib/{path_constants.ts → constants.ts} +4 -0
  61. package/src/lib/deploy.task.ts +1 -1
  62. package/src/lib/dev.task.ts +1 -1
  63. package/src/lib/esbuild_plugin_svelte.ts +1 -1
  64. package/src/lib/esbuild_plugin_sveltekit_local_imports.ts +1 -1
  65. package/src/lib/esbuild_plugin_sveltekit_shim_app.ts +1 -1
  66. package/src/lib/esbuild_plugin_sveltekit_shim_env.ts +1 -1
  67. package/src/lib/format.task.ts +10 -2
  68. package/src/lib/format_directory.ts +10 -9
  69. package/src/lib/gen.task.ts +1 -1
  70. package/src/lib/gro_config.ts +16 -6
  71. package/src/lib/gro_helpers.ts +3 -2
  72. package/src/lib/gro_plugin_server.ts +4 -4
  73. package/src/lib/gro_plugin_sveltekit_app.ts +7 -5
  74. package/src/lib/gro_plugin_sveltekit_library.ts +3 -3
  75. package/src/lib/loader.ts +1 -1
  76. package/src/lib/module.ts +1 -1
  77. package/src/lib/moss_helpers.ts +3 -2
  78. package/src/lib/package.ts +39 -39
  79. package/src/lib/package_json.ts +2 -2
  80. package/src/lib/package_meta.ts +1 -1
  81. package/src/lib/parse_imports.ts +1 -1
  82. package/src/lib/paths.ts +1 -1
  83. package/src/lib/publish.task.ts +4 -13
  84. package/src/lib/reinstall.task.ts +10 -10
  85. package/src/lib/resolve_node_specifier.ts +2 -2
  86. package/src/lib/run_task.ts +1 -1
  87. package/src/lib/sveltekit_config.ts +1 -1
  88. package/src/lib/sveltekit_helpers.ts +7 -4
  89. package/src/lib/sync.task.ts +5 -5
  90. package/dist/path_constants.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.142.0',
4
+ version: '0.143.1',
5
5
  description: 'task runner and toolkit extending SvelteKit',
6
6
  motto: 'generate, run, optimize',
7
7
  glyph: '🌰',
@@ -51,7 +51,7 @@ export const package_json = {
51
51
  tslib: '^2.8.0',
52
52
  zod: '^3.23.8',
53
53
  },
54
- peerDependencies: { esbuild: '^0.21.0', svelte: '^5.0.0-next.0' },
54
+ peerDependencies: { esbuild: '^0.21.0', svelte: '^5' },
55
55
  devDependencies: {
56
56
  '@changesets/changelog-git': '^0.2.0',
57
57
  '@changesets/types': '^6.0.0',
@@ -102,6 +102,7 @@ export const package_json = {
102
102
  './clean.task.js': { types: './dist/clean.task.d.ts', default: './dist/clean.task.js' },
103
103
  './cli.js': { types: './dist/cli.d.ts', default: './dist/cli.js' },
104
104
  './commit.task.js': { types: './dist/commit.task.d.ts', default: './dist/commit.task.js' },
105
+ './constants.js': { types: './dist/constants.d.ts', default: './dist/constants.js' },
105
106
  './deploy.task.js': { types: './dist/deploy.task.d.ts', default: './dist/deploy.task.js' },
106
107
  './dev.task.js': { types: './dist/dev.task.d.ts', default: './dist/dev.task.js' },
107
108
  './env.js': { types: './dist/env.d.ts', default: './dist/env.js' },
@@ -182,10 +183,6 @@ export const package_json = {
182
183
  './package.gen.js': { types: './dist/package.gen.d.ts', default: './dist/package.gen.js' },
183
184
  './package.js': { types: './dist/package.d.ts', default: './dist/package.js' },
184
185
  './parse_imports.js': { types: './dist/parse_imports.d.ts', default: './dist/parse_imports.js' },
185
- './path_constants.js': {
186
- types: './dist/path_constants.d.ts',
187
- default: './dist/path_constants.js',
188
- },
189
186
  './path.js': { types: './dist/path.d.ts', default: './dist/path.js' },
190
187
  './paths.js': { types: './dist/paths.d.ts', default: './dist/paths.js' },
191
188
  './plugin.js': { types: './dist/plugin.d.ts', default: './dist/plugin.js' },
@@ -264,7 +261,7 @@ export const package_json = {
264
261
  };
265
262
  export const src_json = {
266
263
  name: '@ryanatkn/gro',
267
- version: '0.142.0',
264
+ version: '0.143.1',
268
265
  modules: {
269
266
  '.': {
270
267
  path: 'index.ts',
@@ -359,6 +356,39 @@ export const src_json = {
359
356
  { name: 'task', kind: 'variable' },
360
357
  ],
361
358
  },
359
+ './constants.js': {
360
+ path: 'constants.ts',
361
+ declarations: [
362
+ { name: 'SOURCE_DIRNAME', kind: 'variable' },
363
+ { name: 'GRO_DIRNAME', kind: 'variable' },
364
+ { name: 'GRO_DIST_PREFIX', kind: 'variable' },
365
+ { name: 'SERVER_DIST_PATH', kind: 'variable' },
366
+ { name: 'GRO_DEV_DIRNAME', kind: 'variable' },
367
+ { name: 'SOURCE_DIR', kind: 'variable' },
368
+ { name: 'GRO_DIR', kind: 'variable' },
369
+ { name: 'GRO_DEV_DIR', kind: 'variable' },
370
+ { name: 'GRO_CONFIG_PATH', kind: 'variable' },
371
+ { name: 'README_FILENAME', kind: 'variable' },
372
+ { name: 'SVELTEKIT_CONFIG_FILENAME', kind: 'variable' },
373
+ { name: 'VITE_CONFIG_FILENAME', kind: 'variable' },
374
+ { name: 'NODE_MODULES_DIRNAME', kind: 'variable' },
375
+ { name: 'LOCKFILE_FILENAME', kind: 'variable' },
376
+ { name: 'SVELTEKIT_DEV_DIRNAME', kind: 'variable' },
377
+ { name: 'SVELTEKIT_BUILD_DIRNAME', kind: 'variable' },
378
+ { name: 'SVELTEKIT_DIST_DIRNAME', kind: 'variable' },
379
+ { name: 'SVELTEKIT_VITE_CACHE_PATH', kind: 'variable' },
380
+ { name: 'GITHUB_DIRNAME', kind: 'variable' },
381
+ { name: 'GIT_DIRNAME', kind: 'variable' },
382
+ { name: 'TSCONFIG_FILENAME', kind: 'variable' },
383
+ { name: 'TS_MATCHER', kind: 'variable' },
384
+ { name: 'JS_MATCHER', kind: 'variable' },
385
+ { name: 'JSON_MATCHER', kind: 'variable' },
386
+ { name: 'EVERYTHING_MATCHER', kind: 'variable' },
387
+ { name: 'JS_CLI_DEFAULT', kind: 'variable' },
388
+ { name: 'PM_CLI_DEFAULT', kind: 'variable' },
389
+ { name: 'PRETTIER_CLI_DEFAULT', kind: 'variable' },
390
+ ],
391
+ },
362
392
  './deploy.task.js': {
363
393
  path: 'deploy.task.ts',
364
394
  declarations: [
@@ -539,8 +569,8 @@ export const src_json = {
539
569
  { name: 'Raw_Gro_Config', kind: 'type' },
540
570
  { name: 'Create_Gro_Config', kind: 'type' },
541
571
  { name: 'create_empty_gro_config', kind: 'function' },
542
- { name: 'DEFAULT_SEARCH_EXCLUDER', kind: 'variable' },
543
- { name: 'DEFAULT_EXPORTS_EXCLUDER', kind: 'variable' },
572
+ { name: 'SEARCH_EXCLUDER_DEFAULT', kind: 'variable' },
573
+ { name: 'EXPORTS_EXCLUDER_DEFAULT', kind: 'variable' },
544
574
  { name: 'normalize_gro_config', kind: 'function' },
545
575
  { name: 'Gro_Config_Module', kind: 'type' },
546
576
  { name: 'load_gro_config', kind: 'function' },
@@ -710,36 +740,6 @@ export const src_json = {
710
740
  { name: 'parse_imports', kind: 'function' },
711
741
  ],
712
742
  },
713
- './path_constants.js': {
714
- path: 'path_constants.ts',
715
- declarations: [
716
- { name: 'SOURCE_DIRNAME', kind: 'variable' },
717
- { name: 'GRO_DIRNAME', kind: 'variable' },
718
- { name: 'GRO_DIST_PREFIX', kind: 'variable' },
719
- { name: 'SERVER_DIST_PATH', kind: 'variable' },
720
- { name: 'GRO_DEV_DIRNAME', kind: 'variable' },
721
- { name: 'SOURCE_DIR', kind: 'variable' },
722
- { name: 'GRO_DIR', kind: 'variable' },
723
- { name: 'GRO_DEV_DIR', kind: 'variable' },
724
- { name: 'GRO_CONFIG_PATH', kind: 'variable' },
725
- { name: 'README_FILENAME', kind: 'variable' },
726
- { name: 'SVELTEKIT_CONFIG_FILENAME', kind: 'variable' },
727
- { name: 'VITE_CONFIG_FILENAME', kind: 'variable' },
728
- { name: 'NODE_MODULES_DIRNAME', kind: 'variable' },
729
- { name: 'LOCKFILE_FILENAME', kind: 'variable' },
730
- { name: 'SVELTEKIT_DEV_DIRNAME', kind: 'variable' },
731
- { name: 'SVELTEKIT_BUILD_DIRNAME', kind: 'variable' },
732
- { name: 'SVELTEKIT_DIST_DIRNAME', kind: 'variable' },
733
- { name: 'SVELTEKIT_VITE_CACHE_PATH', kind: 'variable' },
734
- { name: 'GITHUB_DIRNAME', kind: 'variable' },
735
- { name: 'GIT_DIRNAME', kind: 'variable' },
736
- { name: 'TSCONFIG_FILENAME', kind: 'variable' },
737
- { name: 'TS_MATCHER', kind: 'variable' },
738
- { name: 'JS_MATCHER', kind: 'variable' },
739
- { name: 'JSON_MATCHER', kind: 'variable' },
740
- { name: 'EVERYTHING_MATCHER', kind: 'variable' },
741
- ],
742
- },
743
743
  './path.js': {
744
744
  path: 'path.ts',
745
745
  declarations: [
@@ -4,7 +4,7 @@ import { readFileSync, writeFileSync } from 'node:fs';
4
4
  import { count_graphemes, plural, strip_end } from '@ryanatkn/belt/string.js';
5
5
  import { styleText as st } from 'node:util';
6
6
  import { paths, gro_paths, IS_THIS_GRO, replace_extension } from './paths.js';
7
- import { SVELTEKIT_DIST_DIRNAME } from './path_constants.js';
7
+ import { SVELTEKIT_DIST_DIRNAME } from './constants.js';
8
8
  import { search_fs } from './search_fs.js';
9
9
  import { has_sveltekit_library } from './sveltekit_helpers.js';
10
10
  import { GITHUB_REPO_MATCHER } from './github.js';
@@ -68,7 +68,7 @@ export const Package_Json = z
68
68
  // according to the npm docs, `name` and `version` are the only required properties
69
69
  name: z.string(),
70
70
  version: z.string(),
71
- private: z.boolean({ description: 'disallow npm publish' }).optional(),
71
+ private: z.boolean({ description: 'disallow publishing to the configured registry' }).optional(),
72
72
  public: z
73
73
  .boolean({
74
74
  description: 'a Gro extension that enables publishing `.well-known/package.json` and `.well-known/src`',
@@ -7,7 +7,7 @@ export interface Package_Meta {
7
7
  name: string;
8
8
  repo_name: string;
9
9
  /**
10
- * the is the github user/org, not npm
10
+ * The github user/org.
11
11
  */
12
12
  owner_name: string | null;
13
13
  homepage_url: Url | null;
@@ -1,6 +1,6 @@
1
1
  import { init, parse } from 'es-module-lexer';
2
2
  import { SVELTE_MATCHER } from './svelte_helpers.js';
3
- import { JS_MATCHER, TS_MATCHER } from './path_constants.js';
3
+ import { JS_MATCHER, TS_MATCHER } from './constants.js';
4
4
  export const init_lexer = () => init;
5
5
  const script_matcher = /<script.*?>(.*?)<\/script>/gimsu;
6
6
  export const parse_imports = (id, contents, ignore_types = true) => {
package/dist/paths.js CHANGED
@@ -2,7 +2,7 @@ import { join, extname, relative, basename } from 'node:path';
2
2
  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
- import { GRO_CONFIG_PATH, GRO_DEV_DIR, GRO_DIR, SOURCE_DIR, SVELTEKIT_DIST_DIRNAME, } from './path_constants.js';
5
+ import { GRO_CONFIG_PATH, GRO_DEV_DIR, GRO_DIR, SOURCE_DIR, SVELTEKIT_DIST_DIRNAME, } from './constants.js';
6
6
  import { default_sveltekit_config } from './sveltekit_config.js';
7
7
  /*
8
8
 
@@ -1 +1 @@
1
- {"version":3,"file":"publish.task.d.ts","sourceRoot":"../src/lib/","sources":["publish.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAItB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAuBhD,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,CA0I3B,CAAC"}
1
+ {"version":3,"file":"publish.task.d.ts","sourceRoot":"../src/lib/","sources":["publish.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAItB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAgBhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyBP,CAAC;AACX,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA0I3B,CAAC"}
@@ -10,12 +10,6 @@ import { update_changelog } from './changelog.js';
10
10
  import { load_from_env } from './env.js';
11
11
  import { Git_Branch, Git_Origin, git_check_clean_workspace, git_checkout, git_fetch, git_pull, } from './git.js';
12
12
  import { CHANGESET_CLI } from './changeset_helpers.js';
13
- // publish.task.ts
14
- // - usage: `gro publish patch`
15
- // - forwards args to `npm version`: https://docs.npmjs.com/v6/commands/npm-version
16
- // - runs the production build
17
- // - publishes to npm from the `main` branch, configurable with `--branch`
18
- // - syncs commits and tags to the configured main branch
19
13
  export const Args = z
20
14
  .object({
21
15
  branch: Git_Branch.describe('branch to publish from').default('main'),
@@ -33,9 +27,7 @@ export const Args = z
33
27
  .boolean({ description: 'build and prepare to publish without actually publishing' })
34
28
  .default(false),
35
29
  check: z.boolean({ description: 'dual of no-check' }).default(true),
36
- 'no-check': z
37
- .boolean({ description: 'opt out of npm checking before publishing' })
38
- .default(false),
30
+ 'no-check': z.boolean({ description: 'opt out of checking before publishing' }).default(false),
39
31
  build: z.boolean({ description: 'dual of no-build' }).default(true),
40
32
  'no-build': z.boolean({ description: 'opt out of building' }).default(false),
41
33
  pull: z.boolean({ description: 'dual of no-pull' }).default(true),
@@ -44,7 +36,7 @@ export const Args = z
44
36
  })
45
37
  .strict();
46
38
  export const task = {
47
- summary: 'bump version, publish to npm, and git push',
39
+ summary: 'bump version, publish to the configured registry, and git push',
48
40
  Args,
49
41
  run: async ({ args, log, invoke_task }) => {
50
42
  const { branch, origin, changelog, preserve_changelog, dry, check, build, pull, optional, changeset_cli, } = args;
@@ -135,8 +127,8 @@ export const task = {
135
127
  log.info(st('green', 'dry run complete!'));
136
128
  return;
137
129
  }
138
- const npm_publish_result = await spawn_cli(found_changeset_cli, ['publish'], log);
139
- if (!npm_publish_result?.ok) {
130
+ const changeset_publish_result = await spawn_cli(found_changeset_cli, ['publish'], log);
131
+ if (!changeset_publish_result?.ok) {
140
132
  throw new Task_Error(`\`${changeset_cli} publish\` failed - continue manually or try again after running \`git reset --hard\``);
141
133
  }
142
134
  if (!changelog_exists && existsSync(changelog)) {
@@ -2,31 +2,31 @@ import { z } from 'zod';
2
2
  import { spawn } from '@ryanatkn/belt/process.js';
3
3
  import { rm } from 'node:fs/promises';
4
4
  import { Task_Error } from './task.js';
5
- import { LOCKFILE_FILENAME, NODE_MODULES_DIRNAME } from './path_constants.js';
5
+ import { LOCKFILE_FILENAME, NODE_MODULES_DIRNAME } from './constants.js';
6
6
  export const Args = z.object({}).strict();
7
7
  export const task = {
8
8
  summary: `refreshes ${LOCKFILE_FILENAME} with the latest and cleanest deps`,
9
9
  Args,
10
10
  run: async ({ log, config }) => {
11
- log.info('running the initial npm install');
12
- const initial_install_result = await spawn(config.pm_cli, ['i']);
11
+ log.info(`running the initial \`${config.pm_cli} install\``);
12
+ const initial_install_result = await spawn(config.pm_cli, ['install']);
13
13
  if (!initial_install_result.ok) {
14
- throw new Task_Error('Failed initial npm install');
14
+ throw new Task_Error(`Failed initial \`${config.pm_cli} install\``);
15
15
  }
16
16
  // Deleting both the lockfile and node_modules upgrades to the latest minor/patch versions.
17
17
  await Promise.all([rm(LOCKFILE_FILENAME), rm(NODE_MODULES_DIRNAME, { recursive: true })]);
18
- log.info(`running npm install after deleting ${LOCKFILE_FILENAME} and ${NODE_MODULES_DIRNAME}, this can take a while...`);
19
- const second_install_result = await spawn(config.pm_cli, ['i']);
18
+ log.info(`running \`${config.pm_cli} install\` after deleting ${LOCKFILE_FILENAME} and ${NODE_MODULES_DIRNAME}, this can take a while...`);
19
+ const second_install_result = await spawn(config.pm_cli, ['install']);
20
20
  if (!second_install_result.ok) {
21
- throw new Task_Error(`Failed npm install after deleting ${LOCKFILE_FILENAME} and ${NODE_MODULES_DIRNAME}`);
21
+ throw new Task_Error(`Failed \`${config.pm_cli} install\` after deleting ${LOCKFILE_FILENAME} and ${NODE_MODULES_DIRNAME}`);
22
22
  }
23
23
  // Deleting the lockfile and reinstalling cleans the lockfile of unnecessary dep noise,
24
24
  // like esbuild's many packages for each platform.
25
25
  await rm(LOCKFILE_FILENAME);
26
- log.info(`running npm install one last time to clean ${LOCKFILE_FILENAME}`);
27
- const final_install_result = await spawn(config.pm_cli, ['i']);
26
+ log.info(`running \`${config.pm_cli} install\` one last time to clean ${LOCKFILE_FILENAME}`);
27
+ const final_install_result = await spawn(config.pm_cli, ['install']);
28
28
  if (!final_install_result.ok) {
29
- throw new Task_Error('Failed npm install');
29
+ throw new Task_Error(`Failed \`${config.pm_cli} install\``);
30
30
  }
31
31
  },
32
32
  };
@@ -3,7 +3,7 @@ import { existsSync } from 'node:fs';
3
3
  import { DEV } from 'esm-env';
4
4
  import { Package_Json, Package_Json_Exports, load_package_json } from './package_json.js';
5
5
  import { paths } from './paths.js';
6
- import { NODE_MODULES_DIRNAME } from './path_constants.js';
6
+ import { NODE_MODULES_DIRNAME } from './constants.js';
7
7
  /**
8
8
  * Like `resolve_specifier` but for Node specifiers,
9
9
  * typically those that aren't relative or absolute.
@@ -38,7 +38,7 @@ exports_condition = DEV ? 'development' : 'default') => {
38
38
  const package_dir = join(dir, NODE_MODULES_DIRNAME, pkg_name);
39
39
  if (!existsSync(package_dir)) {
40
40
  if (throw_on_missing_package) {
41
- throw Error(`Package not found at ${package_dir} for specifier ${specifier}, you may need to npm install or fix the path` +
41
+ throw Error(`Package not found at ${package_dir} for specifier ${specifier}, you may need to install packages or fix the path` +
42
42
  (parent_path ? ` imported from ${parent_path}` : ''));
43
43
  }
44
44
  else {
package/dist/run_task.js CHANGED
@@ -40,7 +40,7 @@ export const run_task = async (task_meta, unparsed_args, invoke_task, config, fi
40
40
  ok: false,
41
41
  reason: st('red', err?.constructor?.name === 'Task_Error'
42
42
  ? err.message
43
- : `Unexpected error running task ${st('cyan', task_meta.name)}. If this is unexpected try running \`npm i\` and \`gro clean\`.`),
43
+ : `Unexpected error running task ${st('cyan', task_meta.name)}. If this is unexpected try running \`${config.pm_cli} install\` and \`gro clean\`.`),
44
44
  error: err,
45
45
  };
46
46
  }
@@ -1,5 +1,5 @@
1
1
  import { join } from 'node:path';
2
- import { SVELTEKIT_CONFIG_FILENAME } from './path_constants.js';
2
+ import { SVELTEKIT_CONFIG_FILENAME } from './constants.js';
3
3
  /*
4
4
 
5
5
  This module is intended to have minimal dependencies to avoid over-imports in the CLI.
@@ -12,10 +12,10 @@ export declare const SVELTEKIT_ENV_MATCHER: RegExp;
12
12
  export declare const has_sveltekit_app: () => Result<object, {
13
13
  message: string;
14
14
  }>;
15
- export declare const has_sveltekit_library: (package_json?: Package_Json, sveltekit_config?: Parsed_Sveltekit_Config, dep_name?: string) => Result<object, {
15
+ export declare const has_sveltekit_library: (package_json?: Package_Json, sveltekit_config?: Parsed_Sveltekit_Config, dep_name?: string, pm_cli?: string) => Result<object, {
16
16
  message: string;
17
17
  }>;
18
- export declare const sveltekit_sync: (sveltekit_cli?: string | Cli) => Promise<void>;
18
+ export declare const sveltekit_sync: (sveltekit_cli?: string | Cli, pm_cli?: string) => Promise<void>;
19
19
  /**
20
20
  * If the SvelteKit CLI is found and its `.svelte-kit` directory is not, run `svelte-kit sync`.
21
21
  */
@@ -73,7 +73,7 @@ export interface Svelte_Package_Options {
73
73
  */
74
74
  tsconfig?: string;
75
75
  }
76
- export declare const run_svelte_package: (options: Svelte_Package_Options | undefined, cli: string | Cli, log: Logger) => Promise<void>;
76
+ export declare const run_svelte_package: (options: Svelte_Package_Options | undefined, cli: string | Cli, log: Logger, pm_cli: string) => Promise<void>;
77
77
  /**
78
78
  * Map an import specifier with the SvelteKit aliases.
79
79
  */
@@ -1 +1 @@
1
- {"version":3,"file":"sveltekit_helpers.d.ts","sourceRoot":"../src/lib/","sources":["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;AAEnF,eAAO,MAAM,iBAAiB,QAAO,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAMpE,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBAClB,YAAY,qBACT,uBAAuB,wBAEvC,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAkBlC,CAAC;AAEF,eAAO,MAAM,cAAc,mBACX,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CASd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,2BAA2B,mBACxB,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kCAAkC,mBAC/B,MAAM,GAAG,GAAG,KACzB,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,YACrB,sBAAsB,GAAG,SAAS,OACtC,MAAM,GAAG,GAAG,OACZ,MAAM,KACT,OAAO,CAAC,IAAI,CAmBd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,qBAAqB,cACtB,MAAM,WACR,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAC9B,MASF,CAAC"}
1
+ {"version":3,"file":"sveltekit_helpers.d.ts","sourceRoot":"../src/lib/","sources":["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;AAEnF,eAAO,MAAM,iBAAiB,QAAO,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAMpE,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBAClB,YAAY,qBACT,uBAAuB,yCAGvC,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAkBlC,CAAC;AAEF,eAAO,MAAM,cAAc,mBACX,MAAM,GAAG,GAAG,sBAEzB,OAAO,CAAC,IAAI,CASd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,2BAA2B,mBACxB,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kCAAkC,mBAC/B,MAAM,GAAG,GAAG,KACzB,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,YACrB,sBAAsB,GAAG,SAAS,OACtC,MAAM,GAAG,GAAG,OACZ,MAAM,UACH,MAAM,KACZ,OAAO,CAAC,IAAI,CAmBd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,qBAAqB,cACtB,MAAM,WACR,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAC9B,MASF,CAAC"}
@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
2
2
  import { join } from 'node:path';
3
3
  import { Package_Json, has_dep } from './package_json.js';
4
4
  import { default_sveltekit_config } from './sveltekit_config.js';
5
- import { SVELTEKIT_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME } from './path_constants.js';
5
+ import { SVELTEKIT_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';
@@ -19,7 +19,7 @@ export const has_sveltekit_app = () => {
19
19
  // TODO check for routes?
20
20
  return { ok: true };
21
21
  };
22
- export const has_sveltekit_library = (package_json, sveltekit_config = default_sveltekit_config, dep_name = SVELTE_PACKAGE_DEP_NAME) => {
22
+ export const has_sveltekit_library = (package_json, sveltekit_config = default_sveltekit_config, dep_name = SVELTE_PACKAGE_DEP_NAME, pm_cli = PM_CLI_DEFAULT) => {
23
23
  const has_sveltekit_app_result = has_sveltekit_app();
24
24
  if (!has_sveltekit_app_result.ok) {
25
25
  return has_sveltekit_app_result;
@@ -30,15 +30,15 @@ export const has_sveltekit_library = (package_json, sveltekit_config = default_s
30
30
  if (!has_dep(dep_name, package_json)) {
31
31
  return {
32
32
  ok: false,
33
- message: `no dependency found in package.json for ${dep_name}, install it with \`npm i -D ${dep_name}\``,
33
+ message: `no dependency found in package.json for ${dep_name}, install it with \`${pm_cli} install -D ${dep_name}\``,
34
34
  };
35
35
  }
36
36
  return { ok: true };
37
37
  };
38
- export const sveltekit_sync = async (sveltekit_cli = SVELTEKIT_CLI) => {
38
+ export const sveltekit_sync = async (sveltekit_cli = SVELTEKIT_CLI, pm_cli = PM_CLI_DEFAULT) => {
39
39
  const result = await spawn_cli(sveltekit_cli, ['sync']);
40
40
  if (!result) {
41
- throw new Task_Error(`Failed to find SvelteKit CLI \`${to_cli_name(sveltekit_cli)}\`, do you need to run \`npm i\`?`);
41
+ throw new Task_Error(`Failed to find SvelteKit CLI \`${to_cli_name(sveltekit_cli)}\`, do you need to run \`${pm_cli} install\`?`);
42
42
  }
43
43
  else if (!result.ok) {
44
44
  throw new Task_Error(`Failed ${to_cli_name(sveltekit_cli)} sync`);
@@ -67,7 +67,7 @@ export const sveltekit_sync_if_obviously_needed = async (sveltekit_cli = SVELTEK
67
67
  }
68
68
  return sveltekit_sync(found_sveltekit_cli);
69
69
  };
70
- export const run_svelte_package = async (options, cli, log) => {
70
+ export const run_svelte_package = async (options, cli, log, pm_cli) => {
71
71
  const has_sveltekit_library_result = has_sveltekit_library();
72
72
  if (!has_sveltekit_library_result.ok) {
73
73
  throw new Task_Error('Failed to find SvelteKit library: ' + has_sveltekit_library_result.message);
@@ -75,7 +75,7 @@ export const run_svelte_package = async (options, cli, log) => {
75
75
  const cli_name = typeof cli === 'string' ? cli : cli.name;
76
76
  const found_svelte_package_cli = cli === cli_name ? find_cli(cli) : cli;
77
77
  if (found_svelte_package_cli?.kind !== 'local') {
78
- throw new Task_Error(`Failed to find SvelteKit packaging CLI \`${cli_name}\`, do you need to run \`npm i\`?`);
78
+ throw new Task_Error(`Failed to find SvelteKit packaging CLI \`${cli_name}\`, do you need to run \`${pm_cli} install\`?`);
79
79
  }
80
80
  const serialized_args = serialize_args({
81
81
  ...options,
package/dist/sync.task.js CHANGED
@@ -12,22 +12,22 @@ export const Args = z
12
12
  gen: z.boolean({ description: 'dual of no-gen' }).default(true),
13
13
  'no-gen': z.boolean({ description: 'opt out of running gen' }).default(false),
14
14
  install: z.boolean({ description: 'dual of no-install' }).default(true),
15
- 'no-install': z.boolean({ description: 'opt out of `npm install`' }).default(false),
15
+ 'no-install': z.boolean({ description: 'opt out of installing packages' }).default(false),
16
16
  })
17
17
  .strict();
18
18
  export const task = {
19
- summary: 'run `gro gen`, update `package.json`, and optionally `npm i` to sync up',
19
+ summary: 'run `gro gen`, update `package.json`, and optionally install packages to sync up',
20
20
  Args,
21
21
  run: async ({ args, invoke_task, config, log }) => {
22
22
  const { sveltekit, package_json, gen, install } = args;
23
23
  if (install) {
24
- const result = await spawn(config.pm_cli, ['i']);
24
+ const result = await spawn(config.pm_cli, ['install']);
25
25
  if (!result.ok) {
26
- throw new Task_Error('Failed npm install');
26
+ throw new Task_Error(`Failed \`${config.pm_cli} install\``);
27
27
  }
28
28
  }
29
29
  if (sveltekit) {
30
- await sveltekit_sync();
30
+ await sveltekit_sync(undefined, config.pm_cli);
31
31
  log.info('synced SvelteKit');
32
32
  }
33
33
  if (package_json && config.map_package_json) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ryanatkn/gro",
3
- "version": "0.142.0",
3
+ "version": "0.143.1",
4
4
  "description": "task runner and toolkit extending SvelteKit",
5
5
  "motto": "generate, run, optimize",
6
6
  "glyph": "🌰",
@@ -63,7 +63,7 @@
63
63
  },
64
64
  "peerDependencies": {
65
65
  "esbuild": "^0.21.0",
66
- "svelte": "^5.0.0-next.0"
66
+ "svelte": "^5"
67
67
  },
68
68
  "devDependencies": {
69
69
  "@changesets/changelog-git": "^0.2.0",
@@ -158,6 +158,10 @@
158
158
  "types": "./dist/commit.task.d.ts",
159
159
  "default": "./dist/commit.task.js"
160
160
  },
161
+ "./constants.js": {
162
+ "types": "./dist/constants.d.ts",
163
+ "default": "./dist/constants.js"
164
+ },
161
165
  "./deploy.task.js": {
162
166
  "types": "./dist/deploy.task.d.ts",
163
167
  "default": "./dist/deploy.task.js"
@@ -322,10 +326,6 @@
322
326
  "types": "./dist/parse_imports.d.ts",
323
327
  "default": "./dist/parse_imports.js"
324
328
  },
325
- "./path_constants.js": {
326
- "types": "./dist/path_constants.d.ts",
327
- "default": "./dist/path_constants.js"
328
- },
329
329
  "./path.js": {
330
330
  "types": "./dist/path.d.ts",
331
331
  "default": "./dist/path.js"
@@ -10,7 +10,7 @@ export const Args = z
10
10
  'no-sync': z.boolean({description: 'opt out of gro sync'}).default(false),
11
11
  install: z.boolean({description: 'dual of no-install'}).default(true),
12
12
  'no-install': z // convenience, same as `gro build -- gro sync --no-install` but the latter takes precedence
13
- .boolean({description: 'opt out of `npm install` before building'})
13
+ .boolean({description: 'opt out of installing packages before building'})
14
14
  .default(false),
15
15
  })
16
16
  .strict();
@@ -37,7 +37,7 @@ export const Args = z
37
37
  .default('@changesets/changelog-git'),
38
38
  dep: z.boolean({description: 'dual of no-dep'}).default(true),
39
39
  'no-dep': z
40
- .boolean({description: 'opt out of npm installing the changelog package'})
40
+ .boolean({description: 'opt out of installing the changelog package'})
41
41
  .default(false),
42
42
  origin: Git_Origin.describe('git origin to deploy to').default('origin'),
43
43
  changeset_cli: z.string({description: 'the changeset CLI to use'}).default(CHANGESET_CLI),
@@ -115,12 +115,12 @@ export const task: Task<Args> = {
115
115
  await spawn('git', ['add', dir]);
116
116
 
117
117
  if (dep) {
118
- await spawn(config.pm_cli, ['i', '-D', changelog]);
118
+ await spawn(config.pm_cli, ['install', '-D', changelog]);
119
119
  }
120
120
  }
121
121
 
122
122
  // TODO small problem here where generated files don't get committed
123
- await invoke_task('sync', {install: inited || !dep}); // after the `npm i` above, and in all cases
123
+ await invoke_task('sync', {install: inited || !dep}); // after installing above, and in all cases
124
124
 
125
125
  if (message) {
126
126
  // TODO see the helper below, simplify this to CLI flags when support is added to Changesets
@@ -23,7 +23,9 @@ export const Args = z
23
23
  sync: z.boolean({description: 'dual of no-sync'}).default(true),
24
24
  'no-sync': z.boolean({description: 'opt out of syncing'}).default(false),
25
25
  install: z.boolean({description: 'dual of no-install'}).default(true),
26
- 'no-install': z.boolean({description: 'opt out of `npm install` when syncing'}).default(false), // convenience, same as `gro check -- gro sync --no-install` but the latter takes precedence
26
+ 'no-install': z
27
+ .boolean({description: 'opt out of installing packages when syncing'})
28
+ .default(false), // convenience, same as `gro check -- gro sync --no-install` but the latter takes precedence
27
29
  workspace: z
28
30
  .boolean({description: 'ensure a clean git workspace, useful for CI, also implies --no-sync'})
29
31
  .default(false),
@@ -38,7 +40,7 @@ export const task: Task<Args> = {
38
40
  const {typecheck, test, gen, format, package_json, lint, sync, install, workspace} = args;
39
41
 
40
42
  // When checking the workspace, which was added for CI, never sync.
41
- // Setup like `npm i` and `sveltekit-sync` should be done in the CI setup.
43
+ // Setup like installing packages and `sveltekit-sync` should be done in the CI setup.
42
44
  if (sync && !workspace) {
43
45
  await invoke_task('sync', {install, gen: false}); // never generate because `gro gen --check` runs below
44
46
  }
@@ -9,7 +9,7 @@ import {
9
9
  SVELTEKIT_BUILD_DIRNAME,
10
10
  SVELTEKIT_VITE_CACHE_PATH,
11
11
  SVELTEKIT_DIST_DIRNAME,
12
- } from './path_constants.js';
12
+ } from './constants.js';
13
13
 
14
14
  export const clean_fs = async (
15
15
  {
package/src/lib/cli.ts CHANGED
@@ -10,7 +10,7 @@ import {existsSync} from 'node:fs';
10
10
  import {fileURLToPath, type URL} from 'node:url';
11
11
  import type {Logger} from '@ryanatkn/belt/log.js';
12
12
 
13
- import {NODE_MODULES_DIRNAME} from './path_constants.js';
13
+ import {NODE_MODULES_DIRNAME} from './constants.js';
14
14
  import type {Path_Id} from './path.js';
15
15
  import {print_command_args} from './args.js';
16
16
 
@@ -33,3 +33,7 @@ export const TS_MATCHER = /\.(ts|tsx|mts|cts)$/;
33
33
  export const JS_MATCHER = /\.(js|jsx|mjs|cjs)$/;
34
34
  export const JSON_MATCHER = /\.json$/;
35
35
  export const EVERYTHING_MATCHER = /.*/;
36
+
37
+ export const JS_CLI_DEFAULT = 'node';
38
+ export const PM_CLI_DEFAULT = 'npm';
39
+ export const PRETTIER_CLI_DEFAULT = 'prettier';
@@ -8,7 +8,7 @@ import {existsSync, readdirSync} from 'node:fs';
8
8
 
9
9
  import {Task_Error, type Task} from './task.js';
10
10
  import {print_path} from './paths.js';
11
- import {GRO_DIRNAME, GIT_DIRNAME, SVELTEKIT_BUILD_DIRNAME} from './path_constants.js';
11
+ import {GRO_DIRNAME, GIT_DIRNAME, SVELTEKIT_BUILD_DIRNAME} from './constants.js';
12
12
  import {empty_dir} from './fs.js';
13
13
  import {
14
14
  git_check_clean_workspace,
@@ -17,7 +17,7 @@ export const Args = z
17
17
  'no-sync': z.boolean({description: 'opt out of gro sync'}).default(false),
18
18
  install: z.boolean({description: 'dual of no-install'}).default(true),
19
19
  'no-install': z // convenience, same as `gro dev -- gro sync --no-install` but the latter takes precedence
20
- .boolean({description: 'opt out of `npm install` before starting the dev server'})
20
+ .boolean({description: 'opt out of installing packages before starting the dev server'})
21
21
  .default(false),
22
22
  })
23
23
  .strict();
@@ -17,7 +17,7 @@ import {
17
17
  to_default_compile_module_options,
18
18
  type Parsed_Sveltekit_Config,
19
19
  } from './sveltekit_config.js';
20
- import {TS_MATCHER} from './path_constants.js';
20
+ import {TS_MATCHER} from './constants.js';
21
21
 
22
22
  export interface Options {
23
23
  dev: boolean;
@@ -3,7 +3,7 @@ import {readFile} from 'node:fs/promises';
3
3
  import {dirname} from 'node:path';
4
4
 
5
5
  import {resolve_specifier} from './resolve_specifier.js';
6
- import {EVERYTHING_MATCHER} from './path_constants.js';
6
+ import {EVERYTHING_MATCHER} from './constants.js';
7
7
 
8
8
  /**
9
9
  * Adds support for imports to both `.ts` and `.js`,
@@ -6,7 +6,7 @@ import {
6
6
  sveltekit_shim_app_specifiers,
7
7
  } from './sveltekit_shim_app.js';
8
8
  import type {Parsed_Sveltekit_Config} from './sveltekit_config.js';
9
- import {EVERYTHING_MATCHER} from './path_constants.js';
9
+ import {EVERYTHING_MATCHER} from './constants.js';
10
10
 
11
11
  export interface Options {
12
12
  dev: boolean;
@@ -1,7 +1,7 @@
1
1
  import type * as esbuild from 'esbuild';
2
2
 
3
3
  import {render_env_shim_module} from './sveltekit_shim_env.js';
4
- import {EVERYTHING_MATCHER} from './path_constants.js';
4
+ import {EVERYTHING_MATCHER} from './constants.js';
5
5
  import {SVELTEKIT_ENV_MATCHER} from './sveltekit_helpers.js';
6
6
 
7
7
  export interface Options {