npm - ng-packagr - Versions diffs - 22.2.0-next.4 → 22.2.0-next.6 - Mend

ng-packagr 22.2.0-next.4 → 22.2.0-next.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/package.json +3 -3
package/src/lib/styles/component-stylesheets.js +1 -0
package/src/lib/styles/component-stylesheets.js.map +1 -1
package/src/lib/styles/sass/rebasing-importer.d.ts +11 -23
package/src/lib/styles/sass/rebasing-importer.js +18 -24
package/src/lib/styles/sass/rebasing-importer.js.map +1 -1
package/src/lib/styles/sass/sass-service.d.ts +21 -38
package/src/lib/styles/sass/sass-service.js +139 -220
package/src/lib/styles/sass/sass-service.js.map +1 -1
package/src/lib/styles/stylesheets/sass-language.d.ts +2 -1
package/src/lib/styles/stylesheets/sass-language.js +71 -37
package/src/lib/styles/stylesheets/sass-language.js.map +1 -1
package/src/lib/styles/stylesheets/stylesheet-plugin-factory.d.ts +1 -1
package/src/lib/styles/stylesheets/stylesheet-plugin-factory.js +5 -7
package/src/lib/styles/stylesheets/stylesheet-plugin-factory.js.map +1 -1
package/src/lib/styles/sass/worker.d.ts +0 -56
package/src/lib/styles/sass/worker.js +0 -193
package/src/lib/styles/sass/worker.js.map +0 -1
package/src/lib/styles/worker-pool.d.ts +0 -8
package/src/lib/styles/worker-pool.js +0 -40
package/src/lib/styles/worker-pool.js.map +0 -1

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ng-packagr",
-  "version": "22.2.0-next.4",
+  "version": "22.2.0-next.6",
   "description": "Compile and package Angular libraries in Angular Package Format (APF)",
   "keywords": [
     "apf",
@@ -44,12 +44,12 @@
     "jsonc-parser": "^3.3.1",
     "less": "^4.2.0",
     "ora": "^9.0.0",
-    "piscina": "^5.0.0",
     "postcss": "^8.4.47",
     "rolldown": "^1.2.0",
     "rolldown-plugin-dts": "^0.28.0",
     "rxjs": "^7.8.1",
-    "sass": "^1.81.0",
+    "sass": "^1.103.1",
+    "sass-embedded": "^1.103.1",
     "tinyglobby": "^0.2.12"
   },
   "peerDependencies": {

package/src/lib/styles/component-stylesheets.js CHANGED Viewed

@@ -99,6 +99,7 @@ class ComponentStylesheetBundler {
         if (!this.incremental) {
             return;
         }
+        (0, sass_language_1.resetSassWorkerPoolCaches)();
         const normalizedFiles = new Set();
         for (const file of files) {
             const normalized = (0, path_1.ensureUnixPath)(file);

package/src/lib/styles/component-stylesheets.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"component-stylesheets.js","sourceRoot":"","sources":["../../../../src/lib/styles/component-stylesheets.ts"],"names":[],"mappings":"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","sourcesContent":["import { Message, Metafile, OutputFile } from 'esbuild';\nimport { createHash } from 'node:crypto';\nimport path from 'node:path';\nimport { ensureUnixPath } from '../utils/path';\nimport { BuildOutputFileType, BundleContextResult, BundlerContext } from './bundler-context';\nimport { MemoryCache } from './cache';\nimport { MemoryLoadResultCache } from './load-result-cache';\nimport { BundleStylesheetOptions, createStylesheetBundleOptions } from './stylesheets/bundle-options';\nimport { shutdownSassWorkerPool } from './stylesheets/sass-language';\n\nexport interface ComponentStylesheetResult {\n errors: Message[] \| undefined;\n warnings: Message[];\n contents: string;\n outputFiles: OutputFile[];\n metafile: Metafile \| undefined;\n referencedFiles: Set<string> \| undefined;\n}\n\n/*\n Bundles component stylesheets. A stylesheet can be either an inline stylesheet that\n * is contained within the Component's metadata definition or an external file referenced\n * from the Component's metadata definition.\n /\nexport class ComponentStylesheetBundler {\n readonly #fileContexts = new MemoryCache<BundlerContext>();\n readonly #inlineContexts = new MemoryCache<BundlerContext>();\n readonly #loadCache = new MemoryLoadResultCache();\n\n /\n @param options An object containing the stylesheet bundling options.\n * @param defaultInlineLanguage The default language to use for inline component styles.\n * @param incremental True if incremental watch mode is enabled.\n /\n constructor(\n private readonly options: BundleStylesheetOptions,\n private readonly defaultInlineLanguage: string,\n private readonly incremental: boolean,\n ) {}\n\n async bundleFile(entry: string): Promise<ComponentStylesheetResult> {\n entry = ensureUnixPath(entry);\n\n const bundlerContext = await this.#fileContexts.getOrCreate(entry, () => {\n return new BundlerContext(\n this.options.workspaceRoot,\n this.incremental,\n loadCache => {\n const buildOptions = createStylesheetBundleOptions(this.options, loadCache);\n\n buildOptions.entryPoints = [entry];\n\n return buildOptions;\n },\n / useContext / false,\n / initialFilter / undefined,\n this.#loadCache,\n );\n });\n\n return this.extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);\n }\n\n async bundleInline(\n data: string,\n filename: string,\n language: string = this.defaultInlineLanguage,\n ): Promise<ComponentStylesheetResult> {\n filename = ensureUnixPath(filename);\n\n // Use a hash of the inline stylesheet content to ensure a consistent identifier. External stylesheets will resolve\n // to the actual stylesheet file path.\n // TODO: Consider xxhash instead for hashing\n const id = createHash('sha256').update(data).digest('hex');\n const entry = [language, id, filename].join(';');\n\n const bundlerContext = await this.#inlineContexts.getOrCreate(entry, () => {\n const namespace = 'angular:styles/component';\n\n return new BundlerContext(\n this.options.workspaceRoot,\n this.incremental,\n loadCache => {\n const buildOptions = createStylesheetBundleOptions(this.options, loadCache, {\n [entry]: data,\n });\n buildOptions.entryPoints = [`${namespace};${entry}`];\n\n buildOptions.plugins.push({\n name: 'angular-component-styles',\n setup(build) {\n build.onResolve({ filter: /^angular:styles\\/component;/ }, args => {\n if (args.kind !== 'entry-point') {\n return null;\n }\n\n return {\n path: entry,\n namespace,\n };\n });\n build.onLoad({ filter: /^css;/, namespace }, () => {\n return {\n contents: data,\n loader: 'css',\n resolveDir: path.dirname(filename),\n };\n });\n },\n });\n\n return buildOptions;\n },\n / useContext / false,\n / initialFilter / undefined,\n this.#loadCache,\n );\n });\n\n // Extract the result of the bundling from the output files\n return this.extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);\n }\n\n /\n Invalidates both file and inline based component style bundling state for a set of modified files.\n * @param files The group of files that have been modified\n * @returns An array of file based stylesheet entries if any were invalidated; otherwise, undefined.\n */\n invalidate(files: Iterable<string> \| ReadonlySet<string>): string[] \| undefined {\n if (!this.incremental) {\n return;\n }\n\n const normalizedFiles = new Set<string>();\n for (const file of files) {\n const normalized = ensureUnixPath(file);\n normalizedFiles.add(normalized);\n if (!path.isAbsolute(normalized)) {\n normalizedFiles.add(ensureUnixPath(path.join(this.options.workspaceRoot, normalized)));\n }\n }\n\n let entries: string[] \| undefined;\n\n for (const [entry, bundler] of this.#fileContexts.entries()) {\n if (bundler.invalidate(normalizedFiles)) {\n entries ??= [];\n entries.push(entry);\n }\n }\n for (const [entry, bundler] of this.#inlineContexts.entries()) {\n // Entry is format: [language, id, filename].join(';')\n const firstSemi = entry.indexOf(';');\n const secondSemi = firstSemi !== -1 ? entry.indexOf(';', firstSemi + 1) : -1;\n const filename = secondSemi !== -1 ? entry.slice(secondSemi + 1) : '';\n if (filename && normalizedFiles.has(ensureUnixPath(filename))) {\n this.#inlineContexts.delete(entry);\n void bundler.dispose();\n } else {\n bundler.invalidate(normalizedFiles);\n }\n }\n\n return entries;\n }\n\n async dispose(): Promise<void> {\n const contexts = [...this.#fileContexts.values(), ...this.#inlineContexts.values()];\n this.#fileContexts.clear();\n this.#inlineContexts.clear();\n this.#loadCache.clear();\n\n await Promise.allSettled([shutdownSassWorkerPool(), ...contexts.map(context => context.dispose())]);\n }\n\n private extractResult(\n result: BundleContextResult,\n referencedFiles: Set<string> \| undefined,\n ): ComponentStylesheetResult {\n let contents = '';\n let metafile;\n const outputFiles: OutputFile[] = [];\n\n if ('outputFiles' in result) {\n for (const outputFile of result.outputFiles) {\n const filename = path.basename(outputFile.path);\n\n if (outputFile.type === BuildOutputFileType.Media \|\| filename.endsWith('.css.map')) {\n // The output files could also contain resources (images/fonts/etc.) that were referenced and the map files.\n\n // Clone the output file to avoid amending the original path which would causes problems during rebuild.\n const clonedOutputFile = outputFile.clone();\n\n // Needed for Bazel as otherwise the files will not be written in the correct place,\n // this is because esbuild will resolve the output file from the outdir which is currently set to `workspaceRoot` twice,\n // once in the stylesheet and the other in the application code bundler.\n // Ex: `../../../../../app.component.css.map`.\n clonedOutputFile.path = path.join(this.options.workspaceRoot, outputFile.path);\n\n outputFiles.push(clonedOutputFile);\n } else if (filename.endsWith('.css')) {\n contents = outputFile.text;\n } else {\n throw new Error(\n `Unexpected non CSS/Media file \"${filename}\" outputted during component stylesheet processing.`,\n );\n }\n }\n\n metafile = result.metafile;\n }\n\n return {\n errors: result.errors,\n warnings: result.warnings,\n contents,\n outputFiles,\n metafile,\n referencedFiles,\n };\n }\n}\n"]}
1	+ {"version":3,"file":"component-stylesheets.js","sourceRoot":"","sources":["../../../../src/lib/styles/component-stylesheets.ts"],"names":[],"mappings":"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","sourcesContent":["import { Message, Metafile, OutputFile } from 'esbuild';\nimport { createHash } from 'node:crypto';\nimport path from 'node:path';\nimport { ensureUnixPath } from '../utils/path';\nimport { BuildOutputFileType, BundleContextResult, BundlerContext } from './bundler-context';\nimport { MemoryCache } from './cache';\nimport { MemoryLoadResultCache } from './load-result-cache';\nimport { BundleStylesheetOptions, createStylesheetBundleOptions } from './stylesheets/bundle-options';\nimport { resetSassWorkerPoolCaches, shutdownSassWorkerPool } from './stylesheets/sass-language';\n\nexport interface ComponentStylesheetResult {\n errors: Message[] \| undefined;\n warnings: Message[];\n contents: string;\n outputFiles: OutputFile[];\n metafile: Metafile \| undefined;\n referencedFiles: Set<string> \| undefined;\n}\n\n/*\n Bundles component stylesheets. A stylesheet can be either an inline stylesheet that\n * is contained within the Component's metadata definition or an external file referenced\n * from the Component's metadata definition.\n /\nexport class ComponentStylesheetBundler {\n readonly #fileContexts = new MemoryCache<BundlerContext>();\n readonly #inlineContexts = new MemoryCache<BundlerContext>();\n readonly #loadCache = new MemoryLoadResultCache();\n\n /\n @param options An object containing the stylesheet bundling options.\n * @param defaultInlineLanguage The default language to use for inline component styles.\n * @param incremental True if incremental watch mode is enabled.\n /\n constructor(\n private readonly options: BundleStylesheetOptions,\n private readonly defaultInlineLanguage: string,\n private readonly incremental: boolean,\n ) {}\n\n async bundleFile(entry: string): Promise<ComponentStylesheetResult> {\n entry = ensureUnixPath(entry);\n\n const bundlerContext = await this.#fileContexts.getOrCreate(entry, () => {\n return new BundlerContext(\n this.options.workspaceRoot,\n this.incremental,\n loadCache => {\n const buildOptions = createStylesheetBundleOptions(this.options, loadCache);\n\n buildOptions.entryPoints = [entry];\n\n return buildOptions;\n },\n / useContext / false,\n / initialFilter / undefined,\n this.#loadCache,\n );\n });\n\n return this.extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);\n }\n\n async bundleInline(\n data: string,\n filename: string,\n language: string = this.defaultInlineLanguage,\n ): Promise<ComponentStylesheetResult> {\n filename = ensureUnixPath(filename);\n\n // Use a hash of the inline stylesheet content to ensure a consistent identifier. External stylesheets will resolve\n // to the actual stylesheet file path.\n // TODO: Consider xxhash instead for hashing\n const id = createHash('sha256').update(data).digest('hex');\n const entry = [language, id, filename].join(';');\n\n const bundlerContext = await this.#inlineContexts.getOrCreate(entry, () => {\n const namespace = 'angular:styles/component';\n\n return new BundlerContext(\n this.options.workspaceRoot,\n this.incremental,\n loadCache => {\n const buildOptions = createStylesheetBundleOptions(this.options, loadCache, {\n [entry]: data,\n });\n buildOptions.entryPoints = [`${namespace};${entry}`];\n\n buildOptions.plugins.push({\n name: 'angular-component-styles',\n setup(build) {\n build.onResolve({ filter: /^angular:styles\\/component;/ }, args => {\n if (args.kind !== 'entry-point') {\n return null;\n }\n\n return {\n path: entry,\n namespace,\n };\n });\n build.onLoad({ filter: /^css;/, namespace }, () => {\n return {\n contents: data,\n loader: 'css',\n resolveDir: path.dirname(filename),\n };\n });\n },\n });\n\n return buildOptions;\n },\n / useContext / false,\n / initialFilter / undefined,\n this.#loadCache,\n );\n });\n\n // Extract the result of the bundling from the output files\n return this.extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);\n }\n\n /\n Invalidates both file and inline based component style bundling state for a set of modified files.\n * @param files The group of files that have been modified\n * @returns An array of file based stylesheet entries if any were invalidated; otherwise, undefined.\n */\n invalidate(files: Iterable<string> \| ReadonlySet<string>): string[] \| undefined {\n if (!this.incremental) {\n return;\n }\n\n resetSassWorkerPoolCaches();\n\n const normalizedFiles = new Set<string>();\n for (const file of files) {\n const normalized = ensureUnixPath(file);\n normalizedFiles.add(normalized);\n if (!path.isAbsolute(normalized)) {\n normalizedFiles.add(ensureUnixPath(path.join(this.options.workspaceRoot, normalized)));\n }\n }\n\n let entries: string[] \| undefined;\n\n for (const [entry, bundler] of this.#fileContexts.entries()) {\n if (bundler.invalidate(normalizedFiles)) {\n entries ??= [];\n entries.push(entry);\n }\n }\n for (const [entry, bundler] of this.#inlineContexts.entries()) {\n // Entry is format: [language, id, filename].join(';')\n const firstSemi = entry.indexOf(';');\n const secondSemi = firstSemi !== -1 ? entry.indexOf(';', firstSemi + 1) : -1;\n const filename = secondSemi !== -1 ? entry.slice(secondSemi + 1) : '';\n if (filename && normalizedFiles.has(ensureUnixPath(filename))) {\n this.#inlineContexts.delete(entry);\n void bundler.dispose();\n } else {\n bundler.invalidate(normalizedFiles);\n }\n }\n\n return entries;\n }\n\n async dispose(): Promise<void> {\n const contexts = [...this.#fileContexts.values(), ...this.#inlineContexts.values()];\n this.#fileContexts.clear();\n this.#inlineContexts.clear();\n this.#loadCache.clear();\n\n await Promise.allSettled([shutdownSassWorkerPool(), ...contexts.map(context => context.dispose())]);\n }\n\n private extractResult(\n result: BundleContextResult,\n referencedFiles: Set<string> \| undefined,\n ): ComponentStylesheetResult {\n let contents = '';\n let metafile;\n const outputFiles: OutputFile[] = [];\n\n if ('outputFiles' in result) {\n for (const outputFile of result.outputFiles) {\n const filename = path.basename(outputFile.path);\n\n if (outputFile.type === BuildOutputFileType.Media \|\| filename.endsWith('.css.map')) {\n // The output files could also contain resources (images/fonts/etc.) that were referenced and the map files.\n\n // Clone the output file to avoid amending the original path which would causes problems during rebuild.\n const clonedOutputFile = outputFile.clone();\n\n // Needed for Bazel as otherwise the files will not be written in the correct place,\n // this is because esbuild will resolve the output file from the outdir which is currently set to `workspaceRoot` twice,\n // once in the stylesheet and the other in the application code bundler.\n // Ex: `../../../../../app.component.css.map`.\n clonedOutputFile.path = path.join(this.options.workspaceRoot, outputFile.path);\n\n outputFiles.push(clonedOutputFile);\n } else if (filename.endsWith('.css')) {\n contents = outputFile.text;\n } else {\n throw new Error(\n `Unexpected non CSS/Media file \"${filename}\" outputted during component stylesheet processing.`,\n );\n }\n }\n\n metafile = result.metafile;\n }\n\n return {\n errors: result.errors,\n warnings: result.warnings,\n contents,\n outputFiles,\n metafile,\n referencedFiles,\n };\n }\n}\n"]}

package/src/lib/styles/sass/rebasing-importer.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { CanonicalizeContext, Importer, ImporterResult } from 'sass';
+import type { CanonicalizeContext, Importer, ImporterResult } from 'sass-embedded';
 /**
  * A preprocessed cache entry for the files and directories within a previously searched
  * directory when performing Sass import resolution.
@@ -26,9 +26,7 @@ declare abstract class UrlRebasingImporter implements Importer<'sync'> {
      * which can be used to generate a final sourcemap that contains original sources.
      */
     constructor(entryDirectory: string);
-    abstract canonicalize(url: string, options: {
-        fromImport: boolean;
-    }): URL | null;
+    abstract canonicalize(url: string, options: CanonicalizeContext): URL | null;
     load(canonicalUrl: URL): ImporterResult | null;
 }
 /**
@@ -39,9 +37,7 @@ declare abstract class UrlRebasingImporter implements Importer<'sync'> {
 export declare class RelativeUrlRebasingImporter extends UrlRebasingImporter {
     private directoryCache;
     constructor(entryDirectory: string, directoryCache?: Map<string, DirectoryEntry>);
-    canonicalize(url: string, options: {
-        fromImport: boolean;
-    }): URL | null;
+    canonicalize(url: string, options: CanonicalizeContext): URL | null;
     /**
      * Attempts to resolve a provided URL to a stylesheet file using the Sass compiler's resolution algorithm.
      * Based on https://github.com/sass/dart-sass/blob/44d6bb6ac72fe6b93f5bfec371a1fffb18e6b76d/lib/src/importer/utils.dart
@@ -61,14 +57,15 @@ export declare class RelativeUrlRebasingImporter extends UrlRebasingImporter {
     private checkFound;
 }
 /**
- * Provides the Sass importer logic to resolve module (npm package) stylesheet imports via both import and
- * use rules and also rebase any `url()` function usage within those stylesheets. The rebasing will ensure that
- * the URLs in the output of the Sass compiler reflect the final filesystem location of the output CSS file.
+ * Provides the Sass importer logic to resolve module (npm package) stylesheet imports asynchronously
+ * and also rebase any `url()` function usage within those stylesheets.
  */
-export declare class ModuleUrlRebasingImporter extends RelativeUrlRebasingImporter {
+export declare class AsyncModuleUrlRebasingImporter implements Importer<'async'> {
     private finder;
-    constructor(entryDirectory: string, directoryCache: Map<string, DirectoryEntry>, finder: (specifier: string, options: CanonicalizeContext) => URL | null);
-    canonicalize(url: string, options: CanonicalizeContext): URL | null;
+    private relativeImporter;
+    constructor(entryDirectory: string, directoryCache: Map<string, DirectoryEntry>, finder: (specifier: string, options: CanonicalizeContext) => Promise<URL | null> | URL | null);
+    canonicalize(url: string, options: CanonicalizeContext): Promise<URL | null>;
+    load(canonicalUrl: URL): ImporterResult | null;
 }
 /**
  * Provides the Sass importer logic to resolve load paths located stylesheet imports via both import and
@@ -78,15 +75,6 @@ export declare class ModuleUrlRebasingImporter extends RelativeUrlRebasingImport
 export declare class LoadPathsUrlRebasingImporter extends RelativeUrlRebasingImporter {
     private loadPaths;
     constructor(entryDirectory: string, directoryCache: Map<string, DirectoryEntry>, loadPaths: Iterable<string>);
-    canonicalize(url: string, options: {
-        fromImport: boolean;
-    }): URL | null;
+    canonicalize(url: string, options: CanonicalizeContext): URL | null;
 }
-/**
- * Workaround for Sass not calling instance methods with `this`.
- * The `canonicalize` and `load` methods will be bound to the class instance.
- * @param importer A Sass importer to bind.
- * @returns The bound Sass importer.
- */
-export declare function sassBindWorkaround<T extends Importer>(importer: T): T;
 export {};

package/src/lib/styles/sass/rebasing-importer.js CHANGED Viewed

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoadPathsUrlRebasingImporter = exports.ModuleUrlRebasingImporter = exports.RelativeUrlRebasingImporter = void 0;
-exports.sassBindWorkaround = sassBindWorkaround;
+exports.LoadPathsUrlRebasingImporter = exports.AsyncModuleUrlRebasingImporter = exports.RelativeUrlRebasingImporter = void 0;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
@@ -26,6 +25,7 @@ class UrlRebasingImporter {
      */
     constructor(entryDirectory) {
         this.entryDirectory = entryDirectory;
+        this.load = this.load.bind(this);
     }
     load(canonicalUrl) {
         const stylesheetPath = (0, node_url_1.fileURLToPath)(canonicalUrl);
@@ -92,6 +92,7 @@ class RelativeUrlRebasingImporter extends UrlRebasingImporter {
     constructor(entryDirectory, directoryCache = new Map()) {
         super(entryDirectory);
         this.directoryCache = directoryCache;
+        this.canonicalize = this.canonicalize.bind(this);
     }
     canonicalize(url, options) {
         return this.resolveImport(url, options.fromImport, true);
@@ -248,26 +249,30 @@ class RelativeUrlRebasingImporter extends UrlRebasingImporter {
 }
 exports.RelativeUrlRebasingImporter = RelativeUrlRebasingImporter;
 /**
- * Provides the Sass importer logic to resolve module (npm package) stylesheet imports via both import and
- * use rules and also rebase any `url()` function usage within those stylesheets. The rebasing will ensure that
- * the URLs in the output of the Sass compiler reflect the final filesystem location of the output CSS file.
+ * Provides the Sass importer logic to resolve module (npm package) stylesheet imports asynchronously
+ * and also rebase any `url()` function usage within those stylesheets.
  */
-class ModuleUrlRebasingImporter extends RelativeUrlRebasingImporter {
+class AsyncModuleUrlRebasingImporter {
     finder;
+    relativeImporter;
     constructor(entryDirectory, directoryCache, finder) {
-        super(entryDirectory, directoryCache);
         this.finder = finder;
+        this.relativeImporter = new RelativeUrlRebasingImporter(entryDirectory, directoryCache);
+        this.canonicalize = this.canonicalize.bind(this);
+        this.load = this.load.bind(this);
     }
-    canonicalize(url, options) {
+    async canonicalize(url, options) {
         if (url.startsWith('file://')) {
-            return super.canonicalize(url, options);
+            return this.relativeImporter.canonicalize(url, options);
         }
-        let result = this.finder(url, options);
-        result &&= super.canonicalize(result.href, options);
-        return result;
+        const result = await this.finder(url, options);
+        return result ? this.relativeImporter.canonicalize(result.href, options) : null;
+    }
+    load(canonicalUrl) {
+        return this.relativeImporter.load(canonicalUrl);
     }
 }
-exports.ModuleUrlRebasingImporter = ModuleUrlRebasingImporter;
+exports.AsyncModuleUrlRebasingImporter = AsyncModuleUrlRebasingImporter;
 /**
  * Provides the Sass importer logic to resolve load paths located stylesheet imports via both import and
  * use rules and also rebase any `url()` function usage within those stylesheets. The rebasing will ensure that
@@ -294,15 +299,4 @@ class LoadPathsUrlRebasingImporter extends RelativeUrlRebasingImporter {
     }
 }
 exports.LoadPathsUrlRebasingImporter = LoadPathsUrlRebasingImporter;
-/**
- * Workaround for Sass not calling instance methods with `this`.
- * The `canonicalize` and `load` methods will be bound to the class instance.
- * @param importer A Sass importer to bind.
- * @returns The bound Sass importer.
- */
-function sassBindWorkaround(importer) {
-    importer.canonicalize = importer.canonicalize.bind(importer);
-    importer.load = importer.load.bind(importer);
-    return importer;
-}
 //# sourceMappingURL=rebasing-importer.js.map

package/src/lib/styles/sass/rebasing-importer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rebasing-importer.js","sourceRoot":"","sources":["../../../../../src/lib/styles/sass/rebasing-importer.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFileSync, readdirSync, statSync } from 'node:fs';\nimport { basename, dirname, extname, join, relative } from 'node:path';\nimport { fileURLToPath, pathToFileURL } from 'node:url';\nimport type { CanonicalizeContext, Importer, ImporterResult, Syntax } from 'sass';\nimport { findUrls } from './lexer';\n\n/*\n A preprocessed cache entry for the files and directories within a previously searched\n * directory when performing Sass import resolution.\n /\nexport interface DirectoryEntry {\n files: Set<string>;\n directories: Set<string>;\n}\n\n/\n A Sass Importer base class that provides the load logic to rebase all `url()` functions\n * within a stylesheet. The rebasing will ensure that the URLs in the output of the Sass compiler\n * reflect the final filesystem location of the output CSS file.\n \n This class provides the core of the rebasing functionality. To ensure that each file is processed\n * by this importer's load implementation, the Sass compiler requires the importer's canonicalize\n * function to return a non-null value with the resolved location of the requested stylesheet.\n * Concrete implementations of this class must provide this canonicalize functionality for rebasing\n * to be effective.\n /\nabstract class UrlRebasingImporter implements Importer<'sync'> {\n /\n @param entryDirectory The directory of the entry stylesheet that was passed to the Sass compiler.\n * @param rebaseSourceMaps When provided, rebased files will have an intermediate sourcemap added to the Map\n * which can be used to generate a final sourcemap that contains original sources.\n /\n constructor(private entryDirectory: string) {}\n\n abstract canonicalize(url: string, options: { fromImport: boolean }): URL \| null;\n\n load(canonicalUrl: URL): ImporterResult \| null {\n const stylesheetPath = fileURLToPath(canonicalUrl);\n const stylesheetDirectory = dirname(stylesheetPath);\n let contents = readFileSync(stylesheetPath, 'utf-8');\n\n // Rebase any URLs that are found\n let updatedContents: string;\n for (const { start, end, value } of findUrls(contents)) {\n // Skip if value is empty or Webpack-specific prefix\n if (value.length === 0 \|\| value[0] === '~' \|\| value[0] === '^') {\n continue;\n }\n\n // Skip if root-relative, absolute or protocol relative url\n if (/^((?:\\w+:)?\\/\\/\|data:\|chrome:\|\\/)/.test(value)) {\n continue;\n }\n\n // Skip if a fragment identifier but not a Sass interpolation\n if (value[0] === '#' && value[1] !== '{') {\n continue;\n }\n\n // Skip if value is value contains a function call\n if (/#\\{.+\$.+\$\\}/.test(value)) {\n continue;\n }\n\n // Sass variable usage either starts with a `$` or contains a namespace and a `.$`\n const valueNormalized = value[0] === '$' \|\| /^\\w+\\.\\$/.test(value) ? `#{${value}}` : value;\n const rebasedPath = relative(this.entryDirectory, stylesheetDirectory);\n\n // Normalize path separators and escape characters\n // https://developer.mozilla.org/en-US/docs/Web/CSS/url#syntax\n const rebasedUrl = rebasedPath.replace(/\\\\/g, '/').replace(/[()\\s'\"]/g, '\\\\$&');\n\n // eslint-disable-next-line no-useless-assignment\n updatedContents ??= contents;\n updatedContents = contents.slice(0, start) + `\"${rebasedUrl}\|\|file:${valueNormalized}\"` + contents.slice(end);\n }\n\n if (updatedContents) {\n contents = updatedContents;\n }\n\n let syntax: Syntax \| undefined;\n switch (extname(stylesheetPath).toLowerCase()) {\n case '.css':\n syntax = 'css';\n break;\n case '.sass':\n syntax = 'indented';\n break;\n default:\n syntax = 'scss';\n break;\n }\n\n return {\n contents,\n syntax,\n sourceMapUrl: canonicalUrl,\n };\n }\n}\n\n/\n Provides the Sass importer logic to resolve relative stylesheet imports via both import and use rules\n * and also rebase any `url()` function usage within those stylesheets. The rebasing will ensure that\n * the URLs in the output of the Sass compiler reflect the final filesystem location of the output CSS file.\n /\nexport class RelativeUrlRebasingImporter extends UrlRebasingImporter {\n constructor(\n entryDirectory: string,\n private directoryCache = new Map<string, DirectoryEntry>(),\n ) {\n super(entryDirectory);\n }\n\n canonicalize(url: string, options: { fromImport: boolean }): URL \| null {\n return this.resolveImport(url, options.fromImport, true);\n }\n\n /\n Attempts to resolve a provided URL to a stylesheet file using the Sass compiler's resolution algorithm.\n * Based on https://github.com/sass/dart-sass/blob/44d6bb6ac72fe6b93f5bfec371a1fffb18e6b76d/lib/src/importer/utils.dart\n * @param url The file protocol URL to resolve.\n * @param fromImport If true, URL was from an import rule; otherwise from a use rule.\n * @param checkDirectory If true, try checking for a directory with the base name containing an index file.\n * @returns A full resolved URL of the stylesheet file or `null` if not found.\n /\n private resolveImport(url: string, fromImport: boolean, checkDirectory: boolean): URL \| null {\n let stylesheetPath;\n try {\n stylesheetPath = fileURLToPath(url);\n } catch {\n // Only file protocol URLs are supported by this importer\n return null;\n }\n\n const directory = dirname(stylesheetPath);\n const extension = extname(stylesheetPath);\n const hasStyleExtension = extension === '.scss' \|\| extension === '.sass' \|\| extension === '.css';\n // Remove the style extension if present to allow adding the `.import` suffix\n const filename = basename(stylesheetPath, hasStyleExtension ? extension : undefined);\n\n const importPotentials = new Set<string>();\n const defaultPotentials = new Set<string>();\n\n if (hasStyleExtension) {\n if (fromImport) {\n importPotentials.add(filename + '.import' + extension);\n importPotentials.add('_' + filename + '.import' + extension);\n }\n defaultPotentials.add(filename + extension);\n defaultPotentials.add('_' + filename + extension);\n } else {\n if (fromImport) {\n importPotentials.add(filename + '.import.scss');\n importPotentials.add(filename + '.import.sass');\n importPotentials.add(filename + '.import.css');\n importPotentials.add('_' + filename + '.import.scss');\n importPotentials.add('_' + filename + '.import.sass');\n importPotentials.add('_' + filename + '.import.css');\n }\n defaultPotentials.add(filename + '.scss');\n defaultPotentials.add(filename + '.sass');\n defaultPotentials.add(filename + '.css');\n defaultPotentials.add('_' + filename + '.scss');\n defaultPotentials.add('_' + filename + '.sass');\n defaultPotentials.add('_' + filename + '.css');\n }\n\n let foundDefaults;\n let foundImports;\n let hasPotentialIndex = false;\n\n let cachedEntries = this.directoryCache.get(directory);\n if (cachedEntries) {\n // If there is a preprocessed cache of the directory, perform an intersection of the potentials\n // and the directory files.\n const { files, directories } = cachedEntries;\n foundDefaults = [...defaultPotentials].filter(potential => files.has(potential));\n foundImports = [...importPotentials].filter(potential => files.has(potential));\n hasPotentialIndex = checkDirectory && !hasStyleExtension && directories.has(filename);\n } else {\n // If no preprocessed cache exists, get the entries from the file system and, while searching,\n // generate the cache for later requests.\n let entries;\n try {\n entries = readdirSync(directory, { withFileTypes: true });\n } catch (error) {\n // If the containing directory does not exist return null to indicate it cannot be resolved\n if (error.code === 'ENOENT') {\n return null;\n }\n\n throw new Error(`Error reading directory [\"${directory}\"] while resolving Sass import`, {\n cause: error,\n });\n }\n\n foundDefaults = [];\n foundImports = [];\n cachedEntries = { files: new Set<string>(), directories: new Set<string>() };\n for (const entry of entries) {\n let isDirectory: boolean;\n let isFile: boolean;\n\n if (entry.isSymbolicLink()) {\n const stats = statSync(join(directory, entry.name));\n isDirectory = stats.isDirectory();\n isFile = stats.isFile();\n } else {\n isDirectory = entry.isDirectory();\n isFile = entry.isFile();\n }\n\n if (isDirectory) {\n cachedEntries.directories.add(entry.name);\n\n // Record if the name should be checked as a directory with an index file\n if (checkDirectory && !hasStyleExtension && entry.name === filename) {\n hasPotentialIndex = true;\n }\n }\n\n if (!isFile) {\n continue;\n }\n\n cachedEntries.files.add(entry.name);\n\n if (importPotentials.has(entry.name)) {\n foundImports.push(entry.name);\n }\n\n if (defaultPotentials.has(entry.name)) {\n foundDefaults.push(entry.name);\n }\n }\n\n this.directoryCache.set(directory, cachedEntries);\n }\n\n // `foundImports` will only contain elements if `options.fromImport` is true\n const result = this.checkFound(foundImports) ?? this.checkFound(foundDefaults);\n if (result !== null) {\n return pathToFileURL(join(directory, result));\n }\n\n if (hasPotentialIndex) {\n // Check for index files using filename as a directory\n return this.resolveImport(url + '/index', fromImport, false);\n }\n\n return null;\n }\n\n /\n Checks an array of potential stylesheet files to determine if there is a valid\n * stylesheet file. More than one discovered file may indicate an error.\n * @param found An array of discovered stylesheet files.\n * @returns A fully resolved path for a stylesheet file or `null` if not found.\n * @throws If there are ambiguous files discovered.\n /\n private checkFound(found: string[]): string \| null {\n if (found.length === 0) {\n // Not found\n return null;\n }\n\n // More than one found file may be an error\n if (found.length > 1) {\n // Presence of CSS files alongside a Sass file does not cause an error\n const foundWithoutCss = found.filter(element => extname(element) !== '.css');\n // If the length is zero then there are two or more css files\n // If the length is more than one than there are two or more sass/scss files\n if (foundWithoutCss.length !== 1) {\n throw new Error('Ambiguous import detected.');\n }\n\n // Return the non-CSS file (sass/scss files have priority)\n // https://github.com/sass/dart-sass/blob/44d6bb6ac72fe6b93f5bfec371a1fffb18e6b76d/lib/src/importer/utils.dart#L44-L47\n return foundWithoutCss[0];\n }\n\n return found[0];\n }\n}\n\n/\n Provides the Sass importer logic to resolve module (npm package) stylesheet imports via both import and\n * use rules and also rebase any `url()` function usage within those stylesheets. The rebasing will ensure that\n * the URLs in the output of the Sass compiler reflect the final filesystem location of the output CSS file.\n /\nexport class ModuleUrlRebasingImporter extends RelativeUrlRebasingImporter {\n constructor(\n entryDirectory: string,\n directoryCache: Map<string, DirectoryEntry>,\n private finder: (specifier: string, options: CanonicalizeContext) => URL \| null,\n ) {\n super(entryDirectory, directoryCache);\n }\n\n override canonicalize(url: string, options: CanonicalizeContext): URL \| null {\n if (url.startsWith('file://')) {\n return super.canonicalize(url, options);\n }\n\n let result = this.finder(url, options);\n result &&= super.canonicalize(result.href, options);\n\n return result;\n }\n}\n\n/\n Provides the Sass importer logic to resolve load paths located stylesheet imports via both import and\n * use rules and also rebase any `url()` function usage within those stylesheets. The rebasing will ensure that\n * the URLs in the output of the Sass compiler reflect the final filesystem location of the output CSS file.\n /\nexport class LoadPathsUrlRebasingImporter extends RelativeUrlRebasingImporter {\n constructor(\n entryDirectory: string,\n directoryCache: Map<string, DirectoryEntry>,\n private loadPaths: Iterable<string>,\n ) {\n super(entryDirectory, directoryCache);\n }\n\n override canonicalize(url: string, options: { fromImport: boolean }): URL \| null {\n if (url.startsWith('file://')) {\n return super.canonicalize(url, options);\n }\n\n let result = null;\n for (const loadPath of this.loadPaths) {\n result = super.canonicalize(pathToFileURL(join(loadPath, url)).href, options);\n if (result !== null) {\n break;\n }\n }\n\n return result;\n }\n}\n\n/\n Workaround for Sass not calling instance methods with `this`.\n * The `canonicalize` and `load` methods will be bound to the class instance.\n * @param importer A Sass importer to bind.\n * @returns The bound Sass importer.\n */\nexport function sassBindWorkaround<T extends Importer>(importer: T): T {\n importer.canonicalize = importer.canonicalize.bind(importer);\n importer.load = importer.load.bind(importer);\n\n return importer;\n}\n"]}
1	+ {"version":3,"file":"rebasing-importer.js","sourceRoot":"","sources":["../../../../../src/lib/styles/sass/rebasing-importer.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFileSync, readdirSync, statSync } from 'node:fs';\nimport { basename, dirname, extname, join, relative } from 'node:path';\nimport { fileURLToPath, pathToFileURL } from 'node:url';\nimport type { CanonicalizeContext, Importer, ImporterResult, Syntax } from 'sass-embedded';\nimport { findUrls } from './lexer';\n\n/*\n A preprocessed cache entry for the files and directories within a previously searched\n * directory when performing Sass import resolution.\n /\nexport interface DirectoryEntry {\n files: Set<string>;\n directories: Set<string>;\n}\n\n/\n A Sass Importer base class that provides the load logic to rebase all `url()` functions\n * within a stylesheet. The rebasing will ensure that the URLs in the output of the Sass compiler\n * reflect the final filesystem location of the output CSS file.\n \n This class provides the core of the rebasing functionality. To ensure that each file is processed\n * by this importer's load implementation, the Sass compiler requires the importer's canonicalize\n * function to return a non-null value with the resolved location of the requested stylesheet.\n * Concrete implementations of this class must provide this canonicalize functionality for rebasing\n * to be effective.\n /\nabstract class UrlRebasingImporter implements Importer<'sync'> {\n /\n @param entryDirectory The directory of the entry stylesheet that was passed to the Sass compiler.\n * @param rebaseSourceMaps When provided, rebased files will have an intermediate sourcemap added to the Map\n * which can be used to generate a final sourcemap that contains original sources.\n /\n constructor(private entryDirectory: string) {\n this.load = this.load.bind(this);\n }\n\n abstract canonicalize(url: string, options: CanonicalizeContext): URL \| null;\n\n load(canonicalUrl: URL): ImporterResult \| null {\n const stylesheetPath = fileURLToPath(canonicalUrl);\n const stylesheetDirectory = dirname(stylesheetPath);\n let contents = readFileSync(stylesheetPath, 'utf-8');\n\n // Rebase any URLs that are found\n let updatedContents: string;\n for (const { start, end, value } of findUrls(contents)) {\n // Skip if value is empty or Webpack-specific prefix\n if (value.length === 0 \|\| value[0] === '~' \|\| value[0] === '^') {\n continue;\n }\n\n // Skip if root-relative, absolute or protocol relative url\n if (/^((?:\\w+:)?\\/\\/\|data:\|chrome:\|\\/)/.test(value)) {\n continue;\n }\n\n // Skip if a fragment identifier but not a Sass interpolation\n if (value[0] === '#' && value[1] !== '{') {\n continue;\n }\n\n // Skip if value is value contains a function call\n if (/#\\{.+\$.+\$\\}/.test(value)) {\n continue;\n }\n\n // Sass variable usage either starts with a `$` or contains a namespace and a `.$`\n const valueNormalized = value[0] === '$' \|\| /^\\w+\\.\\$/.test(value) ? `#{${value}}` : value;\n const rebasedPath = relative(this.entryDirectory, stylesheetDirectory);\n\n // Normalize path separators and escape characters\n // https://developer.mozilla.org/en-US/docs/Web/CSS/url#syntax\n const rebasedUrl = rebasedPath.replace(/\\\\/g, '/').replace(/[()\\s'\"]/g, '\\\\$&');\n\n // eslint-disable-next-line no-useless-assignment\n updatedContents ??= contents;\n updatedContents = contents.slice(0, start) + `\"${rebasedUrl}\|\|file:${valueNormalized}\"` + contents.slice(end);\n }\n\n if (updatedContents) {\n contents = updatedContents;\n }\n\n let syntax: Syntax \| undefined;\n switch (extname(stylesheetPath).toLowerCase()) {\n case '.css':\n syntax = 'css';\n break;\n case '.sass':\n syntax = 'indented';\n break;\n default:\n syntax = 'scss';\n break;\n }\n\n return {\n contents,\n syntax,\n sourceMapUrl: canonicalUrl,\n };\n }\n}\n\n/\n Provides the Sass importer logic to resolve relative stylesheet imports via both import and use rules\n * and also rebase any `url()` function usage within those stylesheets. The rebasing will ensure that\n * the URLs in the output of the Sass compiler reflect the final filesystem location of the output CSS file.\n /\nexport class RelativeUrlRebasingImporter extends UrlRebasingImporter {\n constructor(\n entryDirectory: string,\n private directoryCache = new Map<string, DirectoryEntry>(),\n ) {\n super(entryDirectory);\n this.canonicalize = this.canonicalize.bind(this);\n }\n\n canonicalize(url: string, options: CanonicalizeContext): URL \| null {\n return this.resolveImport(url, options.fromImport, true);\n }\n\n /\n Attempts to resolve a provided URL to a stylesheet file using the Sass compiler's resolution algorithm.\n * Based on https://github.com/sass/dart-sass/blob/44d6bb6ac72fe6b93f5bfec371a1fffb18e6b76d/lib/src/importer/utils.dart\n * @param url The file protocol URL to resolve.\n * @param fromImport If true, URL was from an import rule; otherwise from a use rule.\n * @param checkDirectory If true, try checking for a directory with the base name containing an index file.\n * @returns A full resolved URL of the stylesheet file or `null` if not found.\n /\n private resolveImport(url: string, fromImport: boolean, checkDirectory: boolean): URL \| null {\n let stylesheetPath;\n try {\n stylesheetPath = fileURLToPath(url);\n } catch {\n // Only file protocol URLs are supported by this importer\n return null;\n }\n\n const directory = dirname(stylesheetPath);\n const extension = extname(stylesheetPath);\n const hasStyleExtension = extension === '.scss' \|\| extension === '.sass' \|\| extension === '.css';\n // Remove the style extension if present to allow adding the `.import` suffix\n const filename = basename(stylesheetPath, hasStyleExtension ? extension : undefined);\n\n const importPotentials = new Set<string>();\n const defaultPotentials = new Set<string>();\n\n if (hasStyleExtension) {\n if (fromImport) {\n importPotentials.add(filename + '.import' + extension);\n importPotentials.add('_' + filename + '.import' + extension);\n }\n defaultPotentials.add(filename + extension);\n defaultPotentials.add('_' + filename + extension);\n } else {\n if (fromImport) {\n importPotentials.add(filename + '.import.scss');\n importPotentials.add(filename + '.import.sass');\n importPotentials.add(filename + '.import.css');\n importPotentials.add('_' + filename + '.import.scss');\n importPotentials.add('_' + filename + '.import.sass');\n importPotentials.add('_' + filename + '.import.css');\n }\n defaultPotentials.add(filename + '.scss');\n defaultPotentials.add(filename + '.sass');\n defaultPotentials.add(filename + '.css');\n defaultPotentials.add('_' + filename + '.scss');\n defaultPotentials.add('_' + filename + '.sass');\n defaultPotentials.add('_' + filename + '.css');\n }\n\n let foundDefaults;\n let foundImports;\n let hasPotentialIndex = false;\n\n let cachedEntries = this.directoryCache.get(directory);\n if (cachedEntries) {\n // If there is a preprocessed cache of the directory, perform an intersection of the potentials\n // and the directory files.\n const { files, directories } = cachedEntries;\n foundDefaults = [...defaultPotentials].filter(potential => files.has(potential));\n foundImports = [...importPotentials].filter(potential => files.has(potential));\n hasPotentialIndex = checkDirectory && !hasStyleExtension && directories.has(filename);\n } else {\n // If no preprocessed cache exists, get the entries from the file system and, while searching,\n // generate the cache for later requests.\n let entries;\n try {\n entries = readdirSync(directory, { withFileTypes: true });\n } catch (error) {\n // If the containing directory does not exist return null to indicate it cannot be resolved\n if (error.code === 'ENOENT') {\n return null;\n }\n\n throw new Error(`Error reading directory [\"${directory}\"] while resolving Sass import`, {\n cause: error,\n });\n }\n\n foundDefaults = [];\n foundImports = [];\n cachedEntries = { files: new Set<string>(), directories: new Set<string>() };\n for (const entry of entries) {\n let isDirectory: boolean;\n let isFile: boolean;\n\n if (entry.isSymbolicLink()) {\n const stats = statSync(join(directory, entry.name));\n isDirectory = stats.isDirectory();\n isFile = stats.isFile();\n } else {\n isDirectory = entry.isDirectory();\n isFile = entry.isFile();\n }\n\n if (isDirectory) {\n cachedEntries.directories.add(entry.name);\n\n // Record if the name should be checked as a directory with an index file\n if (checkDirectory && !hasStyleExtension && entry.name === filename) {\n hasPotentialIndex = true;\n }\n }\n\n if (!isFile) {\n continue;\n }\n\n cachedEntries.files.add(entry.name);\n\n if (importPotentials.has(entry.name)) {\n foundImports.push(entry.name);\n }\n\n if (defaultPotentials.has(entry.name)) {\n foundDefaults.push(entry.name);\n }\n }\n\n this.directoryCache.set(directory, cachedEntries);\n }\n\n // `foundImports` will only contain elements if `options.fromImport` is true\n const result = this.checkFound(foundImports) ?? this.checkFound(foundDefaults);\n if (result !== null) {\n return pathToFileURL(join(directory, result));\n }\n\n if (hasPotentialIndex) {\n // Check for index files using filename as a directory\n return this.resolveImport(url + '/index', fromImport, false);\n }\n\n return null;\n }\n\n /\n Checks an array of potential stylesheet files to determine if there is a valid\n * stylesheet file. More than one discovered file may indicate an error.\n * @param found An array of discovered stylesheet files.\n * @returns A fully resolved path for a stylesheet file or `null` if not found.\n * @throws If there are ambiguous files discovered.\n /\n private checkFound(found: string[]): string \| null {\n if (found.length === 0) {\n // Not found\n return null;\n }\n\n // More than one found file may be an error\n if (found.length > 1) {\n // Presence of CSS files alongside a Sass file does not cause an error\n const foundWithoutCss = found.filter(element => extname(element) !== '.css');\n // If the length is zero then there are two or more css files\n // If the length is more than one than there are two or more sass/scss files\n if (foundWithoutCss.length !== 1) {\n throw new Error('Ambiguous import detected.');\n }\n\n // Return the non-CSS file (sass/scss files have priority)\n // https://github.com/sass/dart-sass/blob/44d6bb6ac72fe6b93f5bfec371a1fffb18e6b76d/lib/src/importer/utils.dart#L44-L47\n return foundWithoutCss[0];\n }\n\n return found[0];\n }\n}\n\n/\n Provides the Sass importer logic to resolve module (npm package) stylesheet imports asynchronously\n * and also rebase any `url()` function usage within those stylesheets.\n /\nexport class AsyncModuleUrlRebasingImporter implements Importer<'async'> {\n private relativeImporter: RelativeUrlRebasingImporter;\n\n constructor(\n entryDirectory: string,\n directoryCache: Map<string, DirectoryEntry>,\n private finder: (specifier: string, options: CanonicalizeContext) => Promise<URL \| null> \| URL \| null,\n ) {\n this.relativeImporter = new RelativeUrlRebasingImporter(entryDirectory, directoryCache);\n this.canonicalize = this.canonicalize.bind(this);\n this.load = this.load.bind(this);\n }\n\n async canonicalize(url: string, options: CanonicalizeContext): Promise<URL \| null> {\n if (url.startsWith('file://')) {\n return this.relativeImporter.canonicalize(url, options);\n }\n\n const result = await this.finder(url, options);\n\n return result ? this.relativeImporter.canonicalize(result.href, options) : null;\n }\n\n load(canonicalUrl: URL): ImporterResult \| null {\n return this.relativeImporter.load(canonicalUrl);\n }\n}\n\n/\n Provides the Sass importer logic to resolve load paths located stylesheet imports via both import and\n * use rules and also rebase any `url()` function usage within those stylesheets. The rebasing will ensure that\n * the URLs in the output of the Sass compiler reflect the final filesystem location of the output CSS file.\n */\nexport class LoadPathsUrlRebasingImporter extends RelativeUrlRebasingImporter {\n constructor(\n entryDirectory: string,\n directoryCache: Map<string, DirectoryEntry>,\n private loadPaths: Iterable<string>,\n ) {\n super(entryDirectory, directoryCache);\n }\n\n override canonicalize(url: string, options: CanonicalizeContext): URL \| null {\n if (url.startsWith('file://')) {\n return super.canonicalize(url, options);\n }\n\n let result = null;\n for (const loadPath of this.loadPaths) {\n result = super.canonicalize(pathToFileURL(join(loadPath, url)).href, options);\n if (result !== null) {\n break;\n }\n }\n\n return result;\n }\n}\n"]}

package/src/lib/styles/sass/sass-service.d.ts CHANGED Viewed

@@ -1,41 +1,22 @@
-import type { CompileResult, Deprecation, SourceSpan, StringOptions } from 'sass';
-export interface SerializableVersion {
-    major: number;
-    minor: number;
-    patch: number;
-}
-export interface SerializableDeprecation extends Omit<Deprecation, 'obsoleteIn' | 'deprecatedIn'> {
-    /** The version this deprecation first became active in. */
-    deprecatedIn: SerializableVersion | null;
-    /** The version this deprecation became obsolete in. */
-    obsoleteIn: SerializableVersion | null;
-}
-export type SerializableWarningMessage = ({
-    deprecation: true;
-    deprecationType: SerializableDeprecation;
-} | {
-    deprecation: false;
-}) & {
-    message: string;
-    span?: Omit<SourceSpan, 'url'> & {
-        url?: string;
-    };
-    stack?: string;
-};
+import type { CompileResult, StringOptions } from 'sass-embedded';
+/**
+ * When `NG_BUILD_SASS_EMBEDDED` is set to `0` or `false`, or when running within a
+ * WebContainer environment, the native embedded Sass compiler is disabled
+ * and the pure-JavaScript Sass compiler is used instead.
+ */
+export declare const useSassEmbedded: boolean;
 /**
- * A Sass renderer implementation that provides an interface that can be used by Webpack's
- * `sass-loader`. The implementation uses a Worker thread to perform the Sass rendering
- * with the `dart-sass` package.  The `dart-sass` synchronous render function is used within
- * the worker which can be up to two times faster than the asynchronous variant.
+ * A Sass renderer implementation that uses the persistent Dart Sass embedded compiler
+ * daemon (`sass-embedded`) communicating over standard input/output with protocol buffers,
+ * or falls back to the pure-JS Dart Sass async compiler (`sass.initAsyncCompiler()`).
  */
-export declare class SassWorkerImplementation {
+export declare class SassCompiler {
     #private;
     private readonly rebase;
-    readonly maxThreads: number;
-    constructor(rebase?: boolean, maxThreads?: number);
+    constructor(rebase?: boolean);
     /**
      * Provides information about the Sass implementation.
-     * This mimics enough of the `dart-sass` value to be used with the `sass-loader`.
+     * This mimics enough of the `sass-embedded` or `sass` value to be used with the `sass-loader`.
      */
     get info(): string;
     /**
@@ -43,18 +24,20 @@ export declare class SassWorkerImplementation {
      */
     compileString(): never;
     /**
-     * Asynchronously request a Sass stylesheet to be renderered.
+     * Asynchronously request a Sass stylesheet to be rendered using the native embedded compiler
+     * or the pure-JS async compiler fallback.
      *
      * @param source The contents to compile.
-     * @param options The `dart-sass` options to use when rendering the stylesheet.
+     * @param options The `sass` / `sass-embedded` options to use when rendering the stylesheet.
      */
     compileStringAsync(source: string, options: StringOptions<'async'>): Promise<CompileResult>;
     /**
-     * Shutdown the Sass render worker.
-     * Executing this method will stop any pending render requests.
+     * Clear the directory cache.
+     */
+    clearCache(): void;
+    /**
+     * Shutdown the Sass compiler.
      * @returns A void promise that resolves when closing is complete.
      */
     close(): Promise<void>;
-    private processImporters;
-    private isFileImporter;
 }