@gtkx/cli 1.5.0 → 2.0.0-beta.1

package/src/vite-plugins/asset-imports.ts

@@ -1,13 +1,9 @@
-import type { ConfigLoader } from "@gtkx/config";
-import type { ParseResult, Plugin, UserConfig } from "vite";
-import { createConfigLoader } from "@gtkx/config/internal";
+import type { ParseResult, Plugin } from "vite";
 import { parseSync } from "vite";
 import { sourceLanguage } from "../internal/source-imports.js";
 import { ASSET_MENTION_RE } from "./asset-extensions.js";
 import {
-    DATA_PREFIX,
     isAssetSpecifier,
-    isDataAsset,
     isUrlSpecifier,
     parseIconSpecifier,
     parseResourceSpecifier,
@@ -21,18 +17,11 @@ type ExportStatement = ParsedModule["staticExports"][number];
 type ExportEntry = ExportStatement["entries"][number];
 type BindingEntry = { importName: { name: string | null }; isType: boolean };
 type NamedBinding = { name: string; source: string };
-type PluginState = { isV2: boolean };
 
 const NODE_MODULES = /(?:^|\/)node_modules\//;
 const VIRTUAL_PREFIX = "\0";
 const DEFAULT_BINDING = "default";
 const RESOURCE_BINDING = JSON.stringify(RESOURCE_PATH_EXPORT);
-const DATA_IMPORT_EXAMPLE = `"${DATA_PREFIX}<path>"`;
-const URL_FALLBACK = ", or import the default for the asset URL.";
-
-const BUNDLE_ADVICE =
-    `An asset staged into the GResource bundle exports ${RESOURCE_BINDING} and a "resource://" default, and ` +
-    "nothing else.";
 
 const QUERY_ADVICE =
     `A URL asset exports only its default filesystem path; import the default instead of ${RESOURCE_BINDING}.`;
@@ -43,9 +32,7 @@ const RESOURCE_ADVICE =
 const ICON_ADVICE = "An icon asset exports only its default icon-theme name, and nothing else.";
 
 const RELATIVE_ADVICE =
-    `Only assets imported through "${DATA_PREFIX}" are staged into the GResource bundle and export ` +
-    `${RESOURCE_BINDING}; move the file under the data directory and import it as ` +
-    `${DATA_IMPORT_EXAMPLE}${URL_FALLBACK}`;
+    "Add ?resource for a GResource, ?icon for a themed icon, or ?url for an emitted file.";
 
 const boundName = (entry: BindingEntry): string | null => {
     const { name } = entry.importName;
@@ -78,50 +65,46 @@ const bindings = (parsed: ParsedModule): NamedBinding[] => [
     ...parsed.staticExports.flatMap((statement) => exportBindings(statement)),
 ];
 
-const isBacked = ({ name, source }: NamedBinding, isV2: boolean): boolean => {
+const isBacked = ({ name, source }: NamedBinding): boolean => {
     if (name !== RESOURCE_PATH_EXPORT) {
         return false;
     }
 
-    return isV2 ? parseResourceSpecifier(source) !== null : isDataAsset(source);
+    return parseResourceSpecifier(source) !== null;
 };
 
 const isCheckedSpecifier = (source: string): boolean => isAssetSpecifier(source) || isUrlSpecifier(source);
 
-const unbackedBinding = (parsed: ParsedModule, isV2: boolean): NamedBinding | undefined =>
-    bindings(parsed).find((binding) => isCheckedSpecifier(binding.source) && !isBacked(binding, isV2));
-
-const isBundledResource = (source: string, isV2: boolean): boolean =>
-    isV2
-        ? parseResourceSpecifier(source) !== null || parseIconSpecifier(source) !== null
-        : isDataAsset(source);
+const unbackedBinding = (parsed: ParsedModule): NamedBinding | undefined =>
+    bindings(parsed).find((binding) => isCheckedSpecifier(binding.source) && !isBacked(binding));
 
-const v2BundleAdvice = (source: string): string =>
-    parseIconSpecifier(source) === null ? RESOURCE_ADVICE : ICON_ADVICE;
+const adviceFor = (source: string): string => {
+    if (parseResourceSpecifier(source) !== null) {
+        return RESOURCE_ADVICE;
+    }
 
-const bundleAdvice = (source: string, isV2: boolean): string => {
-    if (isBundledResource(source, isV2)) {
-        return isV2 ? v2BundleAdvice(source) : BUNDLE_ADVICE;
+    if (parseIconSpecifier(source) !== null) {
+        return ICON_ADVICE;
     }
 
     if (isUrlSpecifier(source)) {
         return QUERY_ADVICE;
     }
 
-    return source.startsWith(DATA_PREFIX) ? QUERY_ADVICE : RELATIVE_ADVICE;
+    return RELATIVE_ADVICE;
 };
 
-const unbackedBindingError = (path: string, binding: NamedBinding, isV2: boolean): Error =>
+const unbackedBindingError = (path: string, binding: NamedBinding): Error =>
     new Error(
         `${path}: ${JSON.stringify(binding.source)} does not export ${JSON.stringify(binding.name)}, which ` +
         "gtkx build rejects and gtkx dev would bind as undefined. " +
-        bundleAdvice(binding.source, isV2),
+        adviceFor(binding.source),
     );
 
 const isCheckedSource = (path: string): boolean => !path.startsWith(VIRTUAL_PREFIX) && !NODE_MODULES.test(path);
 const hasCheckedAssetMention = (code: string): boolean => ASSET_MENTION_RE.test(code) || code.includes("?url");
 
-const checkAssetImports = (code: string, id: string, isV2: boolean): void => {
+const checkAssetImports = (code: string, id: string): void => {
     const path = stripQuery(id);
     const lang = sourceLanguage(path);
 
@@ -135,27 +118,20 @@ const checkAssetImports = (code: string, id: string, isV2: boolean): void => {
         return;
     }
 
-    const binding = unbackedBinding(parsed.module, isV2);
+    const binding = unbackedBinding(parsed.module);
 
     if (binding !== undefined) {
-        throw unbackedBindingError(path, binding, isV2);
+        throw unbackedBindingError(path, binding);
     }
 };
 
-function gtkxAssetImports(loadConfig: ConfigLoader = createConfigLoader()): Plugin {
-    const state: PluginState = { isV2: false };
-
+function gtkxAssetImports(): Plugin {
     return {
         name: "gtkx:asset-imports",
         enforce: "pre",
 
-        async config(config: UserConfig) {
-            const loaded = await loadConfig.load(config.root ?? process.cwd());
-            state.isV2 = loaded.config.future?.v2ResourceImports === true;
-        },
-
         transform(code, id) {
-            checkAssetImports(code, id, state.isV2);
+            checkAssetImports(code, id);
         },
     };
 }

package/src/vite-plugins/asset-specifier.ts

@@ -1,4 +1,3 @@
-import { DATA_IMPORT_PREFIX } from "../internal/data-dir.js";
 import { ASSET_PATH_RE, ASSET_RE } from "./asset-extensions.js";
 import { stripQuery } from "./strip-query.js";
 
@@ -12,7 +11,6 @@ type IconSpecifier = {
     iconName: string | null;
 };
 
-const DATA_PREFIX = `${DATA_IMPORT_PREFIX}/`;
 const RELATIVE_PREFIX_RE = /^\.\.?(?:\/|$)/;
 const RESOURCE_QUERY_RE = /^resource(?:=([^&#]+))?$/;
 const ICON_QUERY_RE = /^icon(?:=([^&#]+))?$/;
@@ -25,7 +23,6 @@ const getQuery = (source: string): string | null => {
 };
 
 const isAssetSpecifier = (source: string): boolean => ASSET_PATH_RE.test(source);
-const isDataAsset = (source: string): boolean => source.startsWith(DATA_PREFIX) && ASSET_RE.test(source);
 
 const isBareRelativeAsset = (source: string): boolean =>
     getQuery(source) === null && RELATIVE_PREFIX_RE.test(source) && ASSET_RE.test(source);
@@ -71,10 +68,8 @@ const isUrlSpecifier = (source: string): boolean => {
 };
 
 export {
-    DATA_PREFIX,
     isAssetSpecifier,
     isBareRelativeAsset,
-    isDataAsset,
     isUrlSpecifier,
     parseIconSpecifier,
     parseResourceSpecifier,

package/src/vite-plugins/i18n.ts

@@ -1,6 +1,7 @@
 import type { ConfigLoader } from "@gtkx/config";
 import type { Plugin, ResolvedConfig } from "vite";
 import { createConfigLoader } from "@gtkx/config/internal";
+import { toPosixPath } from "@gtkx/utils";
 import { existsSync, mkdirSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join, posix, relative, resolve } from "node:path";
@@ -32,7 +33,7 @@ const isI18nLocaleModule = (state: I18nState, id: string): boolean => {
         return false;
     }
 
-    const path = relative(state.i18nRoot, stripQuery(id)).replaceAll("\\", "/");
+    const path = toPosixPath(relative(state.i18nRoot, stripQuery(id)));
 
     return LOCALE_MODULE_PATHS.has(path);
 };

package/src/vite-plugins/index.ts

@@ -26,9 +26,9 @@ const gtkxVitePlugins = (
         ...(entryPath === undefined ? [] : [gtkxI18n(entryPath, loadConfig, shouldPreserveI18nMetadata)]),
         gtkxStoreLinks(),
         gtkxUndeclaredLibrary(loadConfig),
-        gtkxSettings(loadConfig, buildManifest),
+        gtkxSettings(buildManifest),
         gtkxIcons(loadConfig),
-        gtkxAssetImports(loadConfig),
+        gtkxAssetImports(),
         gtkxBuiltUrl(),
         gtkxResources(loadConfig, entryPath),
         gtkxCss(),

package/src/vite-plugins/resources.ts

@@ -1,20 +1,17 @@
 import type { ConfigLoader } from "@gtkx/config";
 import type { ModuleNode, Plugin, ResolvedConfig, Rolldown, UserConfig, ViteDevServer } from "vite";
 import { createConfigLoader, resourceBasePath } from "@gtkx/config/internal";
-import { error, info, isRecord, sortStrings } from "@gtkx/utils";
+import { error, info, isPathInside, isRecord, sortStrings, toPosixPath } from "@gtkx/utils";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, isAbsolute, join, posix, relative, sep } from "node:path";
 import { parseSync } from "vite";
-import { resolveDataDir } from "../internal/data-dir.js";
-import { type ListedFile, listFilesRecursive } from "../internal/list-files.js";
+import { withExclusiveLoad } from "../internal/module-loads.js";
 import { runCliTool } from "../internal/run-cli-tool.js";
 import { parseRuntimeImportsIn, type SourceImport, sourceLanguage } from "../internal/source-imports.js";
 import { createRetainedStagingDir, type RetainedStagingDir, withStagingDir } from "../internal/staging-dir.js";
 import { ASSET_RE } from "./asset-extensions.js";
 import {
-    DATA_PREFIX,
     isBareRelativeAsset,
-    isDataAsset,
     parseIconSpecifier,
     parseResourceSpecifier,
 } from "./asset-specifier.js";
@@ -44,7 +41,6 @@ type PluginState = {
     prefix: string;
     root: string;
     isBuild: boolean;
-    isV2: boolean;
     entries: Map<string, ResourceEntry>;
     bundledSpecifiers: Map<string, Set<string>>;
     moduleDependencies: Map<string, Set<string>>;
@@ -58,7 +54,6 @@ type PluginState = {
     devBundlePath: string;
     server: ViteDevServer | null;
     compiledSignature: string;
-    dataDir: string | null;
     bundleReferenceId: string | null;
     iconOwners: Map<string, ResourceEntry>;
 };
@@ -118,7 +113,7 @@ type DerivedIconEntry = {
     resourcePath: string;
 };
 
-type LegacyResolveRequest = {
+type ResolveRequest = {
     source: string;
     importer: string | undefined;
     options: Record<string, unknown> | undefined;
@@ -128,6 +123,7 @@ const RESOURCE_COMPILER = "glib-compile-resources";
 const MANIFEST_PREFIX = "/";
 const DEV_STAGING_PREFIX = "resources-dev";
 const MANIFEST_FILENAME = "package.json";
+const DATA_PREFIX = "#data/";
 const BUNDLED_QUERY_MENTION_RE = /[?&](?:icon|resource)(?:[=&]|$)/;
 const ICON_EXTENSIONS: Set<string> = new Set([".png", ".svg", ".xpm"]);
 
@@ -164,16 +160,8 @@ const STOCK_ICON_CONTEXTS: Set<string> = new Set([
 const ICON_SIZE_RE = /^([1-9]\d*)x\1(?:@[1-9]\d*)?$/;
 const RESERVED_ICON_NAMES: Set<string> = new Set(["", ".", ".."]);
 
-const toForwardSlashes = (value: string): string => value.replaceAll(/[/\\]/g, "/");
-
-const isWithin = (root: string, path: string): boolean => {
-    const rel = relative(root, path);
-
-    return rel.length > 0 && !isAbsolute(rel) && rel !== ".." && !rel.startsWith(`..${sep}`);
-};
-
 const isDependencyFile = (root: string, path: string): boolean =>
-    isWithin(root, path) && relative(root, path).split(sep).includes("node_modules");
+    isPathInside(root, path) && relative(root, path).split(sep).includes("node_modules");
 
 const packageIdentityIn = (dir: string): string | null => {
     try {
@@ -216,17 +204,17 @@ const validateResourcePath = (resourcePath: string): string => {
 };
 
 const derivedResourcePath = (state: PluginState, sourcePath: string): string => {
-    if (isWithin(state.root, sourcePath) && !isDependencyFile(state.root, sourcePath)) {
-        return validateResourcePath(`${state.prefix}/${toForwardSlashes(relative(state.root, sourcePath))}`);
+    if (isPathInside(state.root, sourcePath) && !isDependencyFile(state.root, sourcePath)) {
+        return validateResourcePath(`${state.prefix}/${toPosixPath(relative(state.root, sourcePath))}`);
     }
 
     const owner = packageForFile(sourcePath);
 
-    if (owner === null || !isWithin(owner.dir, sourcePath)) {
+    if (owner === null || !isPathInside(owner.dir, sourcePath)) {
         throw new Error(`${sourcePath} is outside the application and does not belong to a named package`);
     }
 
-    const packagePath = toForwardSlashes(relative(owner.dir, sourcePath));
+    const packagePath = toPosixPath(relative(owner.dir, sourcePath));
 
     return validateResourcePath(`${state.prefix}/${owner.name}/${packagePath}`);
 };
@@ -292,7 +280,7 @@ const iconLayoutInParts = (parts: string[], beforeIndex: number): string | null
 };
 
 const iconLayoutFromTree = (sourcePath: string): string | null => {
-    const parts = toForwardSlashes(sourcePath).split("/");
+    const parts = toPosixPath(sourcePath).split("/");
 
     return iconLayoutInParts(parts, parts.length - 2);
 };
@@ -335,11 +323,10 @@ const hasSideEffectIconImport = (code: string, id: string): boolean => {
 };
 
 const retainSideEffectIconImport = (
-    state: PluginState,
     code: string,
     id: string,
 ): { code: string; moduleSideEffects: true } | null =>
-    state.isV2 && hasSideEffectIconImport(code, id)
+    hasSideEffectIconImport(code, id)
         ? { code, moduleSideEffects: true }
         : null;
 
@@ -430,20 +417,6 @@ const refreshRegisteredDevBundle = (state: PluginState): void => {
     }
 };
 
-const scanDataAssets = (dataDir: string): ListedFile[] => listFilesRecursive(dataDir, (name) => ASSET_RE.test(name));
-
-const primeLegacyDevBundle = (state: PluginState): void => {
-    if (state.dataDir === null) {
-        return;
-    }
-
-    for (const { absPath, rel } of scanDataAssets(state.dataDir)) {
-        registerEntry(state, absPath, rel);
-    }
-
-    compileDevBundle(state);
-};
-
 const registerDevAsset = (state: PluginState): void => {
     if (entriesSignature(state) !== state.compiledSignature) {
         compileDevBundle(state);
@@ -490,7 +463,7 @@ const activateEntry = (state: PluginState, entry: ResourceEntry): ResourceEntry
 };
 
 const isDeclarativeImporter = (state: PluginState, importer: string | undefined): importer is string =>
-    !state.isBuild && state.isV2 && importer !== undefined;
+    !state.isBuild && importer !== undefined;
 
 const setSourceAvailability = (state: PluginState, file: string, isAvailable: boolean): void => {
     if (isAvailable) {
@@ -713,26 +686,6 @@ const resolveIconEntry = async (
     };
 };
 
-const resolveLegacyAssetEntry = async (
-    ctx: ResolveContext,
-    state: PluginState,
-    request: LegacyResolveRequest,
-): Promise<ResourceEntry | undefined> => {
-    const resolved = await ctx.resolve(request.source, request.importer, { ...request.options, skipSelf: true });
-
-    if (!resolved || resolved.external) {
-        return undefined;
-    }
-
-    const sourcePath = stripQuery(resolved.id);
-
-    if (!isAbsolute(sourcePath)) {
-        return undefined;
-    }
-
-    return registerEntry(state, sourcePath, request.source.slice(DATA_PREFIX.length));
-};
-
 const loadInitModule = (state: PluginState): string => {
     if (state.isBuild) {
         if (state.bundleReferenceId === null) {
@@ -831,8 +784,7 @@ const loadAssetModule = (state: PluginState, virtualId: string): string => {
     const { absPath, iconName, rel } = virtualAssetMetadata(virtualId);
     const resourcePath = validateResourcePath(rel);
     const { entry, isRegistered } = loadedResourceEntry(state, absPath, resourcePath);
-    const uri = `resource://${entry.resourcePath}`;
-    const defaultValue = iconName ?? (state.isV2 ? entry.resourcePath : uri);
+    const defaultValue = iconName ?? entry.resourcePath;
     compileLoadedDevAsset(state, isRegistered);
 
     return [
@@ -899,12 +851,12 @@ const isSourceModule = (file: string): boolean => sourceLanguage(file) !== undef
 const isBundledSource = (source: string): boolean =>
     parseResourceSpecifier(source) !== null || parseIconSpecifier(source) !== null;
 
-const validateUnbundledV2Source = (source: string): void => {
+const validateUnbundledSource = (source: string): void => {
     if (isLegacyDataSpecifier(source)) {
         throw new Error(`${JSON.stringify(source)} uses the legacy #data asset form`);
     }
 
-    rejectInvalidV2Specifier(source);
+    rejectInvalidSpecifier(source);
 };
 
 const resolvedModuleDependency = async (
@@ -916,7 +868,7 @@ const resolvedModuleDependency = async (
         return null;
     }
 
-    validateUnbundledV2Source(source);
+    validateUnbundledSource(source);
     const resolved = await ctx.resolve(source, importer, { skipSelf: true });
 
     if (resolved === null) {
@@ -952,7 +904,7 @@ const importerReconciliation = async (
     const file = stripQuery(id);
     const key = importerKey(file);
 
-    if (!state.isV2 || state.isBuild || !isSourceModule(file)) {
+    if (state.isBuild || !isSourceModule(file)) {
         return null;
     }
 
@@ -1171,35 +1123,16 @@ const forgetImporterDeclarations = (state: PluginState, importer: string): void
     state.declaredIcons.delete(importer);
 };
 
-const cloneStringSetMap = (source: Map<string, Set<string>>): Map<string, Set<string>> => {
-    const clone: Map<string, Set<string>> = new Map();
-
-    for (const [key, values] of source) {
-        clone.set(key, new Set(values));
-    }
-
-    return clone;
-};
-
-const cloneDeclarationMap = (
-    source: Map<string, Map<string, ResourceEntry>>,
-): Map<string, Map<string, ResourceEntry>> => {
-    const clone: Map<string, Map<string, ResourceEntry>> = new Map();
-
-    for (const [key, declarations] of source) {
-        clone.set(key, new Map(declarations));
-    }
-
-    return clone;
-};
+const cloneMapValues = <Value>(source: Map<string, Value>, clone: (value: Value) => Value): Map<string, Value> =>
+    new Map([...source].map(([key, value]) => [key, clone(value)]));
 
 const reconciliationCandidate = (state: PluginState): PluginState => ({
     ...state,
-    bundledSpecifiers: cloneStringSetMap(state.bundledSpecifiers),
-    moduleDependencies: cloneStringSetMap(state.moduleDependencies),
-    prunedDependencies: cloneStringSetMap(state.prunedDependencies),
-    declaredEntries: cloneDeclarationMap(state.declaredEntries),
-    declaredIcons: cloneDeclarationMap(state.declaredIcons),
+    bundledSpecifiers: cloneMapValues(state.bundledSpecifiers, (values) => new Set(values)),
+    moduleDependencies: cloneMapValues(state.moduleDependencies, (values) => new Set(values)),
+    prunedDependencies: cloneMapValues(state.prunedDependencies, (values) => new Set(values)),
+    declaredEntries: cloneMapValues(state.declaredEntries, (entries) => new Map(entries)),
+    declaredIcons: cloneMapValues(state.declaredIcons, (entries) => new Map(entries)),
     missingSourcePaths: new Set(state.missingSourcePaths),
 });
 
@@ -1333,7 +1266,7 @@ const commitReconciliation = (state: PluginState, candidate: PluginState): void
     state.iconOwners = candidate.iconOwners;
 };
 
-const reconcileV2Importer = async (ctx: ResolveContext, state: PluginState, id: string): Promise<void> => {
+const reconcileImporter = async (ctx: ResolveContext, state: PluginState, id: string): Promise<void> => {
     const reconciliation = await importerReconciliation(ctx, state, id);
 
     if (reconciliation === null) {
@@ -1353,7 +1286,6 @@ const resolveResourceConfig = async (state: PluginState, config: UserConfig, loa
     const loaded = await loadConfig.load(config.root ?? process.cwd());
     state.prefix = resourceBasePath(loaded.config.applicationId);
     state.root = loaded.root;
-    state.isV2 = loaded.config.future?.v2ResourceImports === true;
 
     return {
         assetsInclude: [ASSET_RE],
@@ -1423,14 +1355,6 @@ const attachResourceWatcher = (state: PluginState, server: ViteDevServer): void
 const applyResolvedConfig = (state: PluginState, config: ResolvedConfig): void => {
     state.isBuild = config.command === "build";
     state.root = config.root;
-    state.dataDir = null;
-
-    if (state.isBuild || state.isV2) {
-        return;
-    }
-
-    const relativeDataDir = resolveDataDir(config.root);
-    state.dataDir = relativeDataDir === null ? null : join(config.root, relativeDataDir);
 };
 
 const loadResourceModule = (state: PluginState, id: string): string | undefined => {
@@ -1448,7 +1372,7 @@ const loadResourceModule = (state: PluginState, id: string): string | undefined
 const isLegacyDataSpecifier = (source: string): boolean =>
     source.startsWith(DATA_PREFIX) && ASSET_RE.test(stripQuery(source));
 
-const rejectInvalidV2Specifier = (source: string): void => {
+const rejectInvalidSpecifier = (source: string): void => {
     if (BUNDLED_QUERY_MENTION_RE.test(source)) {
         throw new Error(
             `${JSON.stringify(source)} is not a valid bundled asset import; use ?resource, ` +
@@ -1467,7 +1391,7 @@ const rejectInvalidV2Specifier = (source: string): void => {
 const resolveExplicitResourceId = async (
     ctx: ResolveContext,
     state: PluginState,
-    request: LegacyResolveRequest,
+    request: ResolveRequest,
 ): Promise<string | undefined> => {
     const specifier = parseResourceSpecifier(request.source);
 
@@ -1488,7 +1412,7 @@ const resolveExplicitResourceId = async (
 const resolveIconResourceId = async (
     ctx: ResolveContext,
     state: PluginState,
-    request: LegacyResolveRequest,
+    request: ResolveRequest,
 ): Promise<RetainedIconModuleId | undefined> => {
     const specifier = parseIconSpecifier(request.source);
 
@@ -1508,10 +1432,10 @@ const resolveIconResourceId = async (
         : { id: virtualIconId(resolved), moduleSideEffects: true };
 };
 
-const resolveV2ResourceId = async (
+const resolveBundledResourceId = async (
     ctx: ResolveContext,
     state: PluginState,
-    request: LegacyResolveRequest,
+    request: ResolveRequest,
 ): Promise<ResourceModuleId | undefined> => {
     if (isLegacyDataSpecifier(request.source)) {
         throw new Error(
@@ -1534,46 +1458,21 @@ const resolveV2ResourceId = async (
         return resolved;
     }
 
-    rejectInvalidV2Specifier(request.source);
+    rejectInvalidSpecifier(request.source);
 
     return undefined;
 };
 
-const resolveLegacyResourceId = async (
-    ctx: ResolveContext,
-    state: PluginState,
-    request: LegacyResolveRequest,
-): Promise<string | undefined> => {
-    if (BUNDLED_QUERY_MENTION_RE.test(request.source)) {
-        throw new Error(`${JSON.stringify(request.source)} requires future.v2ResourceImports`);
-    }
-
-    if (!isDataAsset(request.source)) {
-        return undefined;
-    }
-
-    const entry = await resolveLegacyAssetEntry(ctx, state, request);
-
-    return entry === undefined ? undefined : virtualAssetId(entry);
-};
-
 const resolveResourceId = (
     ctx: ResolveContext,
     state: PluginState,
-    request: LegacyResolveRequest,
+    request: ResolveRequest,
 ): Promise<ResourceModuleId | undefined> => {
     if (request.source === VIRTUAL_INIT) {
         return Promise.resolve(VIRTUAL_INIT);
     }
 
-    return state.isV2
-        ? resolveV2ResourceId(ctx, state, request)
-        : resolveLegacyResourceId(ctx, state, request);
-};
-
-const configureResourceServer = (state: PluginState, server: ViteDevServer): void => {
-    attachResourceWatcher(state, server);
-    primeLegacyDevBundle(state);
+    return resolveBundledResourceId(ctx, state, request);
 };
 
 const createResourcesPlugin = (state: PluginState, loadConfig: ConfigLoader): Plugin => ({
@@ -1588,7 +1487,7 @@ const createResourcesPlugin = (state: PluginState, loadConfig: ConfigLoader): Pl
     },
 
     configureServer: (server) => {
-        configureResourceServer(state, server);
+        attachResourceWatcher(state, server);
     },
 
     buildStart() {
@@ -1610,9 +1509,9 @@ const createResourcesPlugin = (state: PluginState, loadConfig: ConfigLoader): Pl
     },
 
     async transform(code, id) {
-        await reconcileV2Importer(this, state, id);
+        await withExclusiveLoad(state, () => reconcileImporter(this, state, id));
 
-        return retainSideEffectIconImport(state, code, id);
+        return retainSideEffectIconImport(code, id);
     },
 
     generateBundle(_options, bundle) {
@@ -1629,7 +1528,6 @@ function gtkxResources(loadConfig: ConfigLoader = createConfigLoader(), entryPat
         prefix: "",
         root: "",
         isBuild: false,
-        isV2: false,
         entries: new Map(),
         bundledSpecifiers: new Map(),
         moduleDependencies: new Map(),
@@ -1643,7 +1541,6 @@ function gtkxResources(loadConfig: ConfigLoader = createConfigLoader(), entryPat
         devBundlePath: "",
         server: null,
         compiledSignature: "",
-        dataDir: null,
         bundleReferenceId: null,
         iconOwners: new Map(),
     };

package/src/vite-plugins/settings-worker-env.ts

@@ -1,7 +1,6 @@
 import type { UserConfig } from "vite";
 import type { Plugin } from "vitest/config";
 import { createConfigLoader } from "@gtkx/config/internal";
-import { resolveDataDir } from "../internal/data-dir.js";
 import { prependSchemaDir, stageAndCompileProjectSchemas } from "../settings/schema.js";
 
 function gtkxSettingsWorkerEnv(): Plugin {
@@ -13,8 +12,7 @@ function gtkxSettingsWorkerEnv(): Plugin {
 
         async config(config: UserConfig) {
             const loaded = await loadConfig.load(config.root ?? process.cwd());
-            const dataDir = loaded.config.future?.v2ResourceImports === true ? null : resolveDataDir(loaded.root);
-            const dir = stageAndCompileProjectSchemas(loaded.root, dataDir);
+            const dir = stageAndCompileProjectSchemas(loaded.root);
 
             if (dir === null) {
                 return;