adnbn 0.12.0 → 0.13.0

package/dist/cli/bundler/plugins/isolated-styles/IsolatedStylesPlugin.js

@@ -2,7 +2,8 @@ import { RuntimeGlobals, RuntimeModule } from "@rspack/core";
 import { CssContentHashType, filenameRequiresFullHash, resolveChunkFilename } from "./../../../../cli/bundler/utils/chunk-filename.js";
 import { getManifestHooks } from "../utils/manifest-hooks.js";
 import { renderIsolatedStylesCssLoader, renderIsolatedStylesRuntime } from "./templates.js";
-import { getIsolatedStylesFiles, isIsolatedStylesChunk } from "./chunks.js";
+import { getStylesFiles, isIsolatedStylesChunk } from "./chunks.js";
+import { createStylesCacheGroup, DocumentStylesCacheGroup } from "./split-chunks.js";
 const PluginName = "IsolatedStylesPlugin";
 const CssLoadingRuntimeIdentifier = "webpack/runtime/css loading";
 const CssRuntimeBoundary = "// object to store loaded CSS chunks";
@@ -25,7 +26,9 @@ class IsolatedStylesRuntimeModule extends RuntimeModule {
   cssChunkFilename;
   generate() {
     const compilation = this.compilation;
-    if (!compilation) throw new Error("Isolated styles runtime is not attached to a compilation");
+    if (!compilation) {
+      throw new Error("Isolated styles runtime is not attached to a compilation");
+    }
     const initialStyles = initialStyleChunks(compilation, this.entry, this.cssFilename, this.cssChunkFilename).map(
       ({ chunk, filename }) => resolveChunkFilename(compilation, chunk, filename, CssContentHashType)
     );
@@ -40,9 +43,10 @@ class IsolatedStylesRuntimeModule extends RuntimeModule {
 }
 const initialStyleChunks = (compilation, entry, cssFilename, cssChunkFilename) => {
   const entrypoint = compilation.entrypoints.get(entry);
-  if (!entrypoint) throw new Error(`Isolated styles entrypoint "${entry}" is unavailable`);
-  const entryChunk = entrypoint.getEntrypointChunk();
-  return Array.from(entrypoint.chunks).filter((chunk) => isIsolatedStylesChunk(compilation, chunk)).map((chunk) => ({ chunk, filename: chunk === entryChunk ? cssFilename : cssChunkFilename }));
+  if (!entrypoint) {
+    throw new Error(`Isolated styles entrypoint "${entry}" is unavailable`);
+  }
+  return Array.from(entrypoint.chunks).filter((chunk) => isIsolatedStylesChunk(compilation, chunk)).map((chunk) => ({ chunk, filename: chunk.canBeInitial() ? cssFilename : cssChunkFilename }));
 };
 const hasAsyncCss = (chunk) => {
   return Array.from(chunk.getAllAsyncChunks()).some((candidate) => {
@@ -56,14 +60,31 @@ class IsolatedStylesPlugin {
   options;
   originalRuntimeSources = /* @__PURE__ */ new WeakMap();
   apply(compiler) {
+    const cacheGroup = createStylesCacheGroup(compiler, this.options.test);
+    compiler.hooks.afterEnvironment.tap(PluginName, () => {
+      const splitChunks = compiler.options.optimization.splitChunks;
+      if (splitChunks) {
+        splitChunks.cacheGroups = {
+          [DocumentStylesCacheGroup]: cacheGroup,
+          ...splitChunks.cacheGroups
+        };
+      }
+    });
     compiler.hooks.compilation.tap(PluginName, (compilation) => {
       getManifestHooks(compilation).prepareDependencies.tap(PluginName, (dependencies) => {
-        const isolatedFiles = getIsolatedStylesFiles(compilation);
+        var _a;
         for (const [entry, dependency] of dependencies) {
-          if (!this.options.test(entry)) continue;
+          if (!this.options.test(entry)) {
+            continue;
+          }
+          const files = getStylesFiles(compilation, ((_a = compilation.entrypoints.get(entry)) == null ? void 0 : _a.chunks) ?? []);
           for (const file of dependency.css) {
-            if (!isolatedFiles.has(file)) continue;
-            dependency.css.delete(file);
+            if (!files.defaults.has(file)) {
+              continue;
+            }
+            if (!files.document.has(file)) {
+              dependency.css.delete(file);
+            }
             dependency.assets.add(file);
           }
         }
@@ -127,7 +148,7 @@ class IsolatedStylesPlugin {
         }
         source.source = renderIsolatedStylesCssLoader({
           isolatedChunks: Object.fromEntries(
-            [...compilation.chunks].filter((candidate) => isIsolatedStylesChunk(compilation, candidate)).map((candidate) => [candidate.id, true])
+            [...chunk.getAllReferencedChunks()].filter((candidate) => isIsolatedStylesChunk(compilation, candidate)).map((candidate) => [candidate.id, true])
           ),
           originalLoader: originalSource.slice(0, boundary),
           cssFilenameExpression: filenameExpression,
@@ -149,16 +170,20 @@ class IsolatedStylesPlugin {
               ...entrypoint.getEntrypointChunk().getAllReferencedChunks()
             ]);
             for (const candidate of referenced) {
-              const destination = isIsolatedStylesChunk(compilation, candidate) ? isolated : document;
+              const destination = this.options.test(entry) && isIsolatedStylesChunk(compilation, candidate) ? isolated : document;
               for (const file of candidate.files) {
-                if (file.endsWith(".css")) destination.add(file);
+                if (file.endsWith(".css")) {
+                  destination.add(file);
+                }
               }
             }
             const warnings = this.options.validate(entry, {
               document: [...document].sort(),
               isolated: [...isolated].sort()
             });
-            for (const message of warnings ?? []) compilation.warnings.push(new Error(message));
+            for (const message of warnings ?? []) {
+              compilation.warnings.push(new Error(message));
+            }
           }
           if (chunk && chunk.name !== void 0 && this.options.test(chunk.name) && hasAsyncCss(entrypoint.getEntrypointChunk()) && !patched.has(chunk)) {
             throw new Error(`CSS loading runtime for isolated entrypoint "${chunk.name}" was not replaced`);

package/dist/cli/bundler/plugins/isolated-styles/IsolatedStylesPlugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/cli/bundler/plugins/isolated-styles/IsolatedStylesPlugin.ts"],"sourcesContent":["import {type Chunk, type Compilation, type Compiler, type Filename, RuntimeGlobals, RuntimeModule} from \"@rspack/core\";\n\nimport {CssContentHashType, filenameRequiresFullHash, resolveChunkFilename} from \"@cli/bundler/utils/chunk-filename\";\nimport type {RuntimePropertyOptions} from \"../types\";\nimport {getManifestHooks} from \"../utils/manifest-hooks\";\n\nimport {renderIsolatedStylesCssLoader, renderIsolatedStylesRuntime} from \"./templates\";\nimport {getIsolatedStylesFiles, isIsolatedStylesChunk} from \"./chunks\";\n\nconst PluginName = \"IsolatedStylesPlugin\";\nconst CssLoadingRuntimeIdentifier = \"webpack/runtime/css loading\";\nconst CssRuntimeBoundary = \"// object to store loaded CSS chunks\";\nconst CssFilenameExpression = /var href = (.+?)\\(chunkId\\);/;\n\nexport interface IsolatedStylesPluginOptions extends RuntimePropertyOptions {\n    cssFilename: Filename;\n    cssChunkFilename: Filename;\n    test: (entry: string) => boolean;\n    timeout?: number;\n    /** Inspects every entry's initial, shared and async CSS, independently of test. Throw to reject; return warning messages to report without changing delivery. */\n    validate?: (entry: string, files: IsolatedStylesPluginFiles) => void | readonly string[];\n}\n\n/** CSS destinations in one entrypoint's complete dependency graph, for build diagnostics only. */\nexport interface IsolatedStylesPluginFiles {\n    readonly document: readonly string[];\n    readonly isolated: readonly string[];\n}\n\nclass IsolatedStylesRuntimeModule extends RuntimeModule {\n    public constructor(\n        private readonly entry: string,\n        private readonly property: string,\n        private readonly timeout: number,\n        private readonly cssFilename: Filename,\n        private readonly cssChunkFilename: Filename,\n        fullHash: boolean\n    ) {\n        super(`isolated styles ${entry}`, RuntimeModule.STAGE_ATTACH);\n        this.dependentHash = true;\n        this.fullHash = fullHash;\n    }\n\n    public generate(): string {\n        const compilation = this.compilation;\n        if (!compilation) throw new Error(\"Isolated styles runtime is not attached to a compilation\");\n\n        const initialStyles = initialStyleChunks(compilation, this.entry, this.cssFilename, this.cssChunkFilename).map(\n            ({chunk, filename}) => resolveChunkFilename(compilation, chunk, filename, CssContentHashType)\n        );\n\n        return renderIsolatedStylesRuntime({\n            entry: this.entry,\n            require: RuntimeGlobals.require,\n            property: this.property,\n            timeout: this.timeout,\n            initialStyles,\n        });\n    }\n}\n\nconst initialStyleChunks = (\n    compilation: Compilation,\n    entry: string,\n    cssFilename: Filename,\n    cssChunkFilename: Filename\n): {chunk: Chunk; filename: Filename}[] => {\n    const entrypoint = compilation.entrypoints.get(entry);\n    if (!entrypoint) throw new Error(`Isolated styles entrypoint \"${entry}\" is unavailable`);\n\n    const entryChunk = entrypoint.getEntrypointChunk();\n    return Array.from(entrypoint.chunks)\n        .filter(chunk => isIsolatedStylesChunk(compilation, chunk))\n        .map(chunk => ({chunk, filename: chunk === entryChunk ? cssFilename : cssChunkFilename}));\n};\n\nconst hasAsyncCss = (chunk: Chunk): boolean => {\n    return Array.from(chunk.getAllAsyncChunks()).some(candidate => {\n        return [...candidate.files, ...candidate.auxiliaryFiles].some(file => file.endsWith(\".css\"));\n    });\n};\n\nexport default class IsolatedStylesPlugin {\n    private readonly originalRuntimeSources = new WeakMap<RuntimeModule, string>();\n\n    public constructor(private readonly options: IsolatedStylesPluginOptions) {}\n\n    public apply(compiler: Compiler): void {\n        compiler.hooks.compilation.tap(PluginName, compilation => {\n            getManifestHooks(compilation).prepareDependencies.tap(PluginName, dependencies => {\n                const isolatedFiles = getIsolatedStylesFiles(compilation);\n                for (const [entry, dependency] of dependencies) {\n                    if (!this.options.test(entry)) continue;\n\n                    for (const file of dependency.css) {\n                        if (!isolatedFiles.has(file)) continue;\n                        dependency.css.delete(file);\n                        dependency.assets.add(file);\n                    }\n                }\n            });\n        });\n\n        const timeout = this.options.timeout ?? compiler.options.output.chunkLoadTimeout ?? 120_000;\n\n        compiler.hooks.thisCompilation.tap(PluginName, compilation => {\n            const injected = new Set<Chunk>();\n            const patched = new Set<Chunk>();\n\n            compilation.hooks.additionalTreeRuntimeRequirements.tap(PluginName, (chunk, requirements) => {\n                if (chunk.name === undefined || !this.options.test(chunk.name) || injected.has(chunk)) {\n                    return;\n                }\n\n                requirements.add(RuntimeGlobals.require);\n                requirements.add(RuntimeGlobals.publicPath);\n                injected.add(chunk);\n                const fullHash = initialStyleChunks(\n                    compilation,\n                    chunk.name,\n                    this.options.cssFilename,\n                    this.options.cssChunkFilename\n                ).some(({chunk, filename}) =>\n                    filenameRequiresFullHash(compilation, chunk, filename, CssContentHashType)\n                );\n                compilation.addRuntimeModule(\n                    chunk,\n                    new IsolatedStylesRuntimeModule(\n                        chunk.name,\n                        this.options.property,\n                        timeout,\n                        this.options.cssFilename,\n                        this.options.cssChunkFilename,\n                        fullHash\n                    )\n                );\n            });\n\n            compilation.hooks.runtimeModule.tap(PluginName, (runtimeModule, chunk) => {\n                if (chunk.name === undefined || runtimeModule.identifier() !== CssLoadingRuntimeIdentifier) {\n                    return;\n                }\n\n                const source = runtimeModule.source;\n\n                if (!source || typeof source.source !== \"string\") {\n                    throw new Error(\n                        `CSS loading runtime source for isolated entrypoint \"${chunk.name}\" is unavailable`\n                    );\n                }\n\n                if (source.source.length === 0) {\n                    return;\n                }\n\n                const originalSource = this.originalRuntimeSources.get(runtimeModule) ?? source.source;\n                this.originalRuntimeSources.set(runtimeModule, originalSource);\n                source.source = originalSource;\n\n                if (!this.options.test(chunk.name)) {\n                    return;\n                }\n\n                const boundary = originalSource.indexOf(CssRuntimeBoundary);\n                const filenameExpression = originalSource.match(CssFilenameExpression)?.[1];\n\n                if (boundary < 0 || !filenameExpression) {\n                    throw new Error(`CSS loading runtime seam for isolated entrypoint \"${chunk.name}\" is unavailable`);\n                }\n\n                source.source = renderIsolatedStylesCssLoader({\n                    isolatedChunks: Object.fromEntries(\n                        [...compilation.chunks]\n                            .filter(candidate => isIsolatedStylesChunk(compilation, candidate))\n                            .map(candidate => [candidate.id, true])\n                    ),\n                    originalLoader: originalSource.slice(0, boundary),\n                    cssFilenameExpression: filenameExpression,\n                    originalRuntime: originalSource.slice(boundary),\n                    publicPath: RuntimeGlobals.publicPath,\n                    require: RuntimeGlobals.require,\n                    property: this.options.property,\n                });\n                patched.add(chunk);\n            });\n\n            compilation.hooks.afterSeal.tap(PluginName, () => {\n                for (const [entry, entrypoint] of compilation.entrypoints) {\n                    const chunk = entrypoint.getRuntimeChunk();\n\n                    if (this.options.validate) {\n                        const document = new Set<string>();\n                        const isolated = new Set<string>();\n                        const referenced = new Set([\n                            ...entrypoint.chunks,\n                            ...entrypoint.getEntrypointChunk().getAllReferencedChunks(),\n                        ]);\n                        for (const candidate of referenced) {\n                            const destination = isIsolatedStylesChunk(compilation, candidate) ? isolated : document;\n                            for (const file of candidate.files) {\n                                if (file.endsWith(\".css\")) destination.add(file);\n                            }\n                        }\n                        const warnings = this.options.validate(entry, {\n                            document: [...document].sort(),\n                            isolated: [...isolated].sort(),\n                        });\n                        for (const message of warnings ?? []) compilation.warnings.push(new Error(message));\n                    }\n\n                    if (\n                        chunk &&\n                        chunk.name !== undefined &&\n                        this.options.test(chunk.name) &&\n                        hasAsyncCss(entrypoint.getEntrypointChunk()) &&\n                        !patched.has(chunk)\n                    ) {\n                        throw new Error(`CSS loading runtime for isolated entrypoint \"${chunk.name}\" was not replaced`);\n                    }\n                }\n            });\n        });\n    }\n}\n"],"mappings":"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","names":["chunk"]}
+{"version":3,"sources":["../../../../../src/cli/bundler/plugins/isolated-styles/IsolatedStylesPlugin.ts"],"sourcesContent":["import {type Chunk, type Compilation, type Compiler, type Filename, RuntimeGlobals, RuntimeModule} from \"@rspack/core\";\n\nimport {CssContentHashType, filenameRequiresFullHash, resolveChunkFilename} from \"@cli/bundler/utils/chunk-filename\";\nimport type {RuntimePropertyOptions} from \"../types\";\nimport {getManifestHooks} from \"../utils/manifest-hooks\";\n\nimport {renderIsolatedStylesCssLoader, renderIsolatedStylesRuntime} from \"./templates\";\nimport {getStylesFiles, isIsolatedStylesChunk} from \"./chunks\";\nimport {createStylesCacheGroup, DocumentStylesCacheGroup} from \"./split-chunks\";\n\nconst PluginName = \"IsolatedStylesPlugin\";\nconst CssLoadingRuntimeIdentifier = \"webpack/runtime/css loading\";\nconst CssRuntimeBoundary = \"// object to store loaded CSS chunks\";\nconst CssFilenameExpression = /var href = (.+?)\\(chunkId\\);/;\n\nexport interface IsolatedStylesPluginOptions extends RuntimePropertyOptions {\n    cssFilename: Filename;\n    cssChunkFilename: Filename;\n    test: (entry: string) => boolean;\n    timeout?: number;\n    /** Inspects every entry's initial, shared and async CSS using its delivery policy. Throw to reject; return warning messages without changing delivery. */\n    validate?: (entry: string, files: IsolatedStylesPluginFiles) => void | readonly string[];\n}\n\n/** CSS destinations in one entrypoint's complete dependency graph, for build diagnostics only. */\nexport interface IsolatedStylesPluginFiles {\n    readonly document: readonly string[];\n    readonly isolated: readonly string[];\n}\n\nclass IsolatedStylesRuntimeModule extends RuntimeModule {\n    public constructor(\n        private readonly entry: string,\n        private readonly property: string,\n        private readonly timeout: number,\n        private readonly cssFilename: Filename,\n        private readonly cssChunkFilename: Filename,\n        fullHash: boolean\n    ) {\n        super(`isolated styles ${entry}`, RuntimeModule.STAGE_ATTACH);\n        this.dependentHash = true;\n        this.fullHash = fullHash;\n    }\n\n    public generate(): string {\n        const compilation = this.compilation;\n\n        if (!compilation) {\n            throw new Error(\"Isolated styles runtime is not attached to a compilation\");\n        }\n\n        const initialStyles = initialStyleChunks(compilation, this.entry, this.cssFilename, this.cssChunkFilename).map(\n            ({chunk, filename}) => resolveChunkFilename(compilation, chunk, filename, CssContentHashType)\n        );\n\n        return renderIsolatedStylesRuntime({\n            entry: this.entry,\n            require: RuntimeGlobals.require,\n            property: this.property,\n            timeout: this.timeout,\n            initialStyles,\n        });\n    }\n}\n\nconst initialStyleChunks = (\n    compilation: Compilation,\n    entry: string,\n    cssFilename: Filename,\n    cssChunkFilename: Filename\n): {chunk: Chunk; filename: Filename}[] => {\n    const entrypoint = compilation.entrypoints.get(entry);\n\n    if (!entrypoint) {\n        throw new Error(`Isolated styles entrypoint \"${entry}\" is unavailable`);\n    }\n\n    return Array.from(entrypoint.chunks)\n        .filter(chunk => isIsolatedStylesChunk(compilation, chunk))\n        .map(chunk => ({chunk, filename: chunk.canBeInitial() ? cssFilename : cssChunkFilename}));\n};\n\nconst hasAsyncCss = (chunk: Chunk): boolean => {\n    return Array.from(chunk.getAllAsyncChunks()).some(candidate => {\n        return [...candidate.files, ...candidate.auxiliaryFiles].some(file => file.endsWith(\".css\"));\n    });\n};\n\nexport default class IsolatedStylesPlugin {\n    private readonly originalRuntimeSources = new WeakMap<RuntimeModule, string>();\n\n    public constructor(private readonly options: IsolatedStylesPluginOptions) {}\n\n    public apply(compiler: Compiler): void {\n        const cacheGroup = createStylesCacheGroup(compiler, this.options.test);\n\n        // Defaults are resolved before this hook; SplitChunksPlugin is configured afterwards.\n        compiler.hooks.afterEnvironment.tap(PluginName, () => {\n            const splitChunks = compiler.options.optimization.splitChunks;\n\n            if (splitChunks) {\n                splitChunks.cacheGroups = {\n                    [DocumentStylesCacheGroup]: cacheGroup,\n                    ...splitChunks.cacheGroups,\n                };\n            }\n        });\n\n        compiler.hooks.compilation.tap(PluginName, compilation => {\n            getManifestHooks(compilation).prepareDependencies.tap(PluginName, dependencies => {\n                for (const [entry, dependency] of dependencies) {\n                    if (!this.options.test(entry)) {\n                        continue;\n                    }\n\n                    const files = getStylesFiles(compilation, compilation.entrypoints.get(entry)?.chunks ?? []);\n\n                    for (const file of dependency.css) {\n                        if (!files.defaults.has(file)) {\n                            continue;\n                        }\n\n                        // Identical CSS can have the same contenthash filename in both destinations.\n                        if (!files.document.has(file)) {\n                            dependency.css.delete(file);\n                        }\n\n                        dependency.assets.add(file);\n                    }\n                }\n            });\n        });\n\n        const timeout = this.options.timeout ?? compiler.options.output.chunkLoadTimeout ?? 120_000;\n\n        compiler.hooks.thisCompilation.tap(PluginName, compilation => {\n            const injected = new Set<Chunk>();\n            const patched = new Set<Chunk>();\n\n            compilation.hooks.additionalTreeRuntimeRequirements.tap(PluginName, (chunk, requirements) => {\n                if (chunk.name === undefined || !this.options.test(chunk.name) || injected.has(chunk)) {\n                    return;\n                }\n\n                requirements.add(RuntimeGlobals.require);\n                requirements.add(RuntimeGlobals.publicPath);\n                injected.add(chunk);\n\n                const fullHash = initialStyleChunks(\n                    compilation,\n                    chunk.name,\n                    this.options.cssFilename,\n                    this.options.cssChunkFilename\n                ).some(({chunk, filename}) =>\n                    filenameRequiresFullHash(compilation, chunk, filename, CssContentHashType)\n                );\n\n                compilation.addRuntimeModule(\n                    chunk,\n                    new IsolatedStylesRuntimeModule(\n                        chunk.name,\n                        this.options.property,\n                        timeout,\n                        this.options.cssFilename,\n                        this.options.cssChunkFilename,\n                        fullHash\n                    )\n                );\n            });\n\n            compilation.hooks.runtimeModule.tap(PluginName, (runtimeModule, chunk) => {\n                if (chunk.name === undefined || runtimeModule.identifier() !== CssLoadingRuntimeIdentifier) {\n                    return;\n                }\n\n                const source = runtimeModule.source;\n\n                if (!source || typeof source.source !== \"string\") {\n                    throw new Error(\n                        `CSS loading runtime source for isolated entrypoint \"${chunk.name}\" is unavailable`\n                    );\n                }\n\n                if (source.source.length === 0) {\n                    return;\n                }\n\n                const originalSource = this.originalRuntimeSources.get(runtimeModule) ?? source.source;\n                this.originalRuntimeSources.set(runtimeModule, originalSource);\n                source.source = originalSource;\n\n                if (!this.options.test(chunk.name)) {\n                    return;\n                }\n\n                const boundary = originalSource.indexOf(CssRuntimeBoundary);\n                const filenameExpression = originalSource.match(CssFilenameExpression)?.[1];\n\n                if (boundary < 0 || !filenameExpression) {\n                    throw new Error(`CSS loading runtime seam for isolated entrypoint \"${chunk.name}\" is unavailable`);\n                }\n\n                source.source = renderIsolatedStylesCssLoader({\n                    isolatedChunks: Object.fromEntries(\n                        [...chunk.getAllReferencedChunks()]\n                            .filter(candidate => isIsolatedStylesChunk(compilation, candidate))\n                            .map(candidate => [candidate.id, true])\n                    ),\n                    originalLoader: originalSource.slice(0, boundary),\n                    cssFilenameExpression: filenameExpression,\n                    originalRuntime: originalSource.slice(boundary),\n                    publicPath: RuntimeGlobals.publicPath,\n                    require: RuntimeGlobals.require,\n                    property: this.options.property,\n                });\n\n                patched.add(chunk);\n            });\n\n            compilation.hooks.afterSeal.tap(PluginName, () => {\n                for (const [entry, entrypoint] of compilation.entrypoints) {\n                    const chunk = entrypoint.getRuntimeChunk();\n\n                    if (this.options.validate) {\n                        const document = new Set<string>();\n                        const isolated = new Set<string>();\n\n                        const referenced = new Set([\n                            ...entrypoint.chunks,\n                            ...entrypoint.getEntrypointChunk().getAllReferencedChunks(),\n                        ]);\n\n                        for (const candidate of referenced) {\n                            const destination =\n                                this.options.test(entry) && isIsolatedStylesChunk(compilation, candidate)\n                                    ? isolated\n                                    : document;\n\n                            for (const file of candidate.files) {\n                                if (file.endsWith(\".css\")) {\n                                    destination.add(file);\n                                }\n                            }\n                        }\n\n                        const warnings = this.options.validate(entry, {\n                            document: [...document].sort(),\n                            isolated: [...isolated].sort(),\n                        });\n\n                        for (const message of warnings ?? []) {\n                            compilation.warnings.push(new Error(message));\n                        }\n                    }\n\n                    if (\n                        chunk &&\n                        chunk.name !== undefined &&\n                        this.options.test(chunk.name) &&\n                        hasAsyncCss(entrypoint.getEntrypointChunk()) &&\n                        !patched.has(chunk)\n                    ) {\n                        throw new Error(`CSS loading runtime for isolated entrypoint \"${chunk.name}\" was not replaced`);\n                    }\n                }\n            });\n        });\n    }\n}\n"],"mappings":"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","names":["chunk"]}

package/dist/cli/bundler/plugins/isolated-styles/chunks.d.ts

@@ -1,3 +1,7 @@
 import type { Chunk, Compilation } from "@rspack/core";
+/** Only call for chunks reachable by an entry with isolated delivery. Other entries may mix CSS categories. */
 export declare const isIsolatedStylesChunk: (compilation: Compilation, chunk: Chunk) => boolean;
-export declare const getIsolatedStylesFiles: (compilation: Compilation) => ReadonlySet<string>;
+export declare const getStylesFiles: (compilation: Compilation, chunks: Iterable<Chunk>) => {
+    document: ReadonlySet<string>;
+    defaults: ReadonlySet<string>;
+};

package/dist/cli/bundler/plugins/isolated-styles/chunks.js

@@ -1,32 +1,33 @@
-import { IsolatedStylesLayer } from "./../../../../cli/bundler/layers.js";
-const isIsolatedStylesModule = (module) => module.type === "css/mini-extract" && module.layer === IsolatedStylesLayer;
+import { DocumentStylesLayer } from "./../../../../cli/bundler/layers.js";
+import { DocumentStylesCacheGroup } from "./split-chunks.js";
+const isDocumentStylesModule = (module) => module.layer === DocumentStylesLayer;
 const isIsolatedStylesChunk = (compilation, chunk) => {
   const modules = [...compilation.chunkGraph.getChunkModulesIterable(chunk)].filter(
     (module) => module.type === "css/mini-extract"
   );
-  const isolated = modules.some(isIsolatedStylesModule);
-  if (isolated && !modules.every(isIsolatedStylesModule)) {
+  const document = modules.some(isDocumentStylesModule);
+  if (document && !modules.every(isDocumentStylesModule)) {
     throw new Error(
-      `CSS chunk "${chunk.name ?? chunk.id}" mixes document and ?isolation styles. Preserve the adnbnIsolatedStyles CSS cache group in your bundler configuration.`
+      `CSS chunk "${chunk.name ?? chunk.id}" mixes document and default styles for isolated delivery. Preserve the ${DocumentStylesCacheGroup} CSS cache group in your bundler configuration.`
     );
   }
-  return isolated;
+  return modules.length > 0 && !document;
 };
-const getIsolatedStylesFiles = (compilation) => {
-  const files = /* @__PURE__ */ new Set();
-  for (const chunk of compilation.chunks) {
-    if (isIsolatedStylesChunk(compilation, chunk)) {
-      for (const file of chunk.files) {
-        if (file.endsWith(".css")) {
-          files.add(file);
-        }
+const getStylesFiles = (compilation, chunks) => {
+  const document = /* @__PURE__ */ new Set();
+  const defaults = /* @__PURE__ */ new Set();
+  for (const chunk of chunks) {
+    const files = isIsolatedStylesChunk(compilation, chunk) ? defaults : document;
+    for (const file of chunk.files) {
+      if (file.endsWith(".css")) {
+        files.add(file);
       }
     }
   }
-  return files;
+  return { document, defaults };
 };
 export {
-  getIsolatedStylesFiles,
+  getStylesFiles,
   isIsolatedStylesChunk
 };
 //# sourceMappingURL=chunks.js.map

package/dist/cli/bundler/plugins/isolated-styles/chunks.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/cli/bundler/plugins/isolated-styles/chunks.ts"],"sourcesContent":["import type {Chunk, Compilation, Module} from \"@rspack/core\";\n\nimport {IsolatedStylesLayer} from \"@cli/bundler/layers\";\n\nconst isIsolatedStylesModule = (module: Module): boolean =>\n    module.type === \"css/mini-extract\" && module.layer === IsolatedStylesLayer;\n\nexport const isIsolatedStylesChunk = (compilation: Compilation, chunk: Chunk): boolean => {\n    const modules = [...compilation.chunkGraph.getChunkModulesIterable(chunk)].filter(\n        module => module.type === \"css/mini-extract\"\n    );\n\n    const isolated = modules.some(isIsolatedStylesModule);\n\n    if (isolated && !modules.every(isIsolatedStylesModule)) {\n        throw new Error(\n            `CSS chunk \"${chunk.name ?? chunk.id}\" mixes document and ?isolation styles. Preserve the adnbnIsolatedStyles CSS cache group in your bundler configuration.`\n        );\n    }\n\n    return isolated;\n};\n\nexport const getIsolatedStylesFiles = (compilation: Compilation): ReadonlySet<string> => {\n    const files = new Set<string>();\n\n    for (const chunk of compilation.chunks) {\n        if (isIsolatedStylesChunk(compilation, chunk)) {\n            for (const file of chunk.files) {\n                if (file.endsWith(\".css\")) {\n                    files.add(file);\n                }\n            }\n        }\n    }\n\n    return files;\n};\n"],"mappings":"AAEA,SAAQ,2BAA0B;AAElC,MAAM,yBAAyB,CAAC,WAC5B,OAAO,SAAS,sBAAsB,OAAO,UAAU;AAEpD,MAAM,wBAAwB,CAAC,aAA0B,UAA0B;AACtF,QAAM,UAAU,CAAC,GAAG,YAAY,WAAW,wBAAwB,KAAK,CAAC,EAAE;AAAA,IACvE,YAAU,OAAO,SAAS;AAAA,EAC9B;AAEA,QAAM,WAAW,QAAQ,KAAK,sBAAsB;AAEpD,MAAI,YAAY,CAAC,QAAQ,MAAM,sBAAsB,GAAG;AACpD,UAAM,IAAI;AAAA,MACN,cAAc,MAAM,QAAQ,MAAM,EAAE;AAAA,IACxC;AAAA,EACJ;AAEA,SAAO;AACX;AAEO,MAAM,yBAAyB,CAAC,gBAAkD;AACrF,QAAM,QAAQ,oBAAI,IAAY;AAE9B,aAAW,SAAS,YAAY,QAAQ;AACpC,QAAI,sBAAsB,aAAa,KAAK,GAAG;AAC3C,iBAAW,QAAQ,MAAM,OAAO;AAC5B,YAAI,KAAK,SAAS,MAAM,GAAG;AACvB,gBAAM,IAAI,IAAI;AAAA,QAClB;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AAEA,SAAO;AACX;","names":[]}
+{"version":3,"sources":["../../../../../src/cli/bundler/plugins/isolated-styles/chunks.ts"],"sourcesContent":["import type {Chunk, Compilation, Module} from \"@rspack/core\";\n\nimport {DocumentStylesLayer} from \"@cli/bundler/layers\";\nimport {DocumentStylesCacheGroup} from \"./split-chunks\";\n\nconst isDocumentStylesModule = (module: Module): boolean => module.layer === DocumentStylesLayer;\n\n/** Only call for chunks reachable by an entry with isolated delivery. Other entries may mix CSS categories. */\nexport const isIsolatedStylesChunk = (compilation: Compilation, chunk: Chunk): boolean => {\n    const modules = [...compilation.chunkGraph.getChunkModulesIterable(chunk)].filter(\n        module => module.type === \"css/mini-extract\"\n    );\n\n    const document = modules.some(isDocumentStylesModule);\n\n    if (document && !modules.every(isDocumentStylesModule)) {\n        throw new Error(\n            `CSS chunk \"${chunk.name ?? chunk.id}\" mixes document and default styles for isolated delivery. Preserve the ${DocumentStylesCacheGroup} CSS cache group in your bundler configuration.`\n        );\n    }\n\n    return modules.length > 0 && !document;\n};\n\nexport const getStylesFiles = (\n    compilation: Compilation,\n    chunks: Iterable<Chunk>\n): {document: ReadonlySet<string>; defaults: ReadonlySet<string>} => {\n    const document = new Set<string>();\n    const defaults = new Set<string>();\n\n    for (const chunk of chunks) {\n        const files = isIsolatedStylesChunk(compilation, chunk) ? defaults : document;\n\n        for (const file of chunk.files) {\n            if (file.endsWith(\".css\")) {\n                files.add(file);\n            }\n        }\n    }\n\n    return {document, defaults};\n};\n"],"mappings":"AAEA,SAAQ,2BAA0B;AAClC,SAAQ,gCAA+B;AAEvC,MAAM,yBAAyB,CAAC,WAA4B,OAAO,UAAU;AAGtE,MAAM,wBAAwB,CAAC,aAA0B,UAA0B;AACtF,QAAM,UAAU,CAAC,GAAG,YAAY,WAAW,wBAAwB,KAAK,CAAC,EAAE;AAAA,IACvE,YAAU,OAAO,SAAS;AAAA,EAC9B;AAEA,QAAM,WAAW,QAAQ,KAAK,sBAAsB;AAEpD,MAAI,YAAY,CAAC,QAAQ,MAAM,sBAAsB,GAAG;AACpD,UAAM,IAAI;AAAA,MACN,cAAc,MAAM,QAAQ,MAAM,EAAE,2EAA2E,wBAAwB;AAAA,IAC3I;AAAA,EACJ;AAEA,SAAO,QAAQ,SAAS,KAAK,CAAC;AAClC;AAEO,MAAM,iBAAiB,CAC1B,aACA,WACiE;AACjE,QAAM,WAAW,oBAAI,IAAY;AACjC,QAAM,WAAW,oBAAI,IAAY;AAEjC,aAAW,SAAS,QAAQ;AACxB,UAAM,QAAQ,sBAAsB,aAAa,KAAK,IAAI,WAAW;AAErE,eAAW,QAAQ,MAAM,OAAO;AAC5B,UAAI,KAAK,SAAS,MAAM,GAAG;AACvB,cAAM,IAAI,IAAI;AAAA,MAClB;AAAA,IACJ;AAAA,EACJ;AAEA,SAAO,EAAC,UAAU,SAAQ;AAC9B;","names":[]}

package/dist/cli/bundler/plugins/isolated-styles/split-chunks.d.ts

@@ -0,0 +1,4 @@
+import type { Compiler, OptimizationSplitChunksCacheGroup } from "@rspack/core";
+export declare const DocumentStylesCacheGroup = "adnbnDocumentStyles";
+/** Partition CSS only where an entry needs separate document and isolated delivery. */
+export declare const createStylesCacheGroup: (compiler: Compiler, test: (entry: string) => boolean) => OptimizationSplitChunksCacheGroup;

package/dist/cli/bundler/plugins/isolated-styles/split-chunks.js

@@ -0,0 +1,51 @@
+import { DocumentStylesLayer } from "./../../../../cli/bundler/layers.js";
+const DocumentStylesCacheGroup = "adnbnDocumentStyles";
+const createStylesCacheGroup = (compiler, test) => {
+  let compilation;
+  let selectedGroups = /* @__PURE__ */ new WeakMap();
+  compiler.hooks.thisCompilation.tap("IsolatedStylesPlugin", (current) => {
+    compilation = current;
+    selectedGroups = /* @__PURE__ */ new WeakMap();
+  });
+  const selected = (group) => {
+    const cached = selectedGroups.get(group);
+    if (cached !== void 0) {
+      return cached;
+    }
+    const pending = [group];
+    const visited = /* @__PURE__ */ new Set();
+    while (pending.length) {
+      const parent = pending.pop();
+      if (visited.has(parent)) {
+        continue;
+      }
+      visited.add(parent);
+      if (parent.isInitial() && parent.name !== void 0 && test(parent.name)) {
+        selectedGroups.set(group, true);
+        return true;
+      }
+      pending.push(...parent.getParents());
+    }
+    selectedGroups.set(group, false);
+    return false;
+  };
+  return {
+    type: "css/mini-extract",
+    layer: DocumentStylesLayer,
+    chunks: (chunk) => {
+      const modules = compilation.chunkGraph.getChunkModulesIterable(chunk);
+      if (![...modules].some((module) => module.type === "css/mini-extract")) {
+        return false;
+      }
+      return [...chunk.groupsIterable].some(selected);
+    },
+    enforce: true,
+    name: false,
+    priority: 100
+  };
+};
+export {
+  DocumentStylesCacheGroup,
+  createStylesCacheGroup
+};
+//# sourceMappingURL=split-chunks.js.map

package/dist/cli/bundler/plugins/isolated-styles/split-chunks.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/cli/bundler/plugins/isolated-styles/split-chunks.ts"],"sourcesContent":["import type {Chunk, ChunkGroup, Compilation, Compiler, OptimizationSplitChunksCacheGroup} from \"@rspack/core\";\n\nimport {DocumentStylesLayer} from \"@cli/bundler/layers\";\n\nexport const DocumentStylesCacheGroup = \"adnbnDocumentStyles\";\n\n/** Partition CSS only where an entry needs separate document and isolated delivery. */\nexport const createStylesCacheGroup = (\n    compiler: Compiler,\n    test: (entry: string) => boolean\n): OptimizationSplitChunksCacheGroup => {\n    let compilation: Compilation;\n    let selectedGroups = new WeakMap<ChunkGroup, boolean>();\n\n    compiler.hooks.thisCompilation.tap(\"IsolatedStylesPlugin\", current => {\n        compilation = current;\n        selectedGroups = new WeakMap();\n    });\n\n    const selected = (group: ChunkGroup): boolean => {\n        const cached = selectedGroups.get(group);\n\n        if (cached !== undefined) {\n            return cached;\n        }\n\n        const pending = [group];\n        const visited = new Set<ChunkGroup>();\n\n        while (pending.length) {\n            const parent = pending.pop()!;\n\n            if (visited.has(parent)) {\n                continue;\n            }\n\n            visited.add(parent);\n\n            if (parent.isInitial() && parent.name !== undefined && test(parent.name)) {\n                selectedGroups.set(group, true);\n\n                return true;\n            }\n\n            pending.push(...parent.getParents());\n        }\n\n        selectedGroups.set(group, false);\n\n        return false;\n    };\n\n    return {\n        type: \"css/mini-extract\",\n        layer: DocumentStylesLayer,\n        chunks: (chunk: Chunk): boolean => {\n            const modules = compilation.chunkGraph.getChunkModulesIterable(chunk);\n\n            if (![...modules].some(module => module.type === \"css/mini-extract\")) {\n                return false;\n            }\n\n            return [...chunk.groupsIterable].some(selected);\n        },\n        enforce: true,\n        name: false,\n        priority: 100,\n    };\n};\n"],"mappings":"AAEA,SAAQ,2BAA0B;AAE3B,MAAM,2BAA2B;AAGjC,MAAM,yBAAyB,CAClC,UACA,SACoC;AACpC,MAAI;AACJ,MAAI,iBAAiB,oBAAI,QAA6B;AAEtD,WAAS,MAAM,gBAAgB,IAAI,wBAAwB,aAAW;AAClE,kBAAc;AACd,qBAAiB,oBAAI,QAAQ;AAAA,EACjC,CAAC;AAED,QAAM,WAAW,CAAC,UAA+B;AAC7C,UAAM,SAAS,eAAe,IAAI,KAAK;AAEvC,QAAI,WAAW,QAAW;AACtB,aAAO;AAAA,IACX;AAEA,UAAM,UAAU,CAAC,KAAK;AACtB,UAAM,UAAU,oBAAI,IAAgB;AAEpC,WAAO,QAAQ,QAAQ;AACnB,YAAM,SAAS,QAAQ,IAAI;AAE3B,UAAI,QAAQ,IAAI,MAAM,GAAG;AACrB;AAAA,MACJ;AAEA,cAAQ,IAAI,MAAM;AAElB,UAAI,OAAO,UAAU,KAAK,OAAO,SAAS,UAAa,KAAK,OAAO,IAAI,GAAG;AACtE,uBAAe,IAAI,OAAO,IAAI;AAE9B,eAAO;AAAA,MACX;AAEA,cAAQ,KAAK,GAAG,OAAO,WAAW,CAAC;AAAA,IACvC;AAEA,mBAAe,IAAI,OAAO,KAAK;AAE/B,WAAO;AAAA,EACX;AAEA,SAAO;AAAA,IACH,MAAM;AAAA,IACN,OAAO;AAAA,IACP,QAAQ,CAAC,UAA0B;AAC/B,YAAM,UAAU,YAAY,WAAW,wBAAwB,KAAK;AAEpE,UAAI,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,YAAU,OAAO,SAAS,kBAAkB,GAAG;AAClE,eAAO;AAAA,MACX;AAEA,aAAO,CAAC,GAAG,MAAM,cAAc,EAAE,KAAK,QAAQ;AAAA,IAClD;AAAA,IACA,SAAS;AAAA,IACT,MAAM;AAAA,IACN,UAAU;AAAA,EACd;AACJ;","names":[]}

package/dist/cli/bundler/plugins/isolated-styles/templates.js

@@ -25,6 +25,8 @@ var attachStyle = function (root, url, retry) {
 
     if (existing) return existing.promise;
 
+    rootState.order.add(url);
+
     var resolveStyle;
     var rejectStyle;
     var promise = new Promise(function (resolve, reject) {
@@ -52,6 +54,7 @@ var attachStyle = function (root, url, retry) {
         if (error) {
             rootState.styles.delete(url);
             record.link.remove();
+            console.error(error);
             rejectStyle(error);
         } else {
             resolveStyle();
@@ -78,8 +81,26 @@ var attachStyle = function (root, url, retry) {
                 settle(createStyleError(url, type));
             }
         };
-        // Replace in place: appending a retry could change the CSS cascade order.
-        root.insertBefore(link, previous || rootState.target);
+        // A failed link may be retried after later styles succeeded. Preserve its original position.
+        var next = previous || rootState.target;
+        var after = false;
+
+        if (!previous) {
+            for (var file of rootState.order) {
+                if (file === url) {
+                    after = true;
+                } else if (after) {
+                    var following = rootState.styles.get(file);
+
+                    if (following && following.link) {
+                        next = following.link;
+                        break;
+                    }
+                }
+            }
+        }
+
+        root.insertBefore(link, next);
         if (previous) previous.remove();
     };
     // One budget for both attempts, never another timer for the retry.
@@ -101,14 +122,23 @@ __ADNBN_REQUIRE__[__ADNBN_PROPERTY__] = {
         if (!isolatedInitialStyles)
             throw new Error('Isolated stylesheet URLs for entrypoint "' + isolatedStyleEntry + '" are not initialized');
 
-        isolatedStyleRoots.set(root, {target: target, styles: new Map()});
+        isolatedStyleRoots.set(root, {target: target, styles: new Map(), order: new Set()});
 
         isolatedInitialStyles.concat(Array.from(isolatedRequestedStyles)).forEach(function (url) {
-            attachStyle(root, url, retry).catch(function (error) {
-                console.error(error);
-            });
+            attachStyle(root, url, retry).catch(function () {});
         });
     },
+    ready: function (root) {
+        if (!isolatedStyleRoots.has(root)) {
+            return Promise.resolve();
+        }
+
+        return Promise.all(
+            isolatedInitialStyles.concat(Array.from(isolatedRequestedStyles)).map(function (url) {
+                return attachStyle(root, url);
+            })
+        ).then(function () {});
+    },
     delete: function (root) {
         var rootState = isolatedStyleRoots.get(root);
 

package/dist/cli/plugins/content/bundler.d.ts

@@ -1,7 +1,4 @@
 import type { ResourceAccessPluginRequirement } from "../../bundler/plugins/resource-access/index.js";
-import type { IsolatedStylesPluginFiles } from "../../bundler/plugins/isolated-styles/index.js";
 import { ContentScriptWorld, type ContentScriptEntrypointOptions } from "../../../types/content/index.js";
-/** Reject unavailable destinations and warn about likely missing query flags without changing CSS routing. */
-export declare const validateContentStyles: (entry: string, options: ContentScriptEntrypointOptions | undefined, files: IsolatedStylesPluginFiles) => readonly string[];
 export declare const createPageAccessRequirements: (entries: ReadonlyMap<string, ContentScriptEntrypointOptions>, pages: ReadonlyMap<string, string>) => ResourceAccessPluginRequirement[];
 export declare const getContentChunkName: (world: ContentScriptWorld) => string;

package/dist/cli/plugins/content/bundler.js

@@ -1,28 +1,13 @@
-import { isContentScriptFrameNavigation } from "./../../../shared/content/index.js";
-import { hasIsolatedTarget } from "./utils.js";
 import { ContentScriptMatches, ContentScriptWorld } from "./../../../types/content/index.js";
 import { EntrypointType } from "./../../../types/entrypoint.js";
-const validateContentStyles = (entry, options, files) => {
-  var _a;
-  if (!options) return [];
-  if (files.isolated.length > 0 && isContentScriptFrameNavigation(options.isolation)) {
-    throw new Error(
-      `Entrypoint "${entry}" uses ?isolation CSS with isolation.page/isolation.src, but has no local render target. Import these styles in the embedded page instead.`
-    );
-  }
-  if (hasIsolatedTarget(options) && files.document.length > 0 && files.isolated.length === 0) {
-    return [
-      `[adnbn:missing-isolation-css] Entrypoint "${entry}" uses isolation: "${(_a = options.isolation) == null ? void 0 : _a.type}", but has no CSS marked with ?isolation. Imported CSS will be delivered to the page document. If these styles belong to the isolated UI, import them with ?isolation. Document-only styles are valid; this warning can be suppressed with bundler ignoreWarnings.`
-    ];
-  }
-  return [];
-};
 const createPageAccessRequirements = (entries, pages) => {
   var _a;
   const requirements = [];
   for (const [entry, options] of entries) {
     const alias = (_a = options.isolation) == null ? void 0 : _a.page;
-    if (alias === void 0) continue;
+    if (alias === void 0) {
+      continue;
+    }
     const resource = pages.get(alias);
     if (!resource) {
       throw new Error(`Content entrypoint "${entry}" references unknown page "${alias}"`);
@@ -41,7 +26,6 @@ const getContentChunkName = (world) => {
 };
 export {
   createPageAccessRequirements,
-  getContentChunkName,
-  validateContentStyles
+  getContentChunkName
 };
 //# sourceMappingURL=bundler.js.map

package/dist/cli/plugins/content/bundler.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/content/bundler.ts"],"sourcesContent":["import type {ResourceAccessPluginRequirement} from \"@cli/bundler/plugins/resource-access\";\nimport type {IsolatedStylesPluginFiles} from \"@cli/bundler/plugins/isolated-styles\";\nimport {isContentScriptFrameNavigation} from \"@shared/content\";\nimport {hasIsolatedTarget} from \"./utils\";\n\nimport {ContentScriptMatches, ContentScriptWorld, type ContentScriptEntrypointOptions} from \"@typing/content\";\nimport {EntrypointType} from \"@typing/entrypoint\";\n\n/** Reject unavailable destinations and warn about likely missing query flags without changing CSS routing. */\nexport const validateContentStyles = (\n    entry: string,\n    options: ContentScriptEntrypointOptions | undefined,\n    files: IsolatedStylesPluginFiles\n): readonly string[] => {\n    if (!options) return [];\n    if (files.isolated.length > 0 && isContentScriptFrameNavigation(options.isolation)) {\n        throw new Error(\n            `Entrypoint \"${entry}\" uses ?isolation CSS with isolation.page/isolation.src, but has no local render target. Import these styles in the embedded page instead.`\n        );\n    }\n    if (hasIsolatedTarget(options) && files.document.length > 0 && files.isolated.length === 0) {\n        return [\n            `[adnbn:missing-isolation-css] Entrypoint \"${entry}\" uses isolation: \"${options.isolation?.type}\", but has no CSS marked with ?isolation. Imported CSS will be delivered to the page document. If these styles belong to the isolated UI, import them with ?isolation. Document-only styles are valid; this warning can be suppressed with bundler ignoreWarnings.`,\n        ];\n    }\n    return [];\n};\n\nexport const createPageAccessRequirements = (\n    entries: ReadonlyMap<string, ContentScriptEntrypointOptions>,\n    pages: ReadonlyMap<string, string>\n): ResourceAccessPluginRequirement[] => {\n    const requirements: ResourceAccessPluginRequirement[] = [];\n\n    for (const [entry, options] of entries) {\n        const alias = options.isolation?.page;\n        if (alias === undefined) continue;\n\n        const resource = pages.get(alias);\n        if (!resource) {\n            throw new Error(`Content entrypoint \"${entry}\" references unknown page \"${alias}\"`);\n        }\n\n        requirements.push({\n            resource,\n            matches: options.matches ?? ContentScriptMatches,\n            issuer: `Content entrypoint \"${entry}\" embedding page \"${alias}\"`,\n            hint: \"add matches to the page or narrow the content matches\",\n        });\n    }\n\n    return requirements;\n};\n\nexport const getContentChunkName = (world: ContentScriptWorld): string => {\n    return `${world === ContentScriptWorld.Main ? \"common-main\" : \"common\"}.${EntrypointType.ContentScript}`;\n};\n"],"mappings":"AAEA,SAAQ,sCAAqC;AAC7C,SAAQ,yBAAwB;AAEhC,SAAQ,sBAAsB,0BAA8D;AAC5F,SAAQ,sBAAqB;AAGtB,MAAM,wBAAwB,CACjC,OACA,SACA,UACoB;AAbxB;AAcI,MAAI,CAAC,QAAS,QAAO,CAAC;AACtB,MAAI,MAAM,SAAS,SAAS,KAAK,+BAA+B,QAAQ,SAAS,GAAG;AAChF,UAAM,IAAI;AAAA,MACN,eAAe,KAAK;AAAA,IACxB;AAAA,EACJ;AACA,MAAI,kBAAkB,OAAO,KAAK,MAAM,SAAS,SAAS,KAAK,MAAM,SAAS,WAAW,GAAG;AACxF,WAAO;AAAA,MACH,6CAA6C,KAAK,uBAAsB,aAAQ,cAAR,mBAAmB,IAAI;AAAA,IACnG;AAAA,EACJ;AACA,SAAO,CAAC;AACZ;AAEO,MAAM,+BAA+B,CACxC,SACA,UACoC;AA/BxC;AAgCI,QAAM,eAAkD,CAAC;AAEzD,aAAW,CAAC,OAAO,OAAO,KAAK,SAAS;AACpC,UAAM,SAAQ,aAAQ,cAAR,mBAAmB;AACjC,QAAI,UAAU,OAAW;AAEzB,UAAM,WAAW,MAAM,IAAI,KAAK;AAChC,QAAI,CAAC,UAAU;AACX,YAAM,IAAI,MAAM,uBAAuB,KAAK,8BAA8B,KAAK,GAAG;AAAA,IACtF;AAEA,iBAAa,KAAK;AAAA,MACd;AAAA,MACA,SAAS,QAAQ,WAAW;AAAA,MAC5B,QAAQ,uBAAuB,KAAK,qBAAqB,KAAK;AAAA,MAC9D,MAAM;AAAA,IACV,CAAC;AAAA,EACL;AAEA,SAAO;AACX;AAEO,MAAM,sBAAsB,CAAC,UAAsC;AACtE,SAAO,GAAG,UAAU,mBAAmB,OAAO,gBAAgB,QAAQ,IAAI,eAAe,aAAa;AAC1G;","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/content/bundler.ts"],"sourcesContent":["import type {ResourceAccessPluginRequirement} from \"@cli/bundler/plugins/resource-access\";\n\nimport {ContentScriptMatches, ContentScriptWorld, type ContentScriptEntrypointOptions} from \"@typing/content\";\nimport {EntrypointType} from \"@typing/entrypoint\";\n\nexport const createPageAccessRequirements = (\n    entries: ReadonlyMap<string, ContentScriptEntrypointOptions>,\n    pages: ReadonlyMap<string, string>\n): ResourceAccessPluginRequirement[] => {\n    const requirements: ResourceAccessPluginRequirement[] = [];\n\n    for (const [entry, options] of entries) {\n        const alias = options.isolation?.page;\n\n        if (alias === undefined) {\n            continue;\n        }\n\n        const resource = pages.get(alias);\n\n        if (!resource) {\n            throw new Error(`Content entrypoint \"${entry}\" references unknown page \"${alias}\"`);\n        }\n\n        requirements.push({\n            resource,\n            matches: options.matches ?? ContentScriptMatches,\n            issuer: `Content entrypoint \"${entry}\" embedding page \"${alias}\"`,\n            hint: \"add matches to the page or narrow the content matches\",\n        });\n    }\n\n    return requirements;\n};\n\nexport const getContentChunkName = (world: ContentScriptWorld): string => {\n    return `${world === ContentScriptWorld.Main ? \"common-main\" : \"common\"}.${EntrypointType.ContentScript}`;\n};\n"],"mappings":"AAEA,SAAQ,sBAAsB,0BAA8D;AAC5F,SAAQ,sBAAqB;AAEtB,MAAM,+BAA+B,CACxC,SACA,UACoC;AARxC;AASI,QAAM,eAAkD,CAAC;AAEzD,aAAW,CAAC,OAAO,OAAO,KAAK,SAAS;AACpC,UAAM,SAAQ,aAAQ,cAAR,mBAAmB;AAEjC,QAAI,UAAU,QAAW;AACrB;AAAA,IACJ;AAEA,UAAM,WAAW,MAAM,IAAI,KAAK;AAEhC,QAAI,CAAC,UAAU;AACX,YAAM,IAAI,MAAM,uBAAuB,KAAK,8BAA8B,KAAK,GAAG;AAAA,IACtF;AAEA,iBAAa,KAAK;AAAA,MACd;AAAA,MACA,SAAS,QAAQ,WAAW;AAAA,MAC5B,QAAQ,uBAAuB,KAAK,qBAAqB,KAAK;AAAA,MAC9D,MAAM;AAAA,IACV,CAAC;AAAA,EACL;AAEA,SAAO;AACX;AAEO,MAAM,sBAAsB,CAAC,UAAsC;AACtE,SAAO,GAAG,UAAU,mBAAmB,OAAO,gBAAgB,QAAQ,IAAI,eAAe,aAAa;AAC1G;","names":[]}

package/dist/cli/plugins/content/index.js

@@ -3,7 +3,7 @@ import Content from "./Content.js";
 import Relay from "./Relay.js";
 import RelayDeclaration from "./RelayDeclaration.js";
 import { hasIsolatedTarget } from "./utils.js";
-import { createPageAccessRequirements, getContentChunkName, validateContentStyles } from "./bundler.js";
+import { createPageAccessRequirements, getContentChunkName } from "./bundler.js";
 import { createRelayModule, RelayModuleName } from "./relay-module.js";
 import { definePlugin } from "./../../../main/plugin.js";
 import { PageFinder } from "./../../../cli/entrypoint/index.js";
@@ -124,8 +124,7 @@ var content_default = definePlugin(() => {
             test: (entry) => {
               const options = entryOptionsByName.get(entry);
               return options !== void 0 && hasIsolatedTarget(options);
-            },
-            validate: (entry, files) => validateContentStyles(entry, entryOptionsByName.get(entry), files)
+            }
           }),
           ...basePlugins
         ],

package/dist/cli/plugins/content/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/content/index.ts"],"sourcesContent":["import type {Chunk, Configuration as RspackConfig, NormalModule, Plugins} from \"@rspack/core\";\n\nimport ContentManager from \"./ContentManager\";\nimport Content from \"./Content\";\nimport Relay from \"./Relay\";\nimport RelayDeclaration from \"./RelayDeclaration\";\nimport {hasIsolatedTarget} from \"./utils\";\nimport {createPageAccessRequirements, getContentChunkName, validateContentStyles} from \"./bundler\";\nimport {createRelayModule, RelayModuleName} from \"./relay-module\";\n\nimport {definePlugin} from \"@main/plugin\";\nimport {PageFinder} from \"@cli/entrypoint/index.js\";\nimport {getContentLayer} from \"@cli/bundler/layers\";\n\nimport {\n    appFilenameResolver,\n    ChunkLoaderPlugin,\n    EntrypointPlugin,\n    onlyViaTopLevelEntry,\n    IsolatedStylesPlugin,\n    ResourceAccessPlugin,\n    GenerateModulePlugin,\n} from \"@cli/bundler\";\n\nimport {Command} from \"@typing/app\";\nimport {ContentScriptStylesRuntimeProperty, ContentScriptWorld} from \"@typing/content\";\n\nexport default definePlugin(() => {\n    let contentProvider: Content;\n    let relayProvider: Relay;\n    let contentManager: ContentManager;\n    let relayDeclaration: RelayDeclaration;\n\n    return {\n        name: \"adnbn:content\",\n        startup: ({config}) => {\n            contentProvider = new Content(config);\n            relayProvider = new Relay(config);\n\n            // prettier-ignore\n            contentManager = new ContentManager(config)\n                .provider(contentProvider)\n                .provider(relayProvider);\n\n            relayDeclaration = new RelayDeclaration(config);\n        },\n        content: () => contentProvider.files(),\n        relay: () => relayProvider.files(),\n        bundler: async ({config}) => {\n            relayDeclaration.dictionary(await relayProvider.dictionary()).build();\n\n            let entryOptionsByName = await contentManager.entryOptions();\n\n            const getModules = async () => ({\n                [RelayModuleName]: createRelayModule(await relayProvider.getOptionsMap()),\n            });\n            const modulePlugin = new GenerateModulePlugin(await getModules());\n\n            if (config.command === Command.Watch) {\n                modulePlugin.watch(getModules);\n            }\n\n            const basePlugins: Plugins = [\n                modulePlugin,\n                new ResourceAccessPlugin({\n                    requirements: async () => {\n                        if (\n                            !Array.from(entryOptionsByName.values()).some(\n                                options => options.isolation?.page !== undefined\n                            )\n                        ) {\n                            return [];\n                        }\n\n                        const views = await new PageFinder(config).views();\n                        const pages = new Map(Array.from(views.values(), view => [view.alias, view.filename]));\n                        return createPageAccessRequirements(entryOptionsByName, pages);\n                    },\n                }),\n            ];\n\n            if (await contentManager.empty()) {\n                if (config.debug) {\n                    console.warn(\"Content script or relay entries not found\");\n                }\n\n                return {plugins: basePlugins};\n            }\n\n            const entries = await contentManager.entries();\n            const getEntryWorld = (name: string): ContentScriptWorld => {\n                const options = entryOptionsByName.get(name);\n\n                if (!options) {\n                    throw new Error(`Execution world for content entrypoint \"${name}\" is unavailable`);\n                }\n\n                return options.world === ContentScriptWorld.Main\n                    ? ContentScriptWorld.Main\n                    : ContentScriptWorld.Isolated;\n            };\n\n            // prettier-ignore\n            const entrypointPlugin = EntrypointPlugin.from(entries)\n                .virtual(file => contentManager.virtual(file))\n                .entryOptions(name => {\n                    const world = getEntryWorld(name);\n\n                    return {\n                        // MAIN cannot resolve an installed extension URL without crossing contexts.\n                        // ISOLATED keeps physical async chunks and resolves them through the extension API.\n                        asyncChunks: world === ContentScriptWorld.Isolated,\n                        layer: getContentLayer(world),\n                        publicPath: \"\",\n                    };\n                });\n\n            if (config.command === Command.Watch) {\n                entrypointPlugin.watch(async () => {\n                    contentManager.clear();\n\n                    relayDeclaration.dictionary(await relayProvider.dictionary()).build();\n\n                    const entries = await contentManager.entries();\n                    entryOptionsByName = await contentManager.entryOptions();\n\n                    return entries;\n                });\n            }\n\n            const isContentModule = onlyViaTopLevelEntry([\"content\", \"relay\"]);\n\n            const createCacheGroup = (world: ContentScriptWorld) => ({\n                minChunks: 2,\n                name: getContentChunkName(world),\n                test: (\n                    module: Parameters<typeof isContentModule>[0],\n                    context: Parameters<typeof isContentModule>[1]\n                ) => {\n                    const normalModule = module as NormalModule;\n\n                    if (!normalModule.resource) {\n                        return false;\n                    }\n\n                    return isContentModule(module, context);\n                },\n                chunks: (chunk: Chunk): boolean =>\n                    chunk.name !== undefined &&\n                    entryOptionsByName.has(chunk.name) &&\n                    getEntryWorld(chunk.name) === world,\n                enforce: false,\n                reuseExistingChunk: false,\n                priority: 20,\n            });\n\n            return {\n                plugins: [\n                    entrypointPlugin,\n                    new ChunkLoaderPlugin({\n                        test: entry =>\n                            entryOptionsByName.has(entry) && getEntryWorld(entry) === ContentScriptWorld.Isolated,\n                    }),\n                    new IsolatedStylesPlugin({\n                        cssFilename: appFilenameResolver(config.app, config.cssFilename, config.cssDir),\n                        cssChunkFilename: appFilenameResolver(config.app, config.cssFilename, config.cssDir),\n                        property: ContentScriptStylesRuntimeProperty,\n                        test: entry => {\n                            const options = entryOptionsByName.get(entry);\n                            return options !== undefined && hasIsolatedTarget(options);\n                        },\n                        validate: (entry, files) => validateContentStyles(entry, entryOptionsByName.get(entry), files),\n                    }),\n                    ...basePlugins,\n                ],\n                optimization: config.commonChunks\n                    ? {\n                          splitChunks: {\n                              cacheGroups: {\n                                  adnbnContentIsolated: createCacheGroup(ContentScriptWorld.Isolated),\n                                  adnbnContentMain: createCacheGroup(ContentScriptWorld.Main),\n                              },\n                          },\n                      }\n                    : undefined,\n            } satisfies RspackConfig;\n        },\n        manifest: async ({manifest}) => {\n            // prettier-ignore\n            manifest\n                .setContentScripts(await contentManager.manifest())\n                .appendHostPermissions(await contentManager.hostPermissions())\n                .appendOptionalHostPermissions(await contentManager.optionalHostPermissions())\n                .appendPermissions(await contentManager.permissions())\n                .appendOptionalPermissions(await contentManager.optionalPermissions());\n        },\n    };\n});\n"],"mappings":"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","names":["entries"]}
+{"version":3,"sources":["../../../../src/cli/plugins/content/index.ts"],"sourcesContent":["import type {Chunk, Configuration as RspackConfig, NormalModule, Plugins} from \"@rspack/core\";\n\nimport ContentManager from \"./ContentManager\";\nimport Content from \"./Content\";\nimport Relay from \"./Relay\";\nimport RelayDeclaration from \"./RelayDeclaration\";\nimport {hasIsolatedTarget} from \"./utils\";\nimport {createPageAccessRequirements, getContentChunkName} from \"./bundler\";\nimport {createRelayModule, RelayModuleName} from \"./relay-module\";\n\nimport {definePlugin} from \"@main/plugin\";\nimport {PageFinder} from \"@cli/entrypoint/index.js\";\nimport {getContentLayer} from \"@cli/bundler/layers\";\n\nimport {\n    appFilenameResolver,\n    ChunkLoaderPlugin,\n    EntrypointPlugin,\n    onlyViaTopLevelEntry,\n    IsolatedStylesPlugin,\n    ResourceAccessPlugin,\n    GenerateModulePlugin,\n} from \"@cli/bundler\";\n\nimport {Command} from \"@typing/app\";\nimport {ContentScriptStylesRuntimeProperty, ContentScriptWorld} from \"@typing/content\";\n\nexport default definePlugin(() => {\n    let contentProvider: Content;\n    let relayProvider: Relay;\n    let contentManager: ContentManager;\n    let relayDeclaration: RelayDeclaration;\n\n    return {\n        name: \"adnbn:content\",\n        startup: ({config}) => {\n            contentProvider = new Content(config);\n            relayProvider = new Relay(config);\n\n            // prettier-ignore\n            contentManager = new ContentManager(config)\n                .provider(contentProvider)\n                .provider(relayProvider);\n\n            relayDeclaration = new RelayDeclaration(config);\n        },\n        content: () => contentProvider.files(),\n        relay: () => relayProvider.files(),\n        bundler: async ({config}) => {\n            relayDeclaration.dictionary(await relayProvider.dictionary()).build();\n\n            let entryOptionsByName = await contentManager.entryOptions();\n\n            const getModules = async () => ({\n                [RelayModuleName]: createRelayModule(await relayProvider.getOptionsMap()),\n            });\n\n            const modulePlugin = new GenerateModulePlugin(await getModules());\n\n            if (config.command === Command.Watch) {\n                modulePlugin.watch(getModules);\n            }\n\n            const basePlugins: Plugins = [\n                modulePlugin,\n                new ResourceAccessPlugin({\n                    requirements: async () => {\n                        if (\n                            !Array.from(entryOptionsByName.values()).some(\n                                options => options.isolation?.page !== undefined\n                            )\n                        ) {\n                            return [];\n                        }\n\n                        const views = await new PageFinder(config).views();\n                        const pages = new Map(Array.from(views.values(), view => [view.alias, view.filename]));\n\n                        return createPageAccessRequirements(entryOptionsByName, pages);\n                    },\n                }),\n            ];\n\n            if (await contentManager.empty()) {\n                if (config.debug) {\n                    console.warn(\"Content script or relay entries not found\");\n                }\n\n                return {plugins: basePlugins};\n            }\n\n            const entries = await contentManager.entries();\n\n            const getEntryWorld = (name: string): ContentScriptWorld => {\n                const options = entryOptionsByName.get(name);\n\n                if (!options) {\n                    throw new Error(`Execution world for content entrypoint \"${name}\" is unavailable`);\n                }\n\n                return options.world === ContentScriptWorld.Main\n                    ? ContentScriptWorld.Main\n                    : ContentScriptWorld.Isolated;\n            };\n\n            // prettier-ignore\n            const entrypointPlugin = EntrypointPlugin.from(entries)\n                .virtual(file => contentManager.virtual(file))\n                .entryOptions(name => {\n                    const world = getEntryWorld(name);\n\n                    return {\n                        // MAIN cannot resolve an installed extension URL without crossing contexts.\n                        // ISOLATED keeps physical async chunks and resolves them through the extension API.\n                        asyncChunks: world === ContentScriptWorld.Isolated,\n                        layer: getContentLayer(world),\n                        publicPath: \"\",\n                    };\n                });\n\n            if (config.command === Command.Watch) {\n                entrypointPlugin.watch(async () => {\n                    contentManager.clear();\n\n                    relayDeclaration.dictionary(await relayProvider.dictionary()).build();\n\n                    const entries = await contentManager.entries();\n                    entryOptionsByName = await contentManager.entryOptions();\n\n                    return entries;\n                });\n            }\n\n            const isContentModule = onlyViaTopLevelEntry([\"content\", \"relay\"]);\n\n            const createCacheGroup = (world: ContentScriptWorld) => ({\n                minChunks: 2,\n                name: getContentChunkName(world),\n                test: (\n                    module: Parameters<typeof isContentModule>[0],\n                    context: Parameters<typeof isContentModule>[1]\n                ) => {\n                    const normalModule = module as NormalModule;\n\n                    if (!normalModule.resource) {\n                        return false;\n                    }\n\n                    return isContentModule(module, context);\n                },\n                chunks: (chunk: Chunk): boolean =>\n                    chunk.name !== undefined &&\n                    entryOptionsByName.has(chunk.name) &&\n                    getEntryWorld(chunk.name) === world,\n                enforce: false,\n                reuseExistingChunk: false,\n                priority: 20,\n            });\n\n            return {\n                plugins: [\n                    entrypointPlugin,\n                    new ChunkLoaderPlugin({\n                        test: entry =>\n                            entryOptionsByName.has(entry) && getEntryWorld(entry) === ContentScriptWorld.Isolated,\n                    }),\n                    new IsolatedStylesPlugin({\n                        cssFilename: appFilenameResolver(config.app, config.cssFilename, config.cssDir),\n                        cssChunkFilename: appFilenameResolver(config.app, config.cssFilename, config.cssDir),\n                        property: ContentScriptStylesRuntimeProperty,\n                        test: entry => {\n                            const options = entryOptionsByName.get(entry);\n\n                            return options !== undefined && hasIsolatedTarget(options);\n                        },\n                    }),\n                    ...basePlugins,\n                ],\n                optimization: config.commonChunks\n                    ? {\n                          splitChunks: {\n                              cacheGroups: {\n                                  adnbnContentIsolated: createCacheGroup(ContentScriptWorld.Isolated),\n                                  adnbnContentMain: createCacheGroup(ContentScriptWorld.Main),\n                              },\n                          },\n                      }\n                    : undefined,\n            } satisfies RspackConfig;\n        },\n        manifest: async ({manifest}) => {\n            // prettier-ignore\n            manifest\n                .setContentScripts(await contentManager.manifest())\n                .appendHostPermissions(await contentManager.hostPermissions())\n                .appendOptionalHostPermissions(await contentManager.optionalHostPermissions())\n                .appendPermissions(await contentManager.permissions())\n                .appendOptionalPermissions(await contentManager.optionalPermissions());\n        },\n    };\n});\n"],"mappings":"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","names":["entries"]}

package/dist/cli/plugins/locale/Locale.js

@@ -1,7 +1,7 @@
 import path from "path";
 import { LocaleFinder } from "./../../../cli/entrypoint/index.js";
 import { getSourcePath, getSharedPath, getAppPath, getAppSourcePath } from "./../../../cli/resolvers/path.js";
-import { flattenLocaleMessages, getLocaleFilename } from "./../../../shared/locale/index.js";
+import { escapeLocaleMessages, flattenLocaleMessages, getLocaleFilename } from "./../../../shared/locale/index.js";
 class Locale extends LocaleFinder {
   _messages;
   async dependencies() {
@@ -18,7 +18,10 @@ class Locale extends LocaleFinder {
   }
   async json() {
     return Object.fromEntries(
-      [...await this.messages()].map(([lang, messages]) => [getLocaleFilename(lang), messages])
+      [...await this.messages()].map(([lang, messages]) => [
+        getLocaleFilename(lang),
+        escapeLocaleMessages(messages)
+      ])
     );
   }
   async catalogue() {

package/dist/cli/plugins/locale/Locale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/locale/Locale.ts"],"sourcesContent":["import path from \"path\";\nimport {LocaleFinder} from \"@cli/entrypoint/index.js\";\nimport type {GenerateJsonPluginData, GenerateModulePluginDependencies} from \"@cli/bundler\";\nimport {getSourcePath, getSharedPath, getAppPath, getAppSourcePath} from \"@cli/resolvers/path\";\n\nimport {flattenLocaleMessages, getLocaleFilename} from \"@shared/locale\";\n\nimport type {Language, LocaleCatalogue, LocaleMessages} from \"@typing/locale\";\n\nexport default class Locale extends LocaleFinder {\n    private _messages?: Promise<Map<Language, LocaleMessages>>;\n\n    public async dependencies(): Promise<GenerateModulePluginDependencies> {\n        const files = [...(await this.plugin().files())].map(({file}) => file);\n        const directory = this.getDirectory();\n        const directories = new Set([\n            getSourcePath(this.config, directory),\n            getSharedPath(this.config, directory),\n            getAppPath(this.config, directory),\n            getAppSourcePath(this.config, directory),\n            ...files.map(file => path.dirname(file)),\n        ]);\n\n        return {files, directories};\n    }\n\n    public async json(): Promise<GenerateJsonPluginData> {\n        return Object.fromEntries(\n            [...(await this.messages())].map(([lang, messages]) => [getLocaleFilename(lang), messages])\n        );\n    }\n\n    public async catalogue(): Promise<LocaleCatalogue> {\n        return Object.fromEntries(\n            [...(await this.messages())].map(([lang, messages]) => [lang, flattenLocaleMessages(messages)])\n        );\n    }\n\n    private messages(): Promise<Map<Language, LocaleMessages>> {\n        return (this._messages ??= this.createMessages());\n    }\n\n    private async createMessages(): Promise<Map<Language, LocaleMessages>> {\n        await this.validate();\n\n        const data = new Map<Language, LocaleMessages>();\n\n        const builders = await this.builders();\n        const defaultBuilder = this.getValidator().getDefaultBuilder(builders);\n        const defaultMessages = defaultBuilder?.build() ?? {};\n\n        for (const builder of builders.values()) {\n            // Builders already include this app's layers and browser overrides.\n            // Every target plural has been validated; only ordinary gaps remain.\n            const messages = builder === defaultBuilder ? defaultMessages : builder.build();\n\n            data.set(builder.lang(), {...defaultMessages, ...messages});\n        }\n\n        return data;\n    }\n\n    public clear(): this {\n        this._messages = undefined;\n\n        return super.clear();\n    }\n}\n"],"mappings":"AAAA,OAAO,UAAU;AACjB,SAAQ,oBAAmB;AAE3B,SAAQ,eAAe,eAAe,YAAY,wBAAuB;AAEzE,SAAQ,uBAAuB,yBAAwB;AAIvD,MAAO,eAA6B,aAAa;AAAA,EACrC;AAAA,EAER,MAAa,eAA0D;AACnE,UAAM,QAAQ,CAAC,GAAI,MAAM,KAAK,OAAO,EAAE,MAAM,CAAE,EAAE,IAAI,CAAC,EAAC,KAAI,MAAM,IAAI;AACrE,UAAM,YAAY,KAAK,aAAa;AACpC,UAAM,cAAc,oBAAI,IAAI;AAAA,MACxB,cAAc,KAAK,QAAQ,SAAS;AAAA,MACpC,cAAc,KAAK,QAAQ,SAAS;AAAA,MACpC,WAAW,KAAK,QAAQ,SAAS;AAAA,MACjC,iBAAiB,KAAK,QAAQ,SAAS;AAAA,MACvC,GAAG,MAAM,IAAI,UAAQ,KAAK,QAAQ,IAAI,CAAC;AAAA,IAC3C,CAAC;AAED,WAAO,EAAC,OAAO,YAAW;AAAA,EAC9B;AAAA,EAEA,MAAa,OAAwC;AACjD,WAAO,OAAO;AAAA,MACV,CAAC,GAAI,MAAM,KAAK,SAAS,CAAE,EAAE,IAAI,CAAC,CAAC,MAAM,QAAQ,MAAM,CAAC,kBAAkB,IAAI,GAAG,QAAQ,CAAC;AAAA,IAC9F;AAAA,EACJ;AAAA,EAEA,MAAa,YAAsC;AAC/C,WAAO,OAAO;AAAA,MACV,CAAC,GAAI,MAAM,KAAK,SAAS,CAAE,EAAE,IAAI,CAAC,CAAC,MAAM,QAAQ,MAAM,CAAC,MAAM,sBAAsB,QAAQ,CAAC,CAAC;AAAA,IAClG;AAAA,EACJ;AAAA,EAEQ,WAAmD;AACvD,WAAQ,KAAK,cAAL,KAAK,YAAc,KAAK,eAAe;AAAA,EACnD;AAAA,EAEA,MAAc,iBAAyD;AACnE,UAAM,KAAK,SAAS;AAEpB,UAAM,OAAO,oBAAI,IAA8B;AAE/C,UAAM,WAAW,MAAM,KAAK,SAAS;AACrC,UAAM,iBAAiB,KAAK,aAAa,EAAE,kBAAkB,QAAQ;AACrE,UAAM,mBAAkB,iDAAgB,YAAW,CAAC;AAEpD,eAAW,WAAW,SAAS,OAAO,GAAG;AAGrC,YAAM,WAAW,YAAY,iBAAiB,kBAAkB,QAAQ,MAAM;AAE9E,WAAK,IAAI,QAAQ,KAAK,GAAG,EAAC,GAAG,iBAAiB,GAAG,SAAQ,CAAC;AAAA,IAC9D;AAEA,WAAO;AAAA,EACX;AAAA,EAEO,QAAc;AACjB,SAAK,YAAY;AAEjB,WAAO,MAAM,MAAM;AAAA,EACvB;AACJ;","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/locale/Locale.ts"],"sourcesContent":["import path from \"path\";\nimport {LocaleFinder} from \"@cli/entrypoint/index.js\";\nimport type {GenerateJsonPluginData, GenerateModulePluginDependencies} from \"@cli/bundler\";\nimport {getSourcePath, getSharedPath, getAppPath, getAppSourcePath} from \"@cli/resolvers/path\";\n\nimport {escapeLocaleMessages, flattenLocaleMessages, getLocaleFilename} from \"@shared/locale\";\n\nimport type {Language, LocaleCatalogue, LocaleMessages} from \"@typing/locale\";\n\nexport default class Locale extends LocaleFinder {\n    private _messages?: Promise<Map<Language, LocaleMessages>>;\n\n    public async dependencies(): Promise<GenerateModulePluginDependencies> {\n        const files = [...(await this.plugin().files())].map(({file}) => file);\n        const directory = this.getDirectory();\n        const directories = new Set([\n            getSourcePath(this.config, directory),\n            getSharedPath(this.config, directory),\n            getAppPath(this.config, directory),\n            getAppSourcePath(this.config, directory),\n            ...files.map(file => path.dirname(file)),\n        ]);\n\n        return {files, directories};\n    }\n\n    public async json(): Promise<GenerateJsonPluginData> {\n        return Object.fromEntries(\n            [...(await this.messages())].map(([lang, messages]) => [\n                getLocaleFilename(lang),\n                escapeLocaleMessages(messages),\n            ])\n        );\n    }\n\n    public async catalogue(): Promise<LocaleCatalogue> {\n        return Object.fromEntries(\n            [...(await this.messages())].map(([lang, messages]) => [lang, flattenLocaleMessages(messages)])\n        );\n    }\n\n    private messages(): Promise<Map<Language, LocaleMessages>> {\n        return (this._messages ??= this.createMessages());\n    }\n\n    private async createMessages(): Promise<Map<Language, LocaleMessages>> {\n        await this.validate();\n\n        const data = new Map<Language, LocaleMessages>();\n\n        const builders = await this.builders();\n        const defaultBuilder = this.getValidator().getDefaultBuilder(builders);\n        const defaultMessages = defaultBuilder?.build() ?? {};\n\n        for (const builder of builders.values()) {\n            // Builders already include this app's layers and browser overrides.\n            // Every target plural has been validated; only ordinary gaps remain.\n            const messages = builder === defaultBuilder ? defaultMessages : builder.build();\n\n            data.set(builder.lang(), {...defaultMessages, ...messages});\n        }\n\n        return data;\n    }\n\n    public clear(): this {\n        this._messages = undefined;\n\n        return super.clear();\n    }\n}\n"],"mappings":"AAAA,OAAO,UAAU;AACjB,SAAQ,oBAAmB;AAE3B,SAAQ,eAAe,eAAe,YAAY,wBAAuB;AAEzE,SAAQ,sBAAsB,uBAAuB,yBAAwB;AAI7E,MAAO,eAA6B,aAAa;AAAA,EACrC;AAAA,EAER,MAAa,eAA0D;AACnE,UAAM,QAAQ,CAAC,GAAI,MAAM,KAAK,OAAO,EAAE,MAAM,CAAE,EAAE,IAAI,CAAC,EAAC,KAAI,MAAM,IAAI;AACrE,UAAM,YAAY,KAAK,aAAa;AACpC,UAAM,cAAc,oBAAI,IAAI;AAAA,MACxB,cAAc,KAAK,QAAQ,SAAS;AAAA,MACpC,cAAc,KAAK,QAAQ,SAAS;AAAA,MACpC,WAAW,KAAK,QAAQ,SAAS;AAAA,MACjC,iBAAiB,KAAK,QAAQ,SAAS;AAAA,MACvC,GAAG,MAAM,IAAI,UAAQ,KAAK,QAAQ,IAAI,CAAC;AAAA,IAC3C,CAAC;AAED,WAAO,EAAC,OAAO,YAAW;AAAA,EAC9B;AAAA,EAEA,MAAa,OAAwC;AACjD,WAAO,OAAO;AAAA,MACV,CAAC,GAAI,MAAM,KAAK,SAAS,CAAE,EAAE,IAAI,CAAC,CAAC,MAAM,QAAQ,MAAM;AAAA,QACnD,kBAAkB,IAAI;AAAA,QACtB,qBAAqB,QAAQ;AAAA,MACjC,CAAC;AAAA,IACL;AAAA,EACJ;AAAA,EAEA,MAAa,YAAsC;AAC/C,WAAO,OAAO;AAAA,MACV,CAAC,GAAI,MAAM,KAAK,SAAS,CAAE,EAAE,IAAI,CAAC,CAAC,MAAM,QAAQ,MAAM,CAAC,MAAM,sBAAsB,QAAQ,CAAC,CAAC;AAAA,IAClG;AAAA,EACJ;AAAA,EAEQ,WAAmD;AACvD,WAAQ,KAAK,cAAL,KAAK,YAAc,KAAK,eAAe;AAAA,EACnD;AAAA,EAEA,MAAc,iBAAyD;AACnE,UAAM,KAAK,SAAS;AAEpB,UAAM,OAAO,oBAAI,IAA8B;AAE/C,UAAM,WAAW,MAAM,KAAK,SAAS;AACrC,UAAM,iBAAiB,KAAK,aAAa,EAAE,kBAAkB,QAAQ;AACrE,UAAM,mBAAkB,iDAAgB,YAAW,CAAC;AAEpD,eAAW,WAAW,SAAS,OAAO,GAAG;AAGrC,YAAM,WAAW,YAAY,iBAAiB,kBAAkB,QAAQ,MAAM;AAE9E,WAAK,IAAI,QAAQ,KAAK,GAAG,EAAC,GAAG,iBAAiB,GAAG,SAAQ,CAAC;AAAA,IAC9D;AAEA,WAAO;AAAA,EACX;AAAA,EAEO,QAAc;AACjB,SAAK,YAAY;AAEjB,WAAO,MAAM,MAAM;AAAA,EACvB;AACJ;","names":[]}

package/dist/cli/plugins/style/index.d.ts

@@ -1,3 +1,2 @@
-import type { StylePluginOptions } from "./types.js";
-declare const _default: import("../../../main/plugin.js").PluginDefinition<[(StylePluginOptions | undefined)?]>;
+declare const _default: import("../../../main/plugin.js").PluginDefinition<[]>;
 export default _default;