@sanity/runtime-cli 14.8.4 → 14.8.5

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @sanity/runtime-cli
 $ sanity-run COMMAND
 running command...
 $ sanity-run (--version)
-@sanity/runtime-cli/14.8.4 linux-x64 node-v24.14.0
+@sanity/runtime-cli/14.8.5 linux-x64 node-v24.14.1
 $ sanity-run --help [COMMAND]
 USAGE
   $ sanity-run COMMAND
@@ -101,7 +101,7 @@ EXAMPLES
   $ sanity-run blueprints add function --name my-function --fn-type document-create --fn-type document-update --lang js
 ```
 
-_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/add.ts)_
+_See code: [src/commands/blueprints/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/add.ts)_
 
 ## `sanity-run blueprints config`
 
@@ -140,7 +140,7 @@ EXAMPLES
   $ sanity-run blueprints config --edit --project-id <projectId> --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/config.ts)_
+_See code: [src/commands/blueprints/config.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/config.ts)_
 
 ## `sanity-run blueprints deploy`
 
@@ -179,7 +179,7 @@ EXAMPLES
   $ sanity-run blueprints deploy --fn-installer npm
 ```
 
-_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/deploy.ts)_
+_See code: [src/commands/blueprints/deploy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/deploy.ts)_
 
 ## `sanity-run blueprints destroy`
 
@@ -215,7 +215,7 @@ EXAMPLES
   $ sanity-run blueprints destroy --stack <name-or-id> --project-id <projectId> --force --no-wait
 ```
 
-_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/destroy.ts)_
+_See code: [src/commands/blueprints/destroy.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/destroy.ts)_
 
 ## `sanity-run blueprints doctor`
 
@@ -242,7 +242,7 @@ DESCRIPTION
   issues.
 ```
 
-_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/doctor.ts)_
+_See code: [src/commands/blueprints/doctor.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/doctor.ts)_
 
 ## `sanity-run blueprints info`
 
@@ -274,7 +274,7 @@ EXAMPLES
   $ sanity-run blueprints info --stack <name-or-id>
 ```
 
-_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/info.ts)_
+_See code: [src/commands/blueprints/info.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/info.ts)_
 
 ## `sanity-run blueprints init [DIR]`
 
@@ -328,7 +328,7 @@ EXAMPLES
   $ sanity-run blueprints init --blueprint-type <json|js|ts> --stack-name <stackName>
 ```
 
-_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/init.ts)_
+_See code: [src/commands/blueprints/init.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/init.ts)_
 
 ## `sanity-run blueprints logs`
 
@@ -359,7 +359,7 @@ EXAMPLES
   $ sanity-run blueprints logs --watch
 ```
 
-_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/logs.ts)_
+_See code: [src/commands/blueprints/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/logs.ts)_
 
 ## `sanity-run blueprints plan`
 
@@ -387,7 +387,7 @@ EXAMPLES
   $ sanity-run blueprints plan
 ```
 
-_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/plan.ts)_
+_See code: [src/commands/blueprints/plan.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/plan.ts)_
 
 ## `sanity-run blueprints stacks`
 
@@ -419,7 +419,7 @@ EXAMPLES
   $ sanity-run blueprints stacks --organization-id <organizationId>
 ```
 
-_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/blueprints/stacks.ts)_
+_See code: [src/commands/blueprints/stacks.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/blueprints/stacks.ts)_
 
 ## `sanity-run functions add`
 
@@ -472,7 +472,7 @@ EXAMPLES
   $ sanity-run functions add --name my-function --type document-create --type document-update --lang js
 ```
 
-_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/functions/add.ts)_
+_See code: [src/commands/functions/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/functions/add.ts)_
 
 ## `sanity-run functions dev`
 
@@ -508,7 +508,7 @@ EXAMPLES
   $ sanity-run functions dev --timeout 60
 ```
 
-_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/functions/dev.ts)_
+_See code: [src/commands/functions/dev.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/functions/dev.ts)_
 
 ## `sanity-run functions env add NAME KEY VALUE`
 
@@ -539,7 +539,7 @@ EXAMPLES
   $ sanity-run functions env add MyFunction API_URL https://api.example.com/
 ```
 
-_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/functions/env/add.ts)_
+_See code: [src/commands/functions/env/add.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/functions/env/add.ts)_
 
 ## `sanity-run functions env list NAME`
 
@@ -567,7 +567,7 @@ EXAMPLES
   $ sanity-run functions env list MyFunction
 ```
 
-_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/functions/env/list.ts)_
+_See code: [src/commands/functions/env/list.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/functions/env/list.ts)_
 
 ## `sanity-run functions env remove NAME KEY`
 
@@ -597,7 +597,7 @@ EXAMPLES
   $ sanity-run functions env remove MyFunction API_URL
 ```
 
-_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/functions/env/remove.ts)_
+_See code: [src/commands/functions/env/remove.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/functions/env/remove.ts)_
 
 ## `sanity-run functions logs [NAME]`
 
@@ -639,7 +639,7 @@ EXAMPLES
   $ sanity-run functions logs <name> --delete
 ```
 
-_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/functions/logs.ts)_
+_See code: [src/commands/functions/logs.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/functions/logs.ts)_
 
 ## `sanity-run functions test [NAME]`
 
@@ -697,7 +697,7 @@ EXAMPLES
   $ sanity-run functions test <name> --event update --data-before '{ "title": "before" }' --data-after '{ "title": "after" }'
 ```
 
-_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.4/src/commands/functions/test.ts)_
+_See code: [src/commands/functions/test.ts](https://github.com/sanity-io/runtime-cli/blob/v14.8.5/src/commands/functions/test.ts)_
 
 ## `sanity-run help [COMMAND]`
 

package/dist/actions/blueprints/assets.d.ts

@@ -1,11 +1,10 @@
-import type { BlueprintResource } from '@sanity/blueprints';
 import AdmZip from 'adm-zip';
 import type { Logger } from '../../utils/logger.js';
-import type { AuthParams, InstallerType } from '../../utils/types.js';
+import type { AssetResource, AuthParams, InstallerType } from '../../utils/types.js';
 export declare const ASSET_CHECK_URL: string;
 export declare const ASSET_STASH_URL: string;
 export declare function stashAsset({ resource, auth, logger, installer, }: {
-    resource: BlueprintResource;
+    resource: AssetResource;
     auth: AuthParams;
     logger: Logger;
     installer?: InstallerType;

package/dist/actions/blueprints/assets.js

@@ -3,7 +3,6 @@ import fs from 'node:fs';
 import AdmZip from 'adm-zip';
 import config from '../../config.js';
 import { CONVERT_BYTES_TO_MB, MAX_ASSET_SIZE } from '../../constants.js';
-import { detectNativeModules } from '../../utils/functions/detect-native-modules.js';
 import { prepareAsset as prepareFunctionAsset } from '../../utils/functions/prepare-asset.js';
 import getHeaders from '../../utils/get-headers.js';
 import { createTracedFetch } from '../../utils/traced-fetch.js';
@@ -49,7 +48,7 @@ export async function stashAsset({ resource, auth, logger, installer, }) {
         else {
             return {
                 success: false,
-                error: `Invalid resource type ${resource.type} for asset processing`,
+                error: `Unexpected resource for asset processing`,
             };
         }
         return await stashSingleAsset({
@@ -67,16 +66,7 @@ export async function stashAsset({ resource, auth, logger, installer, }) {
     }
 }
 async function prepareStudioAsset({ resource, }) {
-    if (!('src' in resource) || typeof resource.src !== 'string') {
-        return {
-            success: false,
-            async cleanup() {
-                // no op
-            },
-            error: `Resource of type '${resource.type}' must have a 'src' property`,
-        };
-    }
-    else if (!fs.existsSync(resource.src)) {
+    if (!fs.existsSync(resource.src)) {
         return {
             success: false,
             async cleanup() {
@@ -171,12 +161,6 @@ export async function pathToB64ZipHash(path) {
     if (size > MAX_ASSET_SIZE) {
         throw new Error(`Asset size of ${(size / CONVERT_BYTES_TO_MB).toFixed(2)} MB exceeds the maximum allowed size of 200 MB.`);
     }
-    const hasNativeModules = detectNativeModules(zip);
-    if (hasNativeModules?.length > 0) {
-        const errorMsg = `Native modules detected in Function:\n${hasNativeModules.join('\n')}\n\n` +
-            `Please replace with JavaScript alternatives.`;
-        throw new Error(errorMsg);
-    }
     const buffer = zip.toBuffer();
     const b64 = buffer.toString('base64');
     const hash = hashBuffer(buffer);

package/dist/cores/blueprints/deploy.js

@@ -4,7 +4,7 @@ import { setupLogStreaming } from '../../actions/blueprints/logs-streaming.js';
 import { getStack, updateStack } from '../../actions/blueprints/stacks.js';
 import { niceId } from '../../utils/display/presenters.js';
 import { styleText } from '../../utils/style-text.js';
-import { isLocalFunctionResource, isStudioResource } from '../../utils/types.js';
+import { isAssetResource } from '../../utils/types.js';
 const DEFAULT_ASSET_TIMEOUT = 60;
 const assetTimeoutS = Number(process.env.SANITY_ASSET_TIMEOUT) || DEFAULT_ASSET_TIMEOUT;
 const assetTimeoutMs = assetTimeoutS * 1000;
@@ -29,18 +29,17 @@ export async function blueprintDeployCore(options) {
             };
         }
         const { resources } = blueprint.parsedBlueprint;
-        const validResources = resources?.filter((r) => r.type) || [];
-        const preDeployResources = validResources.filter(isPreDeployResource);
-        if (preDeployResources.length > 0) {
+        const validResources = (resources ?? []).filter((r) => !!r.type);
+        const assetResources = validResources.filter(isAssetResource);
+        if (assetResources.length > 0) {
             log('Processing assets...');
-            for (const resource of preDeployResources) {
+            for (const resource of assetResources) {
                 const preDeployResult = await preDeploy(resource, { auth, installer, log });
                 if (!preDeployResult.success)
                     return preDeployResult;
                 const idx = validResources.indexOf(resource);
-                if (idx !== -1) {
+                if (idx !== -1)
                     validResources[idx] = preDeployResult.resource;
-                }
             }
         }
         const spinner = log.ora('Deploying...').start();
@@ -124,9 +123,6 @@ export async function blueprintDeployCore(options) {
         return { success: false, error: errorMessage };
     }
 }
-function isPreDeployResource(r) {
-    return isLocalFunctionResource(r) || isStudioResource(r);
-}
 async function preDeploy(resource, options) {
     const { auth, installer, log } = options;
     const fnSpinner = log.ora({ text: `Processing ${resource.name}...`, prefixText: ' ' }).start();

package/dist/cores/functions/build.js

@@ -2,7 +2,6 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { pathToZip } from '../../actions/blueprints/assets.js';
 import { findFunctionInBlueprint } from '../../utils/find-function.js';
-import { detectNativeModules } from '../../utils/functions/detect-native-modules.js';
 import { prepareAsset } from '../../utils/functions/prepare-asset.js';
 import { isLocalFunctionResource } from '../../utils/types.js';
 export async function functionBuildCore(options) {
@@ -34,10 +33,6 @@ export async function functionBuildCore(options) {
             continue;
         }
         const zip = await pathToZip(prepResult.outputPath);
-        const nativeModules = detectNativeModules(zip);
-        if (nativeModules?.length > 0) {
-            log.warn(`Native modules detected in ${resource.name}: ${nativeModules.join(', ')}`);
-        }
         const buffer = zip.toBuffer();
         const zipPath = path.join(outDir, `${resource.name}.zip`);
         await fs.promises.writeFile(zipPath, buffer);

package/dist/utils/display/resources-formatting.js

@@ -1,4 +1,4 @@
-import { isScheduleEvent } from '../../utils/types.js';
+import { isLocalFunctionResource, isScheduleEvent } from '../../utils/types.js';
 import { styleText } from '../style-text.js';
 function formatLabel(label) {
     return styleText('dim', `${label}:`);
@@ -33,11 +33,13 @@ function arrayifyEvent(event) {
 }
 export function arrayifyFunction(fn) {
     const details = [formatLabeledValue('type', fn.type)];
-    if ('memory' in fn && fn.memory)
+    if (!isLocalFunctionResource(fn))
+        return details;
+    if (fn.memory)
         details.push(formatLabeledValue('memory', fn.memory));
-    if ('timeout' in fn && fn.timeout)
+    if (fn.timeout)
         details.push(formatLabeledValue('timeout', fn.timeout));
-    if ('event' in fn && fn.event) {
+    if (fn.event) {
         const eventDetails = arrayifyEvent(fn.event);
         if (eventDetails) {
             details.push(formatLabel('event'));

package/dist/utils/functions/detect-native-modules.d.ts

@@ -1,12 +1,10 @@
-import type AdmZip from 'adm-zip';
-import type { FunctionResource } from '../types.js';
+import type { Plugin } from 'vite';
+export declare const errorMessage: (elements: string[]) => string;
 /**
- * Recurse node_modules for native modules.
- * Native modules built on one platform may not work on another (e.g., macOS vs Linux)
+ * Scan the given path. Flag any packages that contain files matching known native module patterns, and return a list of their names.
  */
-export declare const detectNativeModules: (zip: AdmZip) => string[];
+export declare const detectNativeModules: (nodeModules: string) => string[];
 /**
- * Finds the dependencies of the function and compares to the workspace root to see if any native modules are included.
- * Due to how PNPM with workspaces symlinks dependencies, we have to check the workspace root for native modules prior to the bundle step.
+ * A vite plugin that compares resolved deps of a function against known native module patterns, and throws an error if any are found.
  */
-export declare const detectNativeModulesForBundle: (resource: FunctionResource) => string[];
+export declare const detectNativeModulesPlugin: () => Plugin;

package/dist/utils/functions/detect-native-modules.js

@@ -1,97 +1,105 @@
-import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
+import { existsSync, readdirSync, statSync } from 'node:fs';
 import path from 'node:path';
-import { cwd } from 'node:process';
-import { createPnpmRequire } from '../pnpm.js';
 /**
  * Patterns to identify native modules based on common file types and build configurations.
  */
 const KNOWN_MODULE_PATTERNS = [/binding\.gyp$/, /\.node$/];
+export const errorMessage = (elements) => `Native modules detected:\n${elements.join(`\n`)}\n\n Please replace with JavaScript alternatives`;
 /**
- * Recurse node_modules for native modules.
- * Native modules built on one platform may not work on another (e.g., macOS vs Linux)
+ * Quick helper so we can recurse through pnpm symlinks if they exist
+ * Fallback to statSync if it's a symlink
  */
-export const detectNativeModules = (zip) => {
-    try {
-        const zippedEntries = zip.getEntries();
-        const moduleNames = zippedEntries
-            // Filter entries that match known native module patterns
-            .filter((entry) => KNOWN_MODULE_PATTERNS.some((pattern) => pattern.test(entry.entryName)))
-            // Extract package names from the entry paths
-            .map((entry) => entry.entryName.match(/node_modules[\\/](.+?)[\\/]/)?.[1])
-            // Filter out undefined results (in case the regex didn't match)
-            .filter((name) => name !== undefined);
-        // return a unique list of module names
-        return [...new Set(moduleNames)];
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        throw new Error(`Failed to scan zip for native modules: ${message}`);
-    }
-};
+const isDirEntry = (dir, parent) => dir.isDirectory() || (dir.isSymbolicLink() && statSync(path.join(parent, dir.name)).isDirectory());
 /**
  * Recursively checks a directory for files that match known native module patterns.
  */
 const hasNativeFiles = (directory) => {
-    for (const name of readdirSync(directory)) {
+    for (const entry of readdirSync(directory, { withFileTypes: true })) {
         // don't recurse back into node_modules.
-        if (name === 'node_modules')
+        if (entry.name === 'node_modules')
             continue;
-        const fullPath = path.join(directory, name);
-        if (statSync(fullPath).isDirectory()) {
-            if (hasNativeFiles(fullPath))
+        const fullPath = path.join(directory, entry.name);
+        if (isDirEntry(entry, directory)) {
+            if (hasNativeFiles(fullPath)) {
                 return true;
+            }
         }
-        else if (KNOWN_MODULE_PATTERNS.some((pattern) => pattern.test(name))) {
+        else if (KNOWN_MODULE_PATTERNS.some((pattern) => pattern.test(entry.name))) {
             return true;
         }
     }
     return false;
 };
 /**
- * Finds the dependencies of the function and compares to the workspace root to see if any native modules are included.
- * Due to how PNPM with workspaces symlinks dependencies, we have to check the workspace root for native modules prior to the bundle step.
+ * Scan the given path. Flag any packages that contain files matching known native module patterns, and return a list of their names.
  */
-export const detectNativeModulesForBundle = (resource) => {
-    if (!resource.src)
-        throw new Error('Resource src is required');
-    const hasWorkspace = existsSync(path.join(cwd(), 'pnpm-workspace.yaml'));
-    if (!hasWorkspace) {
-        return [];
-    }
-    const sourcePath = path.resolve(cwd(), resource.src);
-    const stats = statSync(sourcePath);
-    const entryDir = stats.isFile() ? path.dirname(sourcePath) : sourcePath;
-    const hasPackageJson = existsSync(path.join(entryDir, 'package.json'));
-    // @todo: Can this just move to vite https://linear.app/sanity/issue/RUN-1221/can-we-use-a-vite-plugin-at-transpile-to-determine-native-modules
-    if (!hasPackageJson) {
-        // No package.json means we cant run the native module check
-        // Assuming safe to skip native module detection.
-        return [];
-    }
-    // gets package.json dependencies of the function. We use these function deps to compare against the workspace root modules.
-    const pkgJsonPath = path.join(entryDir, 'package.json');
-    // a function should always have deps, but this will just be a little safer.
-    const functionDeps = JSON.parse(readFileSync(pkgJsonPath, 'utf-8')).dependencies ?? {};
-    const workspaceModules = createPnpmRequire(cwd());
-    const nativeModules = [];
-    for (const depName of Object.keys(functionDeps)) {
-        try {
-            const resolved = workspaceModules.resolve(depName);
-            let currentDir = path.dirname(resolved);
-            while (currentDir !== cwd() && currentDir !== path.parse(currentDir).root) {
-                // look for node_module package.json to locate top level
-                if (existsSync(path.join(currentDir, 'package.json'))) {
-                    if (hasNativeFiles(currentDir)) {
-                        nativeModules.push(depName);
-                        break;
-                    }
-                }
-                currentDir = path.dirname(currentDir);
+export const detectNativeModules = (nodeModules) => {
+    // because to return the name, we might need to know the scoped package name
+    const packages = readdirSync(nodeModules, { withFileTypes: true }).flatMap((entry) => {
+        if (entry.name.startsWith('@')) {
+            if (!isDirEntry(entry, nodeModules)) {
+                return [];
             }
+            const scopePath = path.join(nodeModules, entry.name);
+            return readdirSync(scopePath, { withFileTypes: true })
+                .filter((pkg) => isDirEntry(pkg, scopePath))
+                .map((pkg) => ({
+                name: `${entry.name}/${pkg.name}`,
+                dir: path.join(scopePath, pkg.name),
+            }));
         }
-        catch (_e) {
-            // If we fail to resolve, just skip
+        if (!isDirEntry(entry, nodeModules)) {
+            return [];
+        }
+        return [{ name: entry.name, dir: path.join(nodeModules, entry.name) }];
+    });
+    return packages.filter(({ dir }) => hasNativeFiles(dir)).map(({ name }) => name);
+};
+const findPackageDir = (pathName) => {
+    let currentDir = path.dirname(pathName);
+    while (currentDir !== path.parse(currentDir).root) {
+        // look for node_module package.json to locate top level
+        if (existsSync(path.join(currentDir, 'package.json'))) {
+            return currentDir;
         }
+        currentDir = path.dirname(currentDir);
     }
-    return nativeModules;
+    return null;
+};
+/**
+ * A vite plugin that compares resolved deps of a function against known native module patterns, and throws an error if any are found.
+ */
+export const detectNativeModulesPlugin = () => {
+    const flagged = new Set();
+    return {
+        name: 'detect-native-modules',
+        enforce: 'pre',
+        async resolveId(source, importer, options) {
+            // skip relative imports
+            if (source.startsWith('.') || source.startsWith('/') || source.startsWith('\0')) {
+                return null;
+            }
+            const [scope, name] = source.split('/');
+            const pkgName = source.startsWith('@') ? `${scope}/${name}` : scope;
+            if (!pkgName) {
+                return null;
+            }
+            const resolved = await this.resolve(source, importer, { ...options, skipSelf: true });
+            if (!resolved)
+                return null;
+            const pkgDir = findPackageDir(resolved.id);
+            if (!pkgDir) {
+                return null;
+            }
+            if (hasNativeFiles(pkgDir)) {
+                flagged.add(source);
+            }
+            return null;
+        },
+        buildEnd() {
+            if (flagged.size > 0) {
+                this.error(errorMessage([...flagged]));
+            }
+        },
+    };
 };

package/dist/utils/functions/prepare-asset.js

@@ -1,9 +1,10 @@
+import { existsSync } from 'node:fs';
 import { rm, stat } from 'node:fs/promises';
 import path from 'node:path';
 import { cwd } from 'node:process';
 import { MAX_ASSET_SIZE } from '../../constants.js';
 import { transpileFunction } from '../transpile/transpile-function.js';
-import { detectNativeModulesForBundle } from './detect-native-modules.js';
+import { detectNativeModules, errorMessage } from './detect-native-modules.js';
 import { getFolderSize } from './getFolderSize.js';
 import { resolveResourceDependencies } from './resolve-dependencies.js';
 import { shouldAutoResolveDependencies } from './should-auto-resolve-deps.js';
@@ -17,12 +18,6 @@ export async function prepareAsset({ resource, }, { installer } = {}) {
     const shouldTranspile = await shouldTranspileFunction(resource);
     if (shouldTranspile) {
         try {
-            const hasNativeModules = detectNativeModulesForBundle(resource);
-            if (hasNativeModules.length) {
-                const errorMsg = `Native modules detected:\n${hasNativeModules.join('\n')}\n\n` +
-                    `Please replace with JavaScript alternatives.`;
-                throw new Error(errorMsg);
-            }
             const result = await transpileFunction(resource, { installer });
             functionPath = result.outputDir;
             cleanup = result.cleanup;
@@ -37,6 +32,13 @@ export async function prepareAsset({ resource, }, { installer } = {}) {
         await resolveResourceDependencies(resource, { transpiled: shouldTranspile, installer });
         await removeArcAutoInstallPackageJson(functionPath);
     }
+    if (existsSync(path.join(functionPath, 'node_modules'))) {
+        const modulesPath = path.join(functionPath, 'node_modules');
+        const flagged = detectNativeModules(modulesPath);
+        if (flagged.length > 0) {
+            throw new Error(errorMessage(flagged));
+        }
+    }
     try {
         const size = getFolderSize(functionPath);
         if (size > MAX_ASSET_SIZE) {

package/dist/utils/transpile/transpile-function.js

@@ -6,6 +6,7 @@ import { cwd } from 'node:process';
 import * as find from 'empathic/find';
 import { build as viteBuild } from 'vite';
 import tsConfigPaths from 'vite-tsconfig-paths';
+import { detectNativeModulesPlugin } from '../functions/detect-native-modules.js';
 import { findFunctionEntryPoint } from '../functions/find-entry-point.js';
 import { createPnpmRequire } from '../pnpm.js';
 import { cleanupSourceMaps } from './cleanup-source-maps.js';
@@ -68,7 +69,10 @@ export async function transpileFunction(resource, { installer } = {}) {
                     conditions: ['node'],
                 },
             },
-            plugins: [tsConfigPaths(), ...(bundle ? [pnpmResolvePlugin(cwd())] : [])],
+            plugins: [
+                ...(bundle ? [detectNativeModulesPlugin(), pnpmResolvePlugin(cwd())] : []),
+                tsConfigPaths(),
+            ],
         });
         timings['transpile:build'] = performance.now() - viteStart;
         const verifyStart = performance.now();
@@ -137,6 +141,7 @@ function logCleanupFailure(err) {
 }
 /**
  * Vite plugin to resolve packages from pnpm's virtual store.
+ * We don't have a node_modules dir when we bundle with pnpm, so we need a plugin to resolve dependencies from pnpm's virtual store
  * In pnpm workspaces, hoisted dependencies live in node_modules/.pnpm/node_modules/
  * which isn't reachable via standard Node resolution.
  */

package/dist/utils/types.d.ts

@@ -1,5 +1,4 @@
 import { type BlueprintCorsOriginResource, type BlueprintDatasetResource, type BlueprintDocumentFunctionResource, type BlueprintDocumentWebhookResource, type BlueprintMediaLibraryAssetFunctionResource, type BlueprintProjectResource, type BlueprintResource, type BlueprintRobotResource, type BlueprintRoleResource, type BlueprintScheduledFunctionResource } from '@sanity/blueprints';
-import type { Blueprint } from '@sanity/blueprints-parser';
 export type ScopeType = 'organization' | 'project';
 /** Result utility type */
 export type Result<T, E = string> = {
@@ -17,6 +16,12 @@ export interface ActionResponse {
 /** @internal */
 export type FunctionGroqResource = BlueprintDocumentFunctionResource | BlueprintMediaLibraryAssetFunctionResource;
 export type FunctionResource = FunctionGroqResource | BlueprintScheduledFunctionResource;
+export interface StudioResource extends BlueprintResource {
+    type: 'sanity.studio';
+    src: string;
+}
+/** Resource types that carry a deployable asset (have src: string) */
+export type AssetResource = FunctionResource | StudioResource;
 /** @internal */
 export interface AuthParams {
     token: string;
@@ -41,12 +46,9 @@ export declare function isProjectResource(r: unknown): r is BlueprintProjectReso
 export declare function isRobotResource(r: unknown): r is BlueprintRobotResource;
 export declare function isRoleResource(r: unknown): r is BlueprintRoleResource;
 export declare function isDatasetResource(r: unknown): r is BlueprintDatasetResource;
-export declare function isStudioResource(r: unknown): boolean;
+export declare function isStudioResource(r: BlueprintResource): r is StudioResource;
+export declare function isAssetResource(r: BlueprintResource): r is AssetResource;
 export declare function isWebhookResource(r: unknown): r is BlueprintDocumentWebhookResource;
-/** @internal */
-export interface CorsResource extends BlueprintResource {
-    origin?: string;
-}
 interface StackBase {
     id: string;
     name: string;
@@ -76,7 +78,9 @@ export interface StackMutation {
     name: string;
     scopeType: ScopeType;
     scopeId: string;
-    document: Blueprint;
+    document: {
+        resources?: Array<BlueprintResource & Record<string, unknown>>;
+    };
 }
 /** @internal */
 export interface BuildPayloadOptions {

package/dist/utils/types.js

@@ -24,7 +24,10 @@ export function isDatasetResource(r) {
 }
 // TODO: update to use blueprints helpers once available
 export function isStudioResource(r) {
-    return !!r && typeof r === 'object' && 'type' in r && r.type === 'sanity.studio';
+    return r.type === 'sanity.studio';
+}
+export function isAssetResource(r) {
+    return isLocalFunctionResource(r) || isStudioResource(r);
 }
 export function isWebhookResource(r) {
     return validateDocumentWebhook(r).length === 0;

package/oclif.manifest.json

@@ -2235,5 +2235,5 @@
       ]
     }
   },
-  "version": "14.8.4"
+  "version": "14.8.5"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sanity/runtime-cli",
   "description": "Sanity's Runtime CLI for Blueprints and Functions",
-  "version": "14.8.4",
+  "version": "14.8.5",
   "author": "Sanity Runtime Team",
   "type": "module",
   "license": "MIT",