@ryanatkn/gro 0.141.1 → 0.143.0

package/dist/gro_plugin_sveltekit_app.js

@@ -5,18 +5,18 @@ import { serialize_package_json, load_package_json } from './package_json.js';
 import { Task_Error } from './task.js';
 import { find_cli, spawn_cli, spawn_cli_process } from './cli.js';
 import { serialize_src_json, create_src_json } from './src_json.js';
-import { DEFAULT_EXPORTS_EXCLUDER } from './gro_config.js';
+import { EXPORTS_EXCLUDER_DEFAULT } from './gro_config.js';
 import { default_sveltekit_config } from './sveltekit_config.js';
-import { SOURCE_DIRNAME } from './path_constants.js';
+import { SOURCE_DIRNAME } from './constants.js';
 import { VITE_CLI } from './sveltekit_helpers.js';
 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, } = {}) => {
     let sveltekit_process = undefined;
     return {
         name: 'gro_plugin_sveltekit_app',
-        setup: async ({ dev, watch, log }) => {
+        setup: async ({ dev, watch, log, config }) => {
             const found_vite_cli = find_cli(vite_cli);
             if (!found_vite_cli)
-                throw new Error(`Failed to find Vite CLI \`${vite_cli}\`, do you need to run \`npm i\`?`);
+                throw new Error(`Failed to find Vite CLI \`${vite_cli}\`, do you need to run \`${config.pm_cli} i\`?`);
             if (dev) {
                 // `vite dev` in development mode
                 if (watch) {
@@ -67,7 +67,7 @@ export const gro_plugin_sveltekit_app = ({ host_target = 'github_pages', well_kn
                         : null,
                     serialized_src_json && well_known_src_files
                         ? copy_temporarily(SOURCE_DIRNAME, assets_path, '.well-known', well_known_src_files === true
-                            ? (file_path) => !DEFAULT_EXPORTS_EXCLUDER.test(file_path)
+                            ? (file_path) => !EXPORTS_EXCLUDER_DEFAULT.test(file_path)
                             : well_known_src_files)
                         : null,
                     /**

package/dist/gro_plugin_sveltekit_library.js

@@ -5,27 +5,27 @@ import { SVELTE_PACKAGE_CLI, run_svelte_package, } from './sveltekit_helpers.js'
 export const gro_plugin_sveltekit_library = ({ svelte_package_options, svelte_package_cli = SVELTE_PACKAGE_CLI, } = {}) => {
     return {
         name: 'gro_plugin_sveltekit_library',
-        setup: async ({ dev, log }) => {
+        setup: async ({ dev, log, config }) => {
             if (!dev) {
-                await run_svelte_package(svelte_package_options, svelte_package_cli, log);
+                await run_svelte_package(svelte_package_options, svelte_package_cli, log, config.pm_cli);
             }
         },
-        adapt: async ({ log, timings }) => {
+        adapt: async ({ log, timings, config }) => {
             const package_json = load_package_json();
-            // `npm link`
+            // link the CLI binaries if they exist
             if (package_json.bin) {
-                const timing_to_npm_link = timings.start('npm link');
+                const timing_to_link = timings.start(`${config.pm_cli} link`);
                 await Promise.all(Object.values(package_json.bin).map(async (bin_path) => {
                     const chmod_result = await spawn('chmod', ['+x', bin_path]);
                     if (!chmod_result.ok)
                         log.error(`chmod on bin path ${bin_path} failed with code ${chmod_result.code}`);
                 }));
                 log.info(`linking`);
-                const link_result = await spawn('npm', ['link', '-f']); // TODO don't use `-f` unless necessary or at all?
+                const link_result = await spawn(config.pm_cli, ['link', '-f']); // TODO don't use `-f` unless necessary or at all?
                 if (!link_result.ok) {
                     throw new Task_Error(`Failed to link. ${print_spawn_result(link_result)}`);
                 }
-                timing_to_npm_link();
+                timing_to_link();
             }
         },
     };

package/dist/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"../src/lib/","sources":["loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AAgFvD,eAAO,MAAM,IAAI,EAAE,QAwFlB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,WAoDrB,CAAC"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"../src/lib/","sources":["loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AAgFvD,eAAO,MAAM,IAAI,EAAE,QAwFlB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,WA4DrB,CAAC"}

package/dist/loader.js

@@ -8,8 +8,8 @@ import { render_env_shim_module } from './sveltekit_shim_env.js';
 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';
 import { default_sveltekit_config } from './sveltekit_config.js';
 import { SVELTE_MATCHER, SVELTE_RUNES_MATCHER } from './svelte_helpers.js';
-import { paths } from './paths.js';
-import { JSON_MATCHER, NODE_MODULES_DIRNAME, TS_MATCHER } from './path_constants.js';
+import { IS_THIS_GRO, paths } from './paths.js';
+import { JSON_MATCHER, NODE_MODULES_DIRNAME, TS_MATCHER } from './constants.js';
 import { to_define_import_meta_env, default_ts_transform_options } from './esbuild_helpers.js';
 import { resolve_specifier } from './resolve_specifier.js';
 import { resolve_node_specifier } from './resolve_node_specifier.js';
@@ -132,34 +132,40 @@ export const load = async (url, context, nextLoad) => {
     return nextLoad(url, context);
 };
 export const resolve = async (specifier, context, nextResolve) => {
-    if (specifier === '$env/static/public' ||
-        specifier === '$env/static/private' ||
-        specifier === '$env/dynamic/public' ||
-        specifier === '$env/dynamic/private') {
+    let s = specifier;
+    // Support SvelteKit `$env` imports
+    if (s === '$env/static/public' ||
+        s === '$env/static/private' ||
+        s === '$env/dynamic/public' ||
+        s === '$env/dynamic/private') {
         // The returned `url` is validated before `load` is called,
         // so we need a slightly roundabout strategy to pass through the specifier for virtual files.
         return {
-            url: pathToFileURL(join(dir, 'src/lib', specifier)).href,
+            url: pathToFileURL(join(dir, 'src/lib', s)).href,
             format: 'module',
             shortCircuit: true,
         };
     }
+    // Special case for Gro's dependencies that import into Gro.
+    // Without this, we'd need to add a dev dep to Gro for Gro, which causes problems.
+    if (IS_THIS_GRO && s.startsWith('@ryanatkn/gro')) {
+        s = join(dir, 'dist', s.substring(13));
+    }
     const parent_url = context.parentURL;
     if (!parent_url || NODE_MODULES_MATCHER.test(parent_url)) {
-        return nextResolve(specifier, context);
+        return nextResolve(s, context);
     }
-    const shimmed = sveltekit_shim_app_specifiers.get(specifier);
+    const shimmed = sveltekit_shim_app_specifiers.get(s);
     if (shimmed !== undefined) {
         return nextResolve(shimmed, context);
     }
-    const path = map_sveltekit_aliases(specifier, aliases);
-    // The specifier `path` has now been mapped to its final form, so we can inspect it.
-    if (path[0] !== '.' && path[0] !== '/') {
+    s = map_sveltekit_aliases(s, aliases);
+    // The specifier has now been mapped to its final form, so we can inspect it.
+    if (s[0] !== '.' && s[0] !== '/') {
         // Resolve to `node_modules`.
-        if (SVELTE_MATCHER.test(path) || JSON_MATCHER.test(path)) {
+        if (SVELTE_MATCHER.test(s) || JSON_MATCHER.test(s)) {
             // Match the behavior of Vite and esbuild for Svelte and JSON imports.
-            // TODO `.ts` too
-            const resolved = resolve_node_specifier(path, dir, parent_url, package_json_cache);
+            const resolved = resolve_node_specifier(s, dir, parent_url, package_json_cache); // `node:` specifiers shouldn't reach this point, so the assertion is safe
             return {
                 url: pathToFileURL(resolved.path_id_with_querystring).href,
                 format: 'module',
@@ -167,10 +173,10 @@ export const resolve = async (specifier, context, nextResolve) => {
             };
         }
         else {
-            return nextResolve(path, context);
+            return nextResolve(s, context);
         }
     }
-    const resolved = resolve_specifier(path, dirname(fileURLToPath(parent_url)));
+    const resolved = resolve_specifier(s, dirname(fileURLToPath(parent_url)));
     return {
         url: pathToFileURL(resolved.path_id_with_querystring).href,
         format: 'module',

package/dist/module.js

@@ -1,5 +1,5 @@
 import { LIB_DIRNAME } from './paths.js';
-import { SOURCE_DIR, SOURCE_DIRNAME } from './path_constants.js';
+import { SOURCE_DIR, SOURCE_DIRNAME } from './constants.js';
 export const MODULE_PATH_SRC_PREFIX = SOURCE_DIR;
 export const MODULE_PATH_LIB_PREFIX = `$${LIB_DIRNAME}/`;
 const INTERNAL_MODULE_MATCHER = new RegExp(`^(\\.?\\.?|${SOURCE_DIRNAME}|\\$${LIB_DIRNAME})\\/`, 'u');

package/dist/moss_helpers.d.ts

@@ -1,7 +1,7 @@
 import type { Result } from '@ryanatkn/belt/result.js';
 import { type Package_Json } from './package_json.js';
 export declare const MOSS_PACKAGE_DEP_NAME = "@ryanatkn/moss";
-export declare const load_moss_plugin: (package_json?: Package_Json, dep_name?: string, plugin_path?: string, local_plugin_path?: string) => Promise<Result<{
+export declare const load_moss_plugin: (package_json?: Package_Json, dep_name?: string, plugin_path?: string, local_plugin_path?: string, pm_cli?: string) => Promise<Result<{
     gro_plugin_moss: any;
 }, {
     message: string;

package/dist/moss_helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moss_helpers.d.ts","sourceRoot":"../src/lib/","sources":["moss_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAIrD,OAAO,EAAU,KAAK,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,mBAAmB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,kBACb,YAAY,0EAIzB,OAAO,CAAC,MAAM,CAAC;IAAC,eAAe,EAAE,GAAG,CAAA;CAAC,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAAC,CA4B3D,CAAC"}
+{"version":3,"file":"moss_helpers.d.ts","sourceRoot":"../src/lib/","sources":["moss_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAIrD,OAAO,EAAU,KAAK,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAG7D,eAAO,MAAM,qBAAqB,mBAAmB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,kBACb,YAAY,2FAKzB,OAAO,CAAC,MAAM,CAAC;IAAC,eAAe,EAAE,GAAG,CAAA;CAAC,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAAC,CA4B3D,CAAC"}

package/dist/moss_helpers.js

@@ -1,14 +1,15 @@
 import { existsSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { has_dep } from './package_json.js';
+import { NODE_MODULES_DIRNAME, PM_CLI_DEFAULT } from './constants.js';
 export const MOSS_PACKAGE_DEP_NAME = '@ryanatkn/moss';
 // TODO plugin type?
-export const load_moss_plugin = async (package_json, dep_name = MOSS_PACKAGE_DEP_NAME, plugin_path = `node_modules/${dep_name}/dist/gro_plugin_moss.js`, // TODO maybe lookup from its `package_json.exports`? kinda unnecessary
-local_plugin_path = 'src/lib/gro_plugin_moss.ts') => {
+export const load_moss_plugin = async (package_json, dep_name = MOSS_PACKAGE_DEP_NAME, plugin_path = `${NODE_MODULES_DIRNAME}/${dep_name}/dist/gro_plugin_moss.js`, // TODO maybe lookup from its `package_json.exports`? kinda unnecessary
+local_plugin_path = 'src/lib/gro_plugin_moss.ts', pm_cli = PM_CLI_DEFAULT) => {
     if (!has_dep(dep_name, package_json)) {
         return {
             ok: false,
-            message: `no dependency found in package.json for ${dep_name}, install it with \`npm i -D ${dep_name}\``,
+            message: `no dependency found in package.json for ${dep_name}, install it with \`${pm_cli} install -D ${dep_name}\``,
         };
     }
     let path = undefined;