ng-packagr 12.0.7 → 12.1.1

package/cli/main.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const program = require("commander");
 const path = require("path");
+const log_1 = require("../lib/utils/log");
 const public_api_1 = require("../public_api");
 const DEFAULT_PROJECT_PATH = path.resolve(process.cwd(), 'ng-package.json');
 function parseProjectPath(parsed) {
@@ -21,5 +22,8 @@ program.on('option:version', () => {
 });
 program.parse(process.argv);
 const { config, project, watch } = program.opts();
-public_api_1.execute(public_api_1.build, { config, project, watch: !!watch }).catch(() => process.exit(111));
+public_api_1.execute(public_api_1.build, { config, project, watch: !!watch }).catch(err => {
+    log_1.error(err.message);
+    process.exit(1);
+});
 //# sourceMappingURL=main.js.map

package/cli/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":";;;AAEA,qCAAqC;AACrC,6BAA6B;AAC7B,8CAAwD;AAExD,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC;AAE5E,SAAS,gBAAgB,CAAC,MAAc;IACtC,OAAO,MAAM,IAAI,oBAAoB,CAAC;AACxC,CAAC;AAED,OAAO;KACJ,IAAI,CAAC,YAAY,CAAC;KAClB,wBAAwB,CAAC,KAAK,CAAC;KAC/B,MAAM,CAAC,eAAe,EAAE,qBAAqB,CAAC;KAC9C,MAAM,CAAC,aAAa,EAAE,wBAAwB,CAAC;KAC/C,MAAM,CACL,sBAAsB,EACtB,uDAAuD,EACvD,gBAAgB,EAChB,oBAAoB,CACrB;KACA,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,EAAE,CAAC,KAAyB,EAAE,EAAE,CACzF,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CACxC,CAAC;AAEJ,OAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAChC,oBAAO,EAAE,CAAC;IACV,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;AAClD,oBAAO,CAAC,kBAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC","sourcesContent":["#!/usr/bin/env node\n\nimport * as program from 'commander';\nimport * as path from 'path';\nimport { build, execute, version } from '../public_api';\n\nconst DEFAULT_PROJECT_PATH = path.resolve(process.cwd(), 'ng-package.json');\n\nfunction parseProjectPath(parsed: string): string {\n  return parsed || DEFAULT_PROJECT_PATH;\n}\n\nprogram\n  .name('ng-packagr')\n  .storeOptionsAsProperties(false)\n  .option('-v, --version', 'Prints version info')\n  .option('-w, --watch', 'Watch for file changes')\n  .option(\n    '-p, --project [path]',\n    \"Path to the 'ng-package.json' or 'package.json' file.\",\n    parseProjectPath,\n    DEFAULT_PROJECT_PATH,\n  )\n  .option('-c, --config [config]', 'Path to a tsconfig file.', (value: string | undefined) =>\n    value ? path.resolve(value) : undefined,\n  );\n\nprogram.on('option:version', () => {\n  version();\n  process.exit(0);\n});\n\nprogram.parse(process.argv);\n\nconst { config, project, watch } = program.opts();\nexecute(build, { config, project, watch: !!watch }).catch(() => process.exit(111));\n"]}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":";;;AAEA,qCAAqC;AACrC,6BAA6B;AAC7B,0CAAyC;AACzC,8CAAwD;AAExD,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC;AAE5E,SAAS,gBAAgB,CAAC,MAAc;IACtC,OAAO,MAAM,IAAI,oBAAoB,CAAC;AACxC,CAAC;AAED,OAAO;KACJ,IAAI,CAAC,YAAY,CAAC;KAClB,wBAAwB,CAAC,KAAK,CAAC;KAC/B,MAAM,CAAC,eAAe,EAAE,qBAAqB,CAAC;KAC9C,MAAM,CAAC,aAAa,EAAE,wBAAwB,CAAC;KAC/C,MAAM,CACL,sBAAsB,EACtB,uDAAuD,EACvD,gBAAgB,EAChB,oBAAoB,CACrB;KACA,MAAM,CAAC,uBAAuB,EAAE,0BAA0B,EAAE,CAAC,KAAyB,EAAE,EAAE,CACzF,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CACxC,CAAC;AAEJ,OAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAChC,oBAAO,EAAE,CAAC;IACV,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;AAClD,oBAAO,CAAC,kBAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;IAC9D,WAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC","sourcesContent":["#!/usr/bin/env node\n\nimport * as program from 'commander';\nimport * as path from 'path';\nimport { error } from '../lib/utils/log';\nimport { build, execute, version } from '../public_api';\n\nconst DEFAULT_PROJECT_PATH = path.resolve(process.cwd(), 'ng-package.json');\n\nfunction parseProjectPath(parsed: string): string {\n  return parsed || DEFAULT_PROJECT_PATH;\n}\n\nprogram\n  .name('ng-packagr')\n  .storeOptionsAsProperties(false)\n  .option('-v, --version', 'Prints version info')\n  .option('-w, --watch', 'Watch for file changes')\n  .option(\n    '-p, --project [path]',\n    \"Path to the 'ng-package.json' or 'package.json' file.\",\n    parseProjectPath,\n    DEFAULT_PROJECT_PATH,\n  )\n  .option('-c, --config [config]', 'Path to a tsconfig file.', (value: string | undefined) =>\n    value ? path.resolve(value) : undefined,\n  );\n\nprogram.on('option:version', () => {\n  version();\n  process.exit(0);\n});\n\nprogram.parse(process.argv);\n\nconst { config, project, watch } = program.opts();\nexecute(build, { config, project, watch: !!watch }).catch(err => {\n  error(err.message);\n  process.exit(1);\n});\n"]}

package/lib/file-system/file-cache.d.ts

@@ -4,6 +4,7 @@ export interface CacheEntry {
     sourceFile?: ts.SourceFile;
     content?: string;
     declarationFileName?: string;
+    angularDiagnostics?: ts.Diagnostic[];
 }
 export declare class FileCache {
     private cache;
@@ -15,4 +16,6 @@ export declare class FileCache {
     has(fileName: string): boolean;
     get(fileName: string): CacheEntry | undefined;
     getOrCreate(fileName: string): CacheEntry;
+    updateAngularDiagnostics(sourceFile: ts.SourceFile, diagnostics: ts.Diagnostic[]): void;
+    getAngularDiagnostics(sourceFile: ts.SourceFile): ts.Diagnostic[] | undefined;
 }

package/lib/file-system/file-cache.js

@@ -32,6 +32,15 @@ class FileCache {
         }
         return entry;
     }
+    updateAngularDiagnostics(sourceFile, diagnostics) {
+        if (this.has(sourceFile.fileName)) {
+            this.get(sourceFile.fileName).angularDiagnostics = diagnostics;
+        }
+    }
+    getAngularDiagnostics(sourceFile) {
+        var _a;
+        return (_a = this.get(sourceFile.fileName)) === null || _a === void 0 ? void 0 : _a.angularDiagnostics;
+    }
 }
 exports.FileCache = FileCache;
 //# sourceMappingURL=file-cache.js.map

package/lib/file-system/file-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-cache.js","sourceRoot":"","sources":["../../../src/lib/file-system/file-cache.ts"],"names":[],"mappings":";;;AACA,wCAA+C;AAS/C,MAAa,SAAS;IAAtB;QACU,UAAK,GAA4B,IAAI,GAAG,EAAE,CAAC;QAEnD,YAAO,GAGK,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChD,UAAK,GAAe,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAiCxD,CAAC;IA/BC,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,YAAY,CAAC,QAAgB;QAC3B,OAAO,qBAAc,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,QAAgB;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,GAAG,CAAC,QAAgB;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,GAAG,CAAC,QAAgB;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAE1C,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;SACtC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAxCD,8BAwCC","sourcesContent":["import * as ts from 'typescript';\nimport { ensureUnixPath } from '../utils/path';\n\nexport interface CacheEntry {\n  exists?: boolean;\n  sourceFile?: ts.SourceFile;\n  content?: string;\n  declarationFileName?: string;\n}\n\nexport class FileCache {\n  private cache: Map<string, CacheEntry> = new Map();\n\n  forEach: (\n    callbackfn: (value: CacheEntry, key: string, map: Map<string, CacheEntry>) => void,\n    thisArg?: any,\n  ) => void = this.cache.forEach.bind(this.cache);\n  clear: () => void = this.cache.clear.bind(this.cache);\n\n  size(): number {\n    return this.cache.size;\n  }\n\n  normalizeKey(fileName: string): string {\n    return ensureUnixPath(fileName);\n  }\n\n  delete(fileName: string): boolean {\n    return this.cache.delete(this.normalizeKey(fileName));\n  }\n\n  has(fileName: string): boolean {\n    return this.cache.has(this.normalizeKey(fileName));\n  }\n\n  get(fileName: string): CacheEntry | undefined {\n    return this.cache.get(this.normalizeKey(fileName));\n  }\n\n  getOrCreate(fileName: string): CacheEntry {\n    const normalizedKey = this.normalizeKey(fileName);\n    let entry = this.cache.get(normalizedKey);\n\n    if (!entry) {\n      entry = {};\n      this.cache.set(normalizedKey, entry);\n    }\n\n    return entry;\n  }\n}\n"]}
+{"version":3,"file":"file-cache.js","sourceRoot":"","sources":["../../../src/lib/file-system/file-cache.ts"],"names":[],"mappings":";;;AACA,wCAA+C;AAU/C,MAAa,SAAS;IAAtB;QACU,UAAK,GAA4B,IAAI,GAAG,EAAE,CAAC;QAEnD,YAAO,GACL,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,UAAK,GAAe,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IA2CxD,CAAC;IAzCC,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,YAAY,CAAC,QAAgB;QAC3B,OAAO,qBAAc,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,QAAgB;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,GAAG,CAAC,QAAgB;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,GAAG,CAAC,QAAgB;QAClB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAE1C,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;SACtC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,wBAAwB,CAAC,UAAyB,EAAE,WAA4B;QAC9E,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YACjC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,kBAAkB,GAAG,WAAW,CAAC;SAChE;IACH,CAAC;IAED,qBAAqB,CAAC,UAAyB;;QAC7C,OAAO,MAAA,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,0CAAE,kBAAkB,CAAC;IAC3D,CAAC;CACF;AAhDD,8BAgDC","sourcesContent":["import * as ts from 'typescript';\nimport { ensureUnixPath } from '../utils/path';\n\nexport interface CacheEntry {\n  exists?: boolean;\n  sourceFile?: ts.SourceFile;\n  content?: string;\n  declarationFileName?: string;\n  angularDiagnostics?: ts.Diagnostic[];\n}\n\nexport class FileCache {\n  private cache: Map<string, CacheEntry> = new Map();\n\n  forEach: (callbackfn: (value: CacheEntry, key: string, map: Map<string, CacheEntry>) => void, thisArg?: any) => void =\n    this.cache.forEach.bind(this.cache);\n  clear: () => void = this.cache.clear.bind(this.cache);\n\n  size(): number {\n    return this.cache.size;\n  }\n\n  normalizeKey(fileName: string): string {\n    return ensureUnixPath(fileName);\n  }\n\n  delete(fileName: string): boolean {\n    return this.cache.delete(this.normalizeKey(fileName));\n  }\n\n  has(fileName: string): boolean {\n    return this.cache.has(this.normalizeKey(fileName));\n  }\n\n  get(fileName: string): CacheEntry | undefined {\n    return this.cache.get(this.normalizeKey(fileName));\n  }\n\n  getOrCreate(fileName: string): CacheEntry {\n    const normalizedKey = this.normalizeKey(fileName);\n    let entry = this.cache.get(normalizedKey);\n\n    if (!entry) {\n      entry = {};\n      this.cache.set(normalizedKey, entry);\n    }\n\n    return entry;\n  }\n\n  updateAngularDiagnostics(sourceFile: ts.SourceFile, diagnostics: ts.Diagnostic[]): void {\n    if (this.has(sourceFile.fileName)) {\n      this.get(sourceFile.fileName).angularDiagnostics = diagnostics;\n    }\n  }\n\n  getAngularDiagnostics(sourceFile: ts.SourceFile): ts.Diagnostic[] | undefined {\n    return this.get(sourceFile.fileName)?.angularDiagnostics;\n  }\n}\n"]}

package/lib/ivy/cache-compiler-host.d.ts

@@ -0,0 +1,8 @@
+import * as ts from 'typescript';
+import * as ng from '@angular/compiler-cli';
+import { EntryPointNode } from '../ng-package/nodes';
+import { BuildGraph } from '../graph/build-graph';
+import { FileCache } from '../file-system/file-cache';
+import { StylesheetProcessor } from './styles/stylesheet-processor';
+export declare function cacheCompilerHost(graph: BuildGraph, entryPoint: EntryPointNode, compilerOptions: ng.CompilerOptions, moduleResolutionCache: ts.ModuleResolutionCache, stylesheetProcessor?: StylesheetProcessor, sourcesFileCache?: FileCache): ng.CompilerHost;
+export declare function augmentProgramWithVersioning(program: ts.Program): void;

package/lib/ivy/cache-compiler-host.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.augmentProgramWithVersioning = exports.cacheCompilerHost = void 0;
+const ts = require("typescript");
+const path = require("path");
+const path_1 = require("../utils/path");
+const nodes_1 = require("../ng-package/nodes");
+const node_1 = require("../graph/node");
+const crypto_1 = require("crypto");
+function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionCache, stylesheetProcessor, sourcesFileCache = entryPoint.cache.sourcesFileCache) {
+    const compilerHost = ts.createIncrementalCompilerHost(compilerOptions);
+    const getNode = (fileName) => {
+        const nodeUri = nodes_1.fileUrl(path_1.ensureUnixPath(fileName));
+        let node = graph.get(nodeUri);
+        if (!node) {
+            node = new node_1.Node(nodeUri);
+            graph.put(node);
+        }
+        return node;
+    };
+    const addDependee = (fileName) => {
+        const node = getNode(fileName);
+        entryPoint.dependsOn(node);
+    };
+    return {
+        ...compilerHost,
+        // ts specific
+        fileExists: (fileName) => {
+            const cache = sourcesFileCache.getOrCreate(fileName);
+            if (cache.exists === undefined) {
+                cache.exists = compilerHost.fileExists.call(this, fileName);
+            }
+            return cache.exists;
+        },
+        getSourceFile: (fileName, languageVersion) => {
+            addDependee(fileName);
+            const cache = sourcesFileCache.getOrCreate(fileName);
+            if (!cache.sourceFile) {
+                cache.sourceFile = compilerHost.getSourceFile.call(this, fileName, languageVersion);
+            }
+            return cache.sourceFile;
+        },
+        writeFile: (fileName, data, writeByteOrderMark, onError, sourceFiles) => {
+            if (fileName.endsWith('.d.ts')) {
+                sourceFiles.forEach(source => {
+                    const cache = sourcesFileCache.getOrCreate(source.fileName);
+                    if (!cache.declarationFileName) {
+                        cache.declarationFileName = path_1.ensureUnixPath(fileName);
+                    }
+                });
+            }
+            compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);
+        },
+        readFile: (fileName) => {
+            addDependee(fileName);
+            const cache = sourcesFileCache.getOrCreate(fileName);
+            if (cache.content === undefined) {
+                cache.content = compilerHost.readFile.call(this, fileName);
+            }
+            return cache.content;
+        },
+        resolveModuleNames: (moduleNames, containingFile) => {
+            return moduleNames.map(moduleName => {
+                const { resolvedModule } = ts.resolveModuleName(moduleName, path_1.ensureUnixPath(containingFile), compilerOptions, compilerHost, moduleResolutionCache);
+                return resolvedModule;
+            });
+        },
+        resourceNameToFileName: (resourceName, containingFilePath) => {
+            const resourcePath = path.resolve(path.dirname(containingFilePath), resourceName);
+            const containingNode = getNode(containingFilePath);
+            const resourceNode = getNode(resourcePath);
+            containingNode.dependsOn(resourceNode);
+            return resourcePath;
+        },
+        readResource: async (fileName) => {
+            addDependee(fileName);
+            const cache = sourcesFileCache.getOrCreate(fileName);
+            if (cache.content === undefined) {
+                if (/(?:html?|svg)$/.test(path.extname(fileName))) {
+                    // template
+                    cache.content = compilerHost.readFile.call(this, fileName);
+                }
+                else {
+                    // stylesheet
+                    cache.content = await stylesheetProcessor.process(fileName);
+                }
+                if (cache.content === undefined) {
+                    throw new Error(`Cannot read file ${fileName}.`);
+                }
+                ;
+                cache.exists = true;
+            }
+            return cache.content;
+        },
+    };
+}
+exports.cacheCompilerHost = cacheCompilerHost;
+function augmentProgramWithVersioning(program) {
+    const baseGetSourceFiles = program.getSourceFiles;
+    program.getSourceFiles = function (...parameters) {
+        const files = baseGetSourceFiles(...parameters);
+        for (const file of files) {
+            if (file.version === undefined) {
+                file.version = crypto_1.createHash('sha256').update(file.text).digest('hex');
+            }
+        }
+        return files;
+    };
+}
+exports.augmentProgramWithVersioning = augmentProgramWithVersioning;
+//# sourceMappingURL=cache-compiler-host.js.map

package/lib/ivy/cache-compiler-host.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../src/lib/ivy/cache-compiler-host.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\nimport * as ng from '@angular/compiler-cli';\nimport * as path from 'path';\nimport { ensureUnixPath } from '../utils/path';\n\nimport { EntryPointNode, fileUrl } from '../ng-package/nodes';\nimport { BuildGraph } from '../graph/build-graph';\nimport { FileCache } from '../file-system/file-cache';\nimport { Node } from '../graph/node';\nimport { createHash } from 'crypto';\nimport { StylesheetProcessor } from './styles/stylesheet-processor';\n\nexport function cacheCompilerHost(\n  graph: BuildGraph,\n  entryPoint: EntryPointNode,\n  compilerOptions: ng.CompilerOptions,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  stylesheetProcessor?: StylesheetProcessor,\n  sourcesFileCache: FileCache = entryPoint.cache.sourcesFileCache,\n): ng.CompilerHost {\n  const compilerHost = ts.createIncrementalCompilerHost(compilerOptions);\n\n  const getNode = (fileName: string) => {\n    const nodeUri = fileUrl(ensureUnixPath(fileName));\n    let node = graph.get(nodeUri);\n\n    if (!node) {\n      node = new Node(nodeUri);\n      graph.put(node);\n    }\n\n    return node;\n  };\n\n  const addDependee = (fileName: string) => {\n    const node = getNode(fileName);\n    entryPoint.dependsOn(node);\n  };\n\n  return {\n    ...compilerHost,\n\n    // ts specific\n    fileExists: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.exists === undefined) {\n        cache.exists = compilerHost.fileExists.call(this, fileName);\n      }\n      return cache.exists;\n    },\n\n    getSourceFile: (fileName: string, languageVersion: ts.ScriptTarget) => {\n      addDependee(fileName);\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (!cache.sourceFile) {\n        cache.sourceFile = compilerHost.getSourceFile.call(this, fileName, languageVersion);\n      }\n      return cache.sourceFile;\n    },\n\n    writeFile: (\n      fileName: string,\n      data: string,\n      writeByteOrderMark: boolean,\n      onError?: (message: string) => void,\n      sourceFiles?: ReadonlyArray<ts.SourceFile>,\n    ) => {\n      if (fileName.endsWith('.d.ts')) {\n        sourceFiles.forEach(source => {\n          const cache = sourcesFileCache.getOrCreate(source.fileName);\n          if (!cache.declarationFileName) {\n            cache.declarationFileName = ensureUnixPath(fileName);\n          }\n        });\n      }\n\n      compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);\n    },\n\n    readFile: (fileName: string) => {\n      addDependee(fileName);\n\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        cache.content = compilerHost.readFile.call(this, fileName);\n      }\n      return cache.content;\n    },\n\n    resolveModuleNames: (moduleNames: string[], containingFile: string) => {\n      return moduleNames.map(moduleName => {\n        const { resolvedModule } = ts.resolveModuleName(\n          moduleName,\n          ensureUnixPath(containingFile),\n          compilerOptions,\n          compilerHost,\n          moduleResolutionCache,\n        );\n\n        return resolvedModule;\n      });\n    },\n\n    resourceNameToFileName: (resourceName: string, containingFilePath: string) => {\n      const resourcePath = path.resolve(path.dirname(containingFilePath), resourceName);\n      const containingNode = getNode(containingFilePath);\n      const resourceNode = getNode(resourcePath);\n      containingNode.dependsOn(resourceNode);\n\n      return resourcePath;\n    },\n\n    readResource: async (fileName: string) => {\n      addDependee(fileName);\n\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        if (/(?:html?|svg)$/.test(path.extname(fileName))) {\n          // template\n          cache.content = compilerHost.readFile.call(this, fileName);\n        } else {\n          // stylesheet\n          cache.content = await stylesheetProcessor.process(fileName);\n        }\n\n        if (cache.content === undefined) {\n          throw new Error(`Cannot read file ${fileName}.`);\n        };\n\n        cache.exists = true;\n      }\n\n      return cache.content;\n    },\n  };\n}\n\nexport function augmentProgramWithVersioning(program: ts.Program): void {\n  const baseGetSourceFiles = program.getSourceFiles;\n  program.getSourceFiles = function (...parameters) {\n    const files: readonly (ts.SourceFile & { version?: string })[] = baseGetSourceFiles(\n      ...parameters,\n    );\n\n    for (const file of files) {\n      if (file.version === undefined) {\n        file.version = createHash('sha256').update(file.text).digest('hex');\n      }\n    }\n\n    return files;\n  };\n}\n"]}

package/lib/ivy/compile-source-files.d.ts

@@ -0,0 +1,6 @@
+import * as ng from '@angular/compiler-cli';
+import * as ts from 'typescript';
+import * as ivy from '../ivy';
+import { BuildGraph } from '../graph/build-graph';
+import { NgccProcessor } from '../ngc/ngcc-processor';
+export declare function compileSourceFiles(graph: BuildGraph, tsConfig: ng.ParsedConfiguration, moduleResolutionCache: ts.ModuleResolutionCache, extraOptions?: Partial<ng.CompilerOptions>, stylesheetProcessor?: ivy.StylesheetProcessor, ngccProcessor?: NgccProcessor, watch?: boolean): Promise<void>;

package/lib/ivy/compile-source-files.js

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileSourceFiles = void 0;
+const ng = require("@angular/compiler-cli");
+const api_1 = require("@angular/compiler-cli/src/ngtsc/typecheck/api");
+const program_1 = require("@angular/compiler-cli/src/ngtsc/program");
+const ts = require("typescript");
+const log = require("../utils/log");
+const cache_compiler_host_1 = require("./cache-compiler-host");
+const nodes_1 = require("../ng-package/nodes");
+const ngcc_transform_compiler_host_1 = require("../ts/ngcc-transform-compiler-host");
+async function compileSourceFiles(graph, tsConfig, moduleResolutionCache, extraOptions, stylesheetProcessor, ngccProcessor, watch) {
+    log.debug(`ngc (v${ng.VERSION.full})`);
+    const tsConfigOptions = { ...tsConfig.options, ...extraOptions };
+    const entryPoint = graph.find(nodes_1.isEntryPointInProgress());
+    const tsCompilerHost = ngcc_transform_compiler_host_1.ngccTransformCompilerHost(cache_compiler_host_1.cacheCompilerHost(graph, entryPoint, tsConfigOptions, moduleResolutionCache, stylesheetProcessor), tsConfigOptions, ngccProcessor, moduleResolutionCache);
+    const cache = entryPoint.cache;
+    const sourceFileCache = cache.sourcesFileCache;
+    // Create the Angular specific program that contains the Angular compiler
+    const angularProgram = new program_1.NgtscProgram(tsConfig.rootNames, tsConfigOptions, tsCompilerHost, cache.oldNgtscProgram);
+    const angularCompiler = angularProgram.compiler;
+    const { ignoreForDiagnostics, ignoreForEmit } = angularCompiler;
+    // SourceFile versions are required for builder programs.
+    // The wrapped host inside NgtscProgram adds additional files that will not have versions.
+    const typeScriptProgram = angularProgram.getTsProgram();
+    cache_compiler_host_1.augmentProgramWithVersioning(typeScriptProgram);
+    let builder;
+    if (watch) {
+        builder = cache.oldBuilder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(typeScriptProgram, tsCompilerHost, cache.oldBuilder);
+        cache.oldNgtscProgram = angularProgram;
+    }
+    else {
+        // When not in watch mode, the startup cost of the incremental analysis can be avoided by
+        // using an abstract builder that only wraps a TypeScript program.
+        builder = ts.createAbstractBuilder(typeScriptProgram, tsCompilerHost);
+    }
+    // Update semantic diagnostics cache
+    const affectedFiles = new Set();
+    // Analyze affected files when in watch mode for incremental type checking
+    if ('getSemanticDiagnosticsOfNextAffectedFile' in builder) {
+        while (true) {
+            const result = builder.getSemanticDiagnosticsOfNextAffectedFile(undefined, sourceFile => {
+                // If the affected file is a TTC shim, add the shim's original source file.
+                // This ensures that changes that affect TTC are typechecked even when the changes
+                // are otherwise unrelated from a TS perspective and do not result in Ivy codegen changes.
+                // For example, changing @Input property types of a directive used in another component's
+                // template.
+                if (ignoreForDiagnostics.has(sourceFile) && sourceFile.fileName.endsWith('.ngtypecheck.ts')) {
+                    // This file name conversion relies on internal compiler logic and should be converted
+                    // to an official method when available. 15 is length of `.ngtypecheck.ts`
+                    const originalFilename = sourceFile.fileName.slice(0, -15) + '.ts';
+                    const originalSourceFile = builder.getSourceFile(originalFilename);
+                    if (originalSourceFile) {
+                        affectedFiles.add(originalSourceFile);
+                    }
+                    return true;
+                }
+                return false;
+            });
+            if (!result) {
+                break;
+            }
+            affectedFiles.add(result.affected);
+        }
+    }
+    // Collect program level diagnostics
+    const allDiagnostics = [
+        ...angularCompiler.getOptionDiagnostics(),
+        ...builder.getOptionsDiagnostics(),
+        ...builder.getGlobalDiagnostics(),
+    ];
+    // Required to support asynchronous resource loading
+    // Must be done before creating transformers or getting template diagnostics
+    await angularCompiler.analyzeAsync();
+    // Collect source file specific diagnostics
+    for (const sourceFile of builder.getSourceFiles()) {
+        if (!ignoreForDiagnostics.has(sourceFile)) {
+            allDiagnostics.push(...builder.getSyntacticDiagnostics(sourceFile), ...builder.getSemanticDiagnostics(sourceFile));
+        }
+        if (sourceFile.isDeclarationFile) {
+            continue;
+        }
+        // Collect sources that are required to be emitted
+        if (!ignoreForEmit.has(sourceFile) && !angularCompiler.incrementalDriver.safeToSkipEmit(sourceFile)) {
+            // If required to emit, diagnostics may have also changed
+            if (!ignoreForDiagnostics.has(sourceFile)) {
+                affectedFiles.add(sourceFile);
+            }
+        }
+        else if (sourceFileCache && !affectedFiles.has(sourceFile) && !ignoreForDiagnostics.has(sourceFile)) {
+            // Use cached Angular diagnostics for unchanged and unaffected files
+            const angularDiagnostics = sourceFileCache.getAngularDiagnostics(sourceFile);
+            if (angularDiagnostics === null || angularDiagnostics === void 0 ? void 0 : angularDiagnostics.length) {
+                allDiagnostics.push(...angularDiagnostics);
+            }
+        }
+    }
+    // Collect new Angular diagnostics for files affected by changes
+    for (const affectedFile of affectedFiles) {
+        const angularDiagnostics = angularCompiler.getDiagnosticsForFile(affectedFile, api_1.OptimizeFor.WholeProgram);
+        allDiagnostics.push(...angularDiagnostics);
+        sourceFileCache.updateAngularDiagnostics(affectedFile, angularDiagnostics);
+    }
+    // if we have an error we don't want to transpile.
+    const exitCode = ng.exitCodeFromResult(allDiagnostics);
+    const formattedDiagnostics = ng.formatDiagnostics(allDiagnostics);
+    if (exitCode === 0) {
+        if (formattedDiagnostics.length) {
+            log.msg(formattedDiagnostics);
+        }
+        const transformers = angularCompiler.prepareEmit().transformers;
+        for (const sourceFile of builder.getSourceFiles()) {
+            if (!ignoreForEmit.has(sourceFile)) {
+                builder.emit(sourceFile, undefined, undefined, undefined, transformers);
+            }
+        }
+    }
+    else {
+        throw new Error(formattedDiagnostics);
+    }
+}
+exports.compileSourceFiles = compileSourceFiles;
+//# sourceMappingURL=compile-source-files.js.map

package/lib/ivy/compile-source-files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../src/lib/ivy/compile-source-files.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ng from '@angular/compiler-cli';\nimport { OptimizeFor } from '@angular/compiler-cli/src/ngtsc/typecheck/api';\nimport { NgtscProgram } from '@angular/compiler-cli/src/ngtsc/program';\nimport * as ts from 'typescript';\nimport * as log from '../utils/log';\nimport * as ivy from '../ivy';\nimport { augmentProgramWithVersioning, cacheCompilerHost } from './cache-compiler-host';\nimport { BuildGraph } from '../graph/build-graph';\nimport { EntryPointNode, isEntryPointInProgress } from '../ng-package/nodes';\nimport { NgccProcessor } from '../ngc/ngcc-processor';\nimport { ngccTransformCompilerHost } from '../ts/ngcc-transform-compiler-host';\n\nexport async function compileSourceFiles(\n  graph: BuildGraph,\n  tsConfig: ng.ParsedConfiguration,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  extraOptions?: Partial<ng.CompilerOptions>,\n  stylesheetProcessor?: ivy.StylesheetProcessor,\n  ngccProcessor?: NgccProcessor,\n  watch?: boolean,\n) {\n  log.debug(`ngc (v${ng.VERSION.full})`);\n\n  const tsConfigOptions: ng.CompilerOptions = { ...tsConfig.options, ...extraOptions };\n  const entryPoint: EntryPointNode = graph.find(isEntryPointInProgress());\n\n  const tsCompilerHost = ngccTransformCompilerHost(\n    cacheCompilerHost(graph, entryPoint, tsConfigOptions, moduleResolutionCache, stylesheetProcessor),\n    tsConfigOptions,\n    ngccProcessor,\n    moduleResolutionCache,\n  );\n\n  const cache = entryPoint.cache;\n  const sourceFileCache = cache.sourcesFileCache;\n\n  // Create the Angular specific program that contains the Angular compiler\n  const angularProgram = new NgtscProgram(tsConfig.rootNames, tsConfigOptions, tsCompilerHost, cache.oldNgtscProgram);\n\n  const angularCompiler = angularProgram.compiler;\n  const { ignoreForDiagnostics, ignoreForEmit } = angularCompiler;\n\n  // SourceFile versions are required for builder programs.\n  // The wrapped host inside NgtscProgram adds additional files that will not have versions.\n  const typeScriptProgram = angularProgram.getTsProgram();\n  augmentProgramWithVersioning(typeScriptProgram);\n\n  let builder: ts.BuilderProgram | ts.EmitAndSemanticDiagnosticsBuilderProgram;\n  if (watch) {\n    builder = cache.oldBuilder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(\n      typeScriptProgram,\n      tsCompilerHost,\n      cache.oldBuilder,\n    );\n    cache.oldNgtscProgram = angularProgram;\n  } else {\n    // When not in watch mode, the startup cost of the incremental analysis can be avoided by\n    // using an abstract builder that only wraps a TypeScript program.\n    builder = ts.createAbstractBuilder(typeScriptProgram, tsCompilerHost);\n  }\n\n  // Update semantic diagnostics cache\n  const affectedFiles = new Set<ts.SourceFile>();\n\n  // Analyze affected files when in watch mode for incremental type checking\n  if ('getSemanticDiagnosticsOfNextAffectedFile' in builder) {\n    while (true) {\n      const result = builder.getSemanticDiagnosticsOfNextAffectedFile(undefined, sourceFile => {\n        // If the affected file is a TTC shim, add the shim's original source file.\n        // This ensures that changes that affect TTC are typechecked even when the changes\n        // are otherwise unrelated from a TS perspective and do not result in Ivy codegen changes.\n        // For example, changing @Input property types of a directive used in another component's\n        // template.\n        if (ignoreForDiagnostics.has(sourceFile) && sourceFile.fileName.endsWith('.ngtypecheck.ts')) {\n          // This file name conversion relies on internal compiler logic and should be converted\n          // to an official method when available. 15 is length of `.ngtypecheck.ts`\n          const originalFilename = sourceFile.fileName.slice(0, -15) + '.ts';\n          const originalSourceFile = builder.getSourceFile(originalFilename);\n          if (originalSourceFile) {\n            affectedFiles.add(originalSourceFile);\n          }\n\n          return true;\n        }\n\n        return false;\n      });\n\n      if (!result) {\n        break;\n      }\n\n      affectedFiles.add(result.affected as ts.SourceFile);\n    }\n  }\n\n  // Collect program level diagnostics\n  const allDiagnostics: ts.Diagnostic[] = [\n    ...angularCompiler.getOptionDiagnostics(),\n    ...builder.getOptionsDiagnostics(),\n    ...builder.getGlobalDiagnostics(),\n  ];\n\n  // Required to support asynchronous resource loading\n  // Must be done before creating transformers or getting template diagnostics\n  await angularCompiler.analyzeAsync();\n\n  // Collect source file specific diagnostics\n  for (const sourceFile of builder.getSourceFiles()) {\n    if (!ignoreForDiagnostics.has(sourceFile)) {\n      allDiagnostics.push(\n        ...builder.getSyntacticDiagnostics(sourceFile),\n        ...builder.getSemanticDiagnostics(sourceFile),\n      );\n    }\n\n    if (sourceFile.isDeclarationFile) {\n      continue;\n    }\n\n    // Collect sources that are required to be emitted\n    if (!ignoreForEmit.has(sourceFile) && !angularCompiler.incrementalDriver.safeToSkipEmit(sourceFile)) {\n      // If required to emit, diagnostics may have also changed\n      if (!ignoreForDiagnostics.has(sourceFile)) {\n        affectedFiles.add(sourceFile);\n      }\n    } else if (sourceFileCache && !affectedFiles.has(sourceFile) && !ignoreForDiagnostics.has(sourceFile)) {\n      // Use cached Angular diagnostics for unchanged and unaffected files\n      const angularDiagnostics = sourceFileCache.getAngularDiagnostics(sourceFile);\n      if (angularDiagnostics?.length) {\n        allDiagnostics.push(...angularDiagnostics);\n      }\n    }\n  }\n\n  // Collect new Angular diagnostics for files affected by changes\n  for (const affectedFile of affectedFiles) {\n    const angularDiagnostics = angularCompiler.getDiagnosticsForFile(affectedFile, OptimizeFor.WholeProgram);\n\n    allDiagnostics.push(...angularDiagnostics);\n    sourceFileCache.updateAngularDiagnostics(affectedFile, angularDiagnostics);\n  }\n\n  // if we have an error we don't want to transpile.\n  const exitCode = ng.exitCodeFromResult(allDiagnostics);\n  const formattedDiagnostics = ng.formatDiagnostics(allDiagnostics);\n  if (exitCode === 0) {\n    if (formattedDiagnostics.length) {\n      log.msg(formattedDiagnostics);\n    }\n\n    const transformers = angularCompiler.prepareEmit().transformers;\n    for (const sourceFile of builder.getSourceFiles()) {\n      if (!ignoreForEmit.has(sourceFile)) {\n        builder.emit(sourceFile, undefined, undefined, undefined, transformers);\n      }\n    }\n  } else {\n    throw new Error(formattedDiagnostics);\n  }\n}\n"]}

package/lib/ivy/index.d.ts

@@ -0,0 +1,2 @@
+export { compileSourceFiles } from './compile-source-files';
+export { StylesheetProcessor } from './styles/stylesheet-processor';

package/lib/ivy/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StylesheetProcessor = exports.compileSourceFiles = void 0;
+var compile_source_files_1 = require("./compile-source-files");
+Object.defineProperty(exports, "compileSourceFiles", { enumerable: true, get: function () { return compile_source_files_1.compileSourceFiles; } });
+var stylesheet_processor_1 = require("./styles/stylesheet-processor");
+Object.defineProperty(exports, "StylesheetProcessor", { enumerable: true, get: function () { return stylesheet_processor_1.StylesheetProcessor; } });
+//# sourceMappingURL=index.js.map

package/lib/ivy/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/ivy/index.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAC3B,sEAAoE;AAA3D,2HAAA,mBAAmB,OAAA","sourcesContent":["export { compileSourceFiles } from './compile-source-files';\nexport { StylesheetProcessor } from './styles/stylesheet-processor';\n"]}

package/lib/ivy/styles/stylesheet-processor.d.ts

@@ -0,0 +1,20 @@
+export declare enum CssUrl {
+    inline = "inline",
+    none = "none"
+}
+export interface Result {
+    css: string;
+    warnings: string[];
+    error?: string;
+}
+export declare class StylesheetProcessor {
+    private readonly basePath;
+    private readonly cssUrl?;
+    private readonly styleIncludePaths?;
+    private browserslistData;
+    private postCssProcessor;
+    constructor(basePath: string, cssUrl?: CssUrl, styleIncludePaths?: string[]);
+    process(filePath: string): Promise<string>;
+    private createPostCssPlugins;
+    private renderCss;
+}

package/lib/ivy/styles/stylesheet-processor.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StylesheetProcessor = exports.CssUrl = void 0;
+const browserslist = require("browserslist");
+const findCacheDirectory = require("find-cache-dir");
+const os_1 = require("os");
+const cacache = require("cacache");
+const postcss_1 = require("postcss");
+const postcssUrl = require("postcss-url");
+const cssnano = require("cssnano");
+const postcssPresetEnv = require("postcss-preset-env");
+const log = require("../../utils/log");
+const fs_1 = require("../../utils/fs");
+const crypto_1 = require("crypto");
+const path_1 = require("path");
+var CssUrl;
+(function (CssUrl) {
+    CssUrl["inline"] = "inline";
+    CssUrl["none"] = "none";
+})(CssUrl = exports.CssUrl || (exports.CssUrl = {}));
+const cachePath = findCacheDirectory({ name: 'ng-packagr-styles' }) || os_1.tmpdir();
+let ngPackagrVersion;
+try {
+    ngPackagrVersion = require('../../../package.json').version;
+}
+catch {
+    // dev path
+    ngPackagrVersion = require('../../../../package.json').version;
+}
+class StylesheetProcessor {
+    constructor(basePath, cssUrl, styleIncludePaths) {
+        this.basePath = basePath;
+        this.cssUrl = cssUrl;
+        this.styleIncludePaths = styleIncludePaths;
+        log.debug(`determine browserslist for ${this.basePath}`);
+        this.browserslistData = browserslist(undefined, { path: this.basePath });
+        this.postCssProcessor = this.createPostCssPlugins();
+    }
+    async process(filePath) {
+        const content = await fs_1.readFile(filePath, 'utf8');
+        let key;
+        if (!content.includes('@import') && !content.includes('@use')) {
+            // No transitive deps, we can cache more aggressively.
+            key = generateKey(content, this.browserslistData);
+            const result = await readCacheEntry(cachePath, key);
+            if (result) {
+                result.warnings.forEach(msg => log.warn(msg));
+                return result.css;
+            }
+        }
+        // Render pre-processor language (sass, styl, less)
+        const renderedCss = await this.renderCss(filePath, content);
+        // We cannot cache CSS re-rendering phase, because a transitive dependency via (@import) can case different CSS output.
+        // Example a change in a mixin or SCSS variable.
+        if (!key) {
+            key = generateKey(renderedCss, this.browserslistData);
+        }
+        const cachedResult = await readCacheEntry(cachePath, key);
+        if (cachedResult) {
+            cachedResult.warnings.forEach(msg => log.warn(msg));
+            return cachedResult.css;
+        }
+        // Render postcss (autoprefixing and friends)
+        const result = await this.postCssProcessor.process(renderedCss, {
+            from: filePath,
+            to: filePath.replace(path_1.extname(filePath), '.css'),
+        });
+        const warnings = result.warnings().map(w => w.toString());
+        // Add to cache
+        await cacache.put(cachePath, key, JSON.stringify({
+            css: result.css,
+            warnings,
+        }));
+        warnings.forEach(msg => log.warn(msg));
+        return result.css;
+    }
+    createPostCssPlugins() {
+        const postCssPlugins = [];
+        if (this.cssUrl !== CssUrl.none) {
+            postCssPlugins.push(postcssUrl({ url: this.cssUrl }));
+        }
+        postCssPlugins.push(postcssPresetEnv({
+            browsers: this.browserslistData,
+            autoprefixer: true,
+            stage: 3,
+        }), cssnano({
+            preset: [
+                'default',
+                {
+                    // Disable SVG optimizations, as this can cause optimizations which are not compatible in all browsers.
+                    svgo: false,
+                    // Disable `calc` optimizations, due to several issues. #16910, #16875, #17890
+                    calc: false,
+                    // Disable CSS rules sorted due to several issues #20693, https://github.com/ionic-team/ionic-framework/issues/23266 and https://github.com/cssnano/cssnano/issues/1054
+                    cssDeclarationSorter: false,
+                },
+            ],
+        }));
+        return postcss_1.default(postCssPlugins);
+    }
+    async renderCss(filePath, css) {
+        const ext = path_1.extname(filePath);
+        switch (ext) {
+            case '.sass':
+            case '.scss': {
+                /*
+                 * Please be aware of the few differences in behaviour https://github.com/sass/dart-sass/blob/master/README.md#behavioral-differences-from-ruby-sass
+                 * By default `npm install` will install sass.
+                 * To use node-sass you need to use:
+                 *   Npm:
+                 *     `npm install node-sass --save-dev`
+                 *   Yarn:
+                 *     `yarn add node-sass --dev`
+                 */
+                let sassCompiler;
+                try {
+                    sassCompiler = require('node-sass'); // Check if node-sass is explicitly included.
+                }
+                catch {
+                    sassCompiler = await Promise.resolve().then(() => require('sass'));
+                }
+                return sassCompiler
+                    .renderSync({
+                    file: filePath,
+                    data: css,
+                    indentedSyntax: '.sass' === ext,
+                    importer: await Promise.resolve().then(() => require('node-sass-tilde-importer')),
+                    includePaths: this.styleIncludePaths,
+                })
+                    .css.toString();
+            }
+            case '.less': {
+                const { css: content } = await (await Promise.resolve().then(() => require('less'))).render(css, {
+                    filename: filePath,
+                    javascriptEnabled: true,
+                    paths: this.styleIncludePaths,
+                });
+                return content;
+            }
+            case '.styl':
+            case '.stylus': {
+                const stylus = await Promise.resolve().then(() => require('stylus'));
+                return (stylus(css)
+                    // add paths for resolve
+                    .set('paths', [this.basePath, '.', ...this.styleIncludePaths, 'node_modules'])
+                    // add support for resolving plugins from node_modules
+                    .set('filename', filePath)
+                    // turn on url resolver in stylus, same as flag --resolve-url
+                    .set('resolve url', true)
+                    .define('url', stylus.resolver(undefined))
+                    .render());
+            }
+            case '.css':
+            default:
+                return css;
+        }
+    }
+}
+exports.StylesheetProcessor = StylesheetProcessor;
+function generateKey(content, browserslistData) {
+    return crypto_1.createHash('sha1').update(ngPackagrVersion).update(content).update(browserslistData.join('')).digest('base64');
+}
+async function readCacheEntry(cachePath, key) {
+    const entry = await cacache.get.info(cachePath, key);
+    if (entry) {
+        return JSON.parse(await fs_1.readFile(entry.path, 'utf8'));
+    }
+    return undefined;
+}
+//# sourceMappingURL=stylesheet-processor.js.map

package/lib/ivy/styles/stylesheet-processor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../src/lib/ivy/styles/stylesheet-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import * as browserslist from 'browserslist';\nimport * as findCacheDirectory from 'find-cache-dir';\nimport { tmpdir } from 'os';\nimport * as cacache from 'cacache';\nimport postcss from 'postcss';\nimport * as postcssUrl from 'postcss-url';\nimport * as cssnano from 'cssnano';\nimport * as postcssPresetEnv from 'postcss-preset-env';\nimport * as log from '../../utils/log';\nimport { readFile } from '../../utils/fs';\nimport { createHash } from 'crypto';\nimport { extname } from 'path';\n\nexport enum CssUrl {\n  inline = 'inline',\n  none = 'none',\n}\n\nexport interface Result {\n  css: string;\n  warnings: string[];\n  error?: string;\n}\n\nconst cachePath = findCacheDirectory({ name: 'ng-packagr-styles' }) || tmpdir();\nlet ngPackagrVersion: string | undefined;\ntry {\n  ngPackagrVersion = require('../../../package.json').version;\n} catch {\n  // dev path\n  ngPackagrVersion = require('../../../../package.json').version;\n}\n\nexport class StylesheetProcessor {\n  private browserslistData: string[];\n  private postCssProcessor: ReturnType<typeof postcss>;\n\n  constructor(\n    private readonly basePath: string,\n    private readonly cssUrl?: CssUrl,\n    private readonly styleIncludePaths?: string[],\n  ) {\n    log.debug(`determine browserslist for ${this.basePath}`);\n    this.browserslistData = browserslist(undefined, { path: this.basePath });\n    this.postCssProcessor = this.createPostCssPlugins();\n  }\n\n  async process(filePath: string): Promise<string> {\n    const content = await readFile(filePath, 'utf8');\n    let key: string | undefined;\n\n    if (!content.includes('@import') && !content.includes('@use')) {\n      // No transitive deps, we can cache more aggressively.\n      key = generateKey(content, this.browserslistData);\n      const result = await readCacheEntry(cachePath, key);\n      if (result) {\n        result.warnings.forEach(msg => log.warn(msg));\n        return result.css;\n      }\n    }\n\n    // Render pre-processor language (sass, styl, less)\n    const renderedCss = await this.renderCss(filePath, content);\n\n    // We cannot cache CSS re-rendering phase, because a transitive dependency via (@import) can case different CSS output.\n    // Example a change in a mixin or SCSS variable.\n    if (!key) {\n      key = generateKey(renderedCss, this.browserslistData);\n    }\n\n    const cachedResult = await readCacheEntry(cachePath, key);\n    if (cachedResult) {\n      cachedResult.warnings.forEach(msg => log.warn(msg));\n      return cachedResult.css;\n    }\n\n    // Render postcss (autoprefixing and friends)\n    const result = await this.postCssProcessor.process(renderedCss, {\n      from: filePath,\n      to: filePath.replace(extname(filePath), '.css'),\n    });\n\n    const warnings = result.warnings().map(w => w.toString());\n    // Add to cache\n    await cacache.put(\n      cachePath,\n      key,\n      JSON.stringify({\n        css: result.css,\n        warnings,\n      }),\n    );\n\n    warnings.forEach(msg => log.warn(msg));\n    return result.css;\n  }\n\n  private createPostCssPlugins(): ReturnType<typeof postcss> {\n    const postCssPlugins = [];\n    if (this.cssUrl !== CssUrl.none) {\n      postCssPlugins.push(postcssUrl({ url: this.cssUrl }));\n    }\n\n    postCssPlugins.push(\n      postcssPresetEnv({\n        browsers: this.browserslistData,\n        autoprefixer: true,\n        stage: 3,\n      }),\n      cssnano({\n        preset: [\n          'default',\n          {\n            // Disable SVG optimizations, as this can cause optimizations which are not compatible in all browsers.\n            svgo: false,\n            // Disable `calc` optimizations, due to several issues. #16910, #16875, #17890\n            calc: false,\n            // Disable CSS rules sorted due to several issues #20693, https://github.com/ionic-team/ionic-framework/issues/23266 and https://github.com/cssnano/cssnano/issues/1054\n            cssDeclarationSorter: false,\n          },\n        ],\n      }),\n    );\n\n    return postcss(postCssPlugins);\n  }\n\n  private async renderCss(filePath: string, css: string): Promise<string> {\n    const ext = extname(filePath);\n\n    switch (ext) {\n      case '.sass':\n      case '.scss': {\n        /*\n         * Please be aware of the few differences in behaviour https://github.com/sass/dart-sass/blob/master/README.md#behavioral-differences-from-ruby-sass\n         * By default `npm install` will install sass.\n         * To use node-sass you need to use:\n         *   Npm:\n         *     `npm install node-sass --save-dev`\n         *   Yarn:\n         *     `yarn add node-sass --dev`\n         */\n        let sassCompiler: any | undefined;\n        try {\n          sassCompiler = require('node-sass'); // Check if node-sass is explicitly included.\n        } catch {\n          sassCompiler = await import('sass');\n        }\n\n        return sassCompiler\n          .renderSync({\n            file: filePath,\n            data: css,\n            indentedSyntax: '.sass' === ext,\n            importer: await import('node-sass-tilde-importer'),\n            includePaths: this.styleIncludePaths,\n          })\n          .css.toString();\n      }\n      case '.less': {\n        const { css: content } = await (\n          await import('less')\n        ).render(css, {\n          filename: filePath,\n          javascriptEnabled: true,\n          paths: this.styleIncludePaths,\n        });\n\n        return content;\n      }\n      case '.styl':\n      case '.stylus': {\n        const stylus = await import('stylus');\n\n        return (\n          stylus(css)\n            // add paths for resolve\n            .set('paths', [this.basePath, '.', ...this.styleIncludePaths, 'node_modules'])\n            // add support for resolving plugins from node_modules\n            .set('filename', filePath)\n            // turn on url resolver in stylus, same as flag --resolve-url\n            .set('resolve url', true)\n            .define('url', stylus.resolver(undefined))\n            .render()\n        );\n      }\n      case '.css':\n      default:\n        return css;\n    }\n  }\n}\n\nfunction generateKey(content: string, browserslistData: string[]): string {\n  return createHash('sha1').update(ngPackagrVersion).update(content).update(browserslistData.join('')).digest('base64');\n}\n\nasync function readCacheEntry(cachePath: string, key: string): Promise<Result | undefined> {\n  const entry = await cacache.get.info(cachePath, key);\n  if (entry) {\n    return JSON.parse(await readFile(entry.path, 'utf8'));\n  }\n\n  return undefined;\n}\n"]}

package/lib/ng-package/entry-point/compile-ngc.di.js

@@ -5,11 +5,15 @@ const injection_js_1 = require("injection-js");
 const transform_di_1 = require("../../graph/transform.di");
 const compile_ngc_transform_1 = require("./compile-ngc.transform");
 const stylesheet_processor_di_1 = require("../../styles/stylesheet-processor.di");
+const options_di_1 = require("../options.di");
 exports.COMPILE_NGC_TOKEN = new injection_js_1.InjectionToken(`ng.v5.compileNgcTransform`);
 exports.COMPILE_NGC_TRANSFORM = transform_di_1.provideTransform({
     provide: exports.COMPILE_NGC_TOKEN,
     useFactory: compile_ngc_transform_1.compileNgcTransformFactory,
-    deps: [stylesheet_processor_di_1.STYLESHEET_PROCESSOR_TOKEN],
+    deps: [
+        stylesheet_processor_di_1.STYLESHEET_PROCESSOR_TOKEN,
+        options_di_1.OPTIONS_TOKEN,
+    ],
 });
 exports.COMPILE_NGC_PROVIDERS = [stylesheet_processor_di_1.STYLESHEET_PROCESSOR, exports.COMPILE_NGC_TRANSFORM];
 //# sourceMappingURL=compile-ngc.di.js.map

package/lib/ng-package/entry-point/compile-ngc.di.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-ngc.di.js","sourceRoot":"","sources":["../../../../src/lib/ng-package/entry-point/compile-ngc.di.ts"],"names":[],"mappings":";;;AAAA,+CAAwD;AAExD,2DAA+E;AAC/E,mEAAqE;AACrE,kFAAwG;AAE3F,QAAA,iBAAiB,GAAG,IAAI,6BAAc,CAAY,2BAA2B,CAAC,CAAC;AAE/E,QAAA,qBAAqB,GAAsB,+BAAgB,CAAC;IACvE,OAAO,EAAE,yBAAiB;IAC1B,UAAU,EAAE,kDAA0B;IACtC,IAAI,EAAE,CAAC,oDAA0B,CAAC;CACnC,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAe,CAAC,8CAAoB,EAAE,6BAAqB,CAAC,CAAC","sourcesContent":["import { InjectionToken, Provider } from 'injection-js';\nimport { Transform } from '../../graph/transform';\nimport { TransformProvider, provideTransform } from '../../graph/transform.di';\nimport { compileNgcTransformFactory } from './compile-ngc.transform';\nimport { STYLESHEET_PROCESSOR_TOKEN, STYLESHEET_PROCESSOR } from '../../styles/stylesheet-processor.di';\n\nexport const COMPILE_NGC_TOKEN = new InjectionToken<Transform>(`ng.v5.compileNgcTransform`);\n\nexport const COMPILE_NGC_TRANSFORM: TransformProvider = provideTransform({\n  provide: COMPILE_NGC_TOKEN,\n  useFactory: compileNgcTransformFactory,\n  deps: [STYLESHEET_PROCESSOR_TOKEN],\n});\n\nexport const COMPILE_NGC_PROVIDERS: Provider[] = [STYLESHEET_PROCESSOR, COMPILE_NGC_TRANSFORM];\n"]}
+{"version":3,"file":"compile-ngc.di.js","sourceRoot":"","sources":["../../../../src/lib/ng-package/entry-point/compile-ngc.di.ts"],"names":[],"mappings":";;;AAAA,+CAAwD;AAExD,2DAA+E;AAC/E,mEAAqE;AACrE,kFAAwG;AACxG,8CAA8C;AAEjC,QAAA,iBAAiB,GAAG,IAAI,6BAAc,CAAY,2BAA2B,CAAC,CAAC;AAE/E,QAAA,qBAAqB,GAAsB,+BAAgB,CAAC;IACvE,OAAO,EAAE,yBAAiB;IAC1B,UAAU,EAAE,kDAA0B;IACtC,IAAI,EAAE;QACJ,oDAA0B;QAC1B,0BAAa;KACd;CACF,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAe,CAAC,8CAAoB,EAAE,6BAAqB,CAAC,CAAC","sourcesContent":["import { InjectionToken, Provider } from 'injection-js';\nimport { Transform } from '../../graph/transform';\nimport { TransformProvider, provideTransform } from '../../graph/transform.di';\nimport { compileNgcTransformFactory } from './compile-ngc.transform';\nimport { STYLESHEET_PROCESSOR_TOKEN, STYLESHEET_PROCESSOR } from '../../styles/stylesheet-processor.di';\nimport { OPTIONS_TOKEN } from '../options.di';\n\nexport const COMPILE_NGC_TOKEN = new InjectionToken<Transform>(`ng.v5.compileNgcTransform`);\n\nexport const COMPILE_NGC_TRANSFORM: TransformProvider = provideTransform({\n  provide: COMPILE_NGC_TOKEN,\n  useFactory: compileNgcTransformFactory,\n  deps: [\n    STYLESHEET_PROCESSOR_TOKEN,\n    OPTIONS_TOKEN,\n  ],\n});\n\nexport const COMPILE_NGC_PROVIDERS: Provider[] = [STYLESHEET_PROCESSOR, COMPILE_NGC_TRANSFORM];\n"]}

package/lib/ng-package/entry-point/compile-ngc.transform.d.ts

@@ -1,3 +1,4 @@
 import { Transform } from '../../graph/transform';
 import { StylesheetProcessor as StylesheetProcessorClass } from '../../styles/stylesheet-processor';
-export declare const compileNgcTransformFactory: (StylesheetProcessor: typeof StylesheetProcessorClass) => Transform;
+import { NgPackagrOptions } from '../options.di';
+export declare const compileNgcTransformFactory: (StylesheetProcessor: typeof StylesheetProcessorClass, options: NgPackagrOptions) => Transform;

package/lib/ng-package/entry-point/compile-ngc.transform.js

@@ -7,14 +7,20 @@ const ora = require("ora");
 const transform_1 = require("../../graph/transform");
 const compile_source_files_1 = require("../../ngc/compile-source-files");
 const ngcc_processor_1 = require("../../ngc/ngcc-processor");
+const ivy = require("../../ivy");
 const tsconfig_1 = require("../../ts/tsconfig");
 const nodes_1 = require("../nodes");
-const compileNgcTransformFactory = (StylesheetProcessor) => {
+function isEnabled(variable) {
+    return typeof variable === 'string' && (variable === '1' || variable.toLowerCase() === 'true');
+}
+const compileNgcTransformFactory = (StylesheetProcessor, options) => {
     return transform_1.transformFromPromise(async (graph) => {
+        var _a, _b;
+        var _c, _d;
         const spinner = ora({
             hideCursor: false,
             discardStdin: false,
-        }).start(`Compiling TypeScript sources through NGC`);
+        });
         try {
             const entryPoint = graph.find(nodes_1.isEntryPointInProgress());
             const entryPoints = graph.filter(nodes_1.isEntryPoint);
@@ -23,21 +29,37 @@ const compileNgcTransformFactory = (StylesheetProcessor) => {
             // Compile TypeScript sources
             const { esm2015, declarations } = entryPoint.data.destinationFiles;
             const { basePath, cssUrl, styleIncludePaths } = entryPoint.data.entryPoint;
-            const { moduleResolutionCache, ngccProcessingCache, stylesheetProcessor = new StylesheetProcessor(basePath, cssUrl, styleIncludePaths) } = entryPoint.cache;
-            entryPoint.cache.stylesheetProcessor = stylesheetProcessor;
-            const ngccProcessor = tsConfig.options.enableIvy
-                ? new ngcc_processor_1.NgccProcessor(ngccProcessingCache, tsConfig.project, tsConfig.options, entryPoints)
-                : undefined;
-            if (ngccProcessor && !entryPoint.data.entryPoint.isSecondaryEntryPoint) {
-                // Only run the async version of NGCC during the primary entrypoint processing.
-                await ngccProcessor.process();
+            const { moduleResolutionCache, ngccProcessingCache } = entryPoint.cache;
+            let ngccProcessor;
+            if (tsConfig.options.enableIvy !== false) {
+                spinner.start(`Compiling with Angular sources in Ivy ${tsConfig.options.compilationMode || 'full'} compilation mode.`);
+                ngccProcessor = new ngcc_processor_1.NgccProcessor(ngccProcessingCache, tsConfig.project, tsConfig.options, entryPoints);
+                if (!entryPoint.data.entryPoint.isSecondaryEntryPoint) {
+                    // Only run the async version of NGCC during the primary entrypoint processing.
+                    await ngccProcessor.process();
+                }
+            }
+            else {
+                spinner.start(`Compiling with Angular in legacy View Engine compilation mode.`);
+            }
+            if (tsConfig.options.enableIvy !== false && !isEnabled(process.env['NG_BUILD_LIB_LEGACY'])) {
+                (_a = (_c = entryPoint.cache).stylesheetProcessor) !== null && _a !== void 0 ? _a : (_c.stylesheetProcessor = new ivy.StylesheetProcessor(basePath, cssUrl, styleIncludePaths));
+                await ivy.compileSourceFiles(graph, tsConfig, moduleResolutionCache, {
+                    outDir: path.dirname(esm2015),
+                    declarationDir: path.dirname(declarations),
+                    declaration: true,
+                    target: ts.ScriptTarget.ES2015,
+                }, entryPoint.cache.stylesheetProcessor, ngccProcessor, options.watch);
+            }
+            else {
+                (_b = (_d = entryPoint.cache).stylesheetProcessor) !== null && _b !== void 0 ? _b : (_d.stylesheetProcessor = new StylesheetProcessor(basePath, cssUrl, styleIncludePaths));
+                await compile_source_files_1.compileSourceFiles(graph, tsConfig, moduleResolutionCache, entryPoint.cache.stylesheetProcessor, {
+                    outDir: path.dirname(esm2015),
+                    declarationDir: path.dirname(declarations),
+                    declaration: true,
+                    target: ts.ScriptTarget.ES2015,
+                }, ngccProcessor);
             }
-            await compile_source_files_1.compileSourceFiles(graph, tsConfig, moduleResolutionCache, stylesheetProcessor, {
-                outDir: path.dirname(esm2015),
-                declarationDir: path.dirname(declarations),
-                declaration: true,
-                target: ts.ScriptTarget.ES2015,
-            }, ngccProcessor);
         }
         catch (error) {
             spinner.fail();

package/lib/ng-package/entry-point/compile-ngc.transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-ngc.transform.js","sourceRoot":"","sources":["../../../../src/lib/ng-package/entry-point/compile-ngc.transform.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,iCAAiC;AACjC,2BAA2B;AAC3B,qDAAwE;AACxE,yEAAoE;AACpE,6DAAyD;AACzD,gDAAiE;AACjE,oCAAgF;AAGzE,MAAM,0BAA0B,GAAG,CAAC,mBAAoD,EAAa,EAAE;IAC5G,OAAO,gCAAoB,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACxC,MAAM,OAAO,GAAG,GAAG,CAAC;YAClB,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,KAAK;SACpB,CAAC,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAErD,IAAI;YACF,MAAM,UAAU,GAAmB,KAAK,CAAC,IAAI,CAAC,8BAAsB,EAAE,CAAC,CAAC;YACxE,MAAM,WAAW,GAAqB,KAAK,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAC;YACjE,sCAAsC;YACtC,MAAM,QAAQ,GAAG,uCAA4B,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAErF,6BAA6B;YAC7B,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC;YACnE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;YAC3E,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,mBAAmB,GAAG,IAAI,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC;YAC5J,UAAU,CAAC,KAAK,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;YAE3D,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS;gBAC9C,CAAC,CAAC,IAAI,8BAAa,CAAC,mBAAmB,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;gBACzF,CAAC,CAAC,SAAS,CAAC;YAEd,IAAI,aAAa,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE;gBACtE,+EAA+E;gBAC/E,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;aAC/B;YAED,MAAM,yCAAkB,CACtB,KAAK,EACL,QAAQ,EACR,qBAAqB,EACrB,mBAAmB,EACnB;gBACE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC7B,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;gBAC1C,WAAW,EAAE,IAAI;gBACjB,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM;aAC/B,EACD,aAAa,CACd,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,KAAK,CAAC;SACb;QAED,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAjDW,QAAA,0BAA0B,8BAiDrC","sourcesContent":["import * as path from 'path';\nimport * as ts from 'typescript';\nimport * as ora from 'ora';\nimport { Transform, transformFromPromise } from '../../graph/transform';\nimport { compileSourceFiles } from '../../ngc/compile-source-files';\nimport { NgccProcessor } from '../../ngc/ngcc-processor';\nimport { setDependenciesTsConfigPaths } from '../../ts/tsconfig';\nimport { isEntryPointInProgress, EntryPointNode, isEntryPoint } from '../nodes';\nimport { StylesheetProcessor as StylesheetProcessorClass } from '../../styles/stylesheet-processor';\n\nexport const compileNgcTransformFactory = (StylesheetProcessor: typeof StylesheetProcessorClass): Transform => {\n  return transformFromPromise(async graph => {\n    const spinner = ora({\n      hideCursor: false,\n      discardStdin: false,\n    }).start(`Compiling TypeScript sources through NGC`);\n\n    try {\n      const entryPoint: EntryPointNode = graph.find(isEntryPointInProgress());\n      const entryPoints: EntryPointNode[] = graph.filter(isEntryPoint);\n      // Add paths mappings for dependencies\n      const tsConfig = setDependenciesTsConfigPaths(entryPoint.data.tsConfig, entryPoints);\n\n      // Compile TypeScript sources\n      const { esm2015, declarations } = entryPoint.data.destinationFiles;\n      const { basePath, cssUrl, styleIncludePaths } = entryPoint.data.entryPoint;\n      const { moduleResolutionCache, ngccProcessingCache, stylesheetProcessor = new StylesheetProcessor(basePath, cssUrl, styleIncludePaths) } = entryPoint.cache;\n      entryPoint.cache.stylesheetProcessor = stylesheetProcessor;\n\n      const ngccProcessor = tsConfig.options.enableIvy\n        ? new NgccProcessor(ngccProcessingCache, tsConfig.project, tsConfig.options, entryPoints)\n        : undefined;\n\n      if (ngccProcessor && !entryPoint.data.entryPoint.isSecondaryEntryPoint) {\n        // Only run the async version of NGCC during the primary entrypoint processing.\n        await ngccProcessor.process();\n      }\n\n      await compileSourceFiles(\n        graph,\n        tsConfig,\n        moduleResolutionCache,\n        stylesheetProcessor,\n        {\n          outDir: path.dirname(esm2015),\n          declarationDir: path.dirname(declarations),\n          declaration: true,\n          target: ts.ScriptTarget.ES2015,\n        },\n        ngccProcessor,\n      );\n    } catch (error) {\n      spinner.fail();\n      throw error;\n    }\n\n    spinner.succeed();\n    return graph;\n  });\n};\n"]}
+{"version":3,"file":"compile-ngc.transform.js","sourceRoot":"","sources":["../../../../src/lib/ng-package/entry-point/compile-ngc.transform.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport * as ts from 'typescript';\nimport * as ora from 'ora';\nimport { Transform, transformFromPromise } from '../../graph/transform';\nimport { compileSourceFiles } from '../../ngc/compile-source-files';\nimport { NgccProcessor } from '../../ngc/ngcc-processor';\nimport * as ivy from '../../ivy';\nimport { setDependenciesTsConfigPaths } from '../../ts/tsconfig';\nimport { isEntryPointInProgress, EntryPointNode, isEntryPoint } from '../nodes';\nimport { StylesheetProcessor as StylesheetProcessorClass } from '../../styles/stylesheet-processor';\nimport { NgPackagrOptions } from '../options.di';\n\nfunction isEnabled(variable: string | undefined): variable is string {\n  return typeof variable === 'string' && (variable === '1' || variable.toLowerCase() === 'true');\n}\n\nexport const compileNgcTransformFactory = (\n  StylesheetProcessor: typeof StylesheetProcessorClass,\n  options: NgPackagrOptions,\n): Transform => {\n  return transformFromPromise(async graph => {\n    const spinner = ora({\n      hideCursor: false,\n      discardStdin: false,\n    });\n\n    try {\n      const entryPoint: EntryPointNode = graph.find(isEntryPointInProgress());\n      const entryPoints: EntryPointNode[] = graph.filter(isEntryPoint);\n      // Add paths mappings for dependencies\n      const tsConfig = setDependenciesTsConfigPaths(entryPoint.data.tsConfig, entryPoints);\n\n      // Compile TypeScript sources\n      const { esm2015, declarations } = entryPoint.data.destinationFiles;\n      const { basePath, cssUrl, styleIncludePaths } = entryPoint.data.entryPoint;\n      const { moduleResolutionCache, ngccProcessingCache } = entryPoint.cache;\n\n      let ngccProcessor: NgccProcessor | undefined;\n      if (tsConfig.options.enableIvy !== false) {\n        spinner.start(`Compiling with Angular sources in Ivy ${tsConfig.options.compilationMode || 'full'} compilation mode.`);\n        ngccProcessor = new NgccProcessor(ngccProcessingCache, tsConfig.project, tsConfig.options, entryPoints);\n        if (!entryPoint.data.entryPoint.isSecondaryEntryPoint) {\n          // Only run the async version of NGCC during the primary entrypoint processing.\n          await ngccProcessor.process();\n        }\n      } else {\n        spinner.start(`Compiling with Angular in legacy View Engine compilation mode.`);\n      }\n\n      if (tsConfig.options.enableIvy !== false && !isEnabled(process.env['NG_BUILD_LIB_LEGACY'])) {\n        entryPoint.cache.stylesheetProcessor ??= new ivy.StylesheetProcessor(basePath, cssUrl, styleIncludePaths);\n\n        await ivy.compileSourceFiles(\n          graph,\n          tsConfig,\n          moduleResolutionCache,\n          {\n            outDir: path.dirname(esm2015),\n            declarationDir: path.dirname(declarations),\n            declaration: true,\n            target: ts.ScriptTarget.ES2015,\n          },\n          entryPoint.cache.stylesheetProcessor as any,\n          ngccProcessor,\n          options.watch,\n        );\n      } else {\n        entryPoint.cache.stylesheetProcessor ??= new StylesheetProcessor(basePath, cssUrl, styleIncludePaths);\n        await compileSourceFiles(\n          graph,\n          tsConfig,\n          moduleResolutionCache,\n          entryPoint.cache.stylesheetProcessor as any,\n          {\n            outDir: path.dirname(esm2015),\n            declarationDir: path.dirname(declarations),\n            declaration: true,\n            target: ts.ScriptTarget.ES2015,\n          },\n          ngccProcessor,\n        );\n      }\n    } catch (error) {\n      spinner.fail();\n      throw error;\n    }\n\n    spinner.succeed();\n    return graph;\n  });\n};\n"]}

package/lib/ng-package/nodes.d.ts

@@ -1,12 +1,13 @@
 import * as ts from 'typescript';
 import { RollupCache } from 'rollup';
-import { ParsedConfiguration, Program } from '@angular/compiler-cli';
+import { NgtscProgram, ParsedConfiguration, Program } from '@angular/compiler-cli';
 import { Node } from '../graph/node';
 import { NgEntryPoint, DestinationFiles } from './entry-point/entry-point';
 import { NgccProcessingCache } from './ngcc-cache';
 import { NgPackage } from './package';
 import { FileCache } from '../file-system/file-cache';
 import { ComplexPredicate } from '../graph/build-graph';
+import * as ivy from '../ivy';
 import { StylesheetProcessor } from '../styles/stylesheet-processor';
 export declare const TYPE_NG_PACKAGE = "application/ng-package";
 export declare const TYPE_NG_ENTRY_POINT = "application/ng-entry-point";
@@ -35,7 +36,9 @@ export declare class EntryPointNode extends Node {
         analysesSourcesFileCache: FileCache;
         moduleResolutionCache: ts.ModuleResolutionCache;
         rollupFESMCache?: RollupCache;
-        stylesheetProcessor?: StylesheetProcessor;
+        stylesheetProcessor?: StylesheetProcessor | ivy.StylesheetProcessor;
+        oldNgtscProgram?: NgtscProgram;
+        oldBuilder?: ts.EmitAndSemanticDiagnosticsBuilderProgram;
     };
     data: {
         destinationFiles: DestinationFiles;

package/lib/ng-package/nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/lib/ng-package/nodes.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAGjC,wCAAqC;AACrC,4CAA4D;AAE5D,6CAAmD;AAEnD,0DAAsD;AAIzC,QAAA,eAAe,GAAG,wBAAwB,CAAC;AAC3C,QAAA,mBAAmB,GAAG,4BAA4B,CAAC;AAIhE,oDAAoD;AACvC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAE3C,kCAAkC;AACrB,QAAA,eAAe,GAAG,OAAO,CAAC;AAEvC,SAAgB,YAAY,CAAC,IAAU;IACrC,OAAO,IAAI,CAAC,IAAI,KAAK,2BAAmB,CAAC;AAC3C,CAAC;AAFD,oCAEC;AAED,SAAgB,SAAS,CAAC,IAAU;IAClC,OAAO,IAAI,CAAC,IAAI,KAAK,uBAAe,CAAC;AACvC,CAAC;AAFD,8BAEC;AAED,SAAgB,YAAY;IAC1B,OAAO,WAAE,CAAC,YAAY,CAAC,CAAC;AAC1B,CAAC;AAFD,oCAEC;AAED,SAAgB,sBAAsB;IACpC,OAAO,WAAE,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;AAC5C,CAAC;AAFD,wDAEC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,WAAE,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAO,CAAC,CAAC;AACvC,CAAC;AAFD,8CAEC;AAED,SAAgB,SAAS,CAAC,KAAa;IACrC,OAAO,KAAK,CAAC,UAAU,CAAC,yBAAiB,CAAC,CAAC;AAC7C,CAAC;AAFD,8BAEC;AAED,SAAgB,OAAO,CAAC,IAAY;IAClC,OAAO,GAAG,yBAAiB,GAAG,IAAI,EAAE,CAAC;AACvC,CAAC;AAFD,0BAEC;AAED,SAAgB,WAAW,CAAC,GAAW;IACrC,IAAI,GAAG,CAAC,UAAU,CAAC,yBAAiB,CAAC,EAAE;QACrC,OAAO,GAAG,CAAC,SAAS,CAAC,yBAAiB,CAAC,MAAM,CAAC,CAAC;KAChD;AACH,CAAC;AAJD,kCAIC;AAED,SAAgB,KAAK,CAAC,IAAY;IAChC,OAAO,GAAG,uBAAe,GAAG,IAAI,EAAE,CAAC;AACrC,CAAC;AAFD,sBAEC;AAED,MAAa,cAAe,SAAQ,WAAI;IAGtC,YACkB,GAAW,EAC3B,gBAA2B,EAC3B,mBAAwC,EACxC,qBAA+C;QAE/C,KAAK,CAAC,GAAG,CAAC,CAAC;QALK,QAAG,GAAH,GAAG,CAAQ;QAHpB,SAAI,GAAG,2BAAmB,CAAC;QAUlC,IAAI,CAAC,KAAK,GAAG;YACX,gBAAgB;YAChB,mBAAmB;YACnB,wBAAwB,EAAE,IAAI,sBAAS,EAAE;YACzC,qBAAqB;SACtB,CAAC;IACJ,CAAC;CAiBF;AAlCD,wCAkCC;AAED,MAAa,WAAY,SAAQ,WAAI;IAArC;;QACW,SAAI,GAAG,uBAAe,CAAC;QAGhC,UAAK,GAAG;YACN,SAAS,EAAE,EAAe;YAC1B,gBAAgB,EAAE,IAAI,sBAAS,EAAE;YACjC,mBAAmB,EAAE,IAAI,gCAAmB,EAAE;YAC9C,qBAAqB,EAAE,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SAC7E,CAAC;IACJ,CAAC;CAAA;AAVD,kCAUC","sourcesContent":["import * as ts from 'typescript';\nimport { RollupCache } from 'rollup';\nimport { ParsedConfiguration, Program } from '@angular/compiler-cli';\nimport { Node } from '../graph/node';\nimport { by, isInProgress, isDirty } from '../graph/select';\nimport { NgEntryPoint, DestinationFiles } from './entry-point/entry-point';\nimport { NgccProcessingCache } from './ngcc-cache';\nimport { NgPackage } from './package';\nimport { FileCache } from '../file-system/file-cache';\nimport { ComplexPredicate } from '../graph/build-graph';\nimport { StylesheetProcessor } from '../styles/stylesheet-processor';\n\nexport const TYPE_NG_PACKAGE = 'application/ng-package';\nexport const TYPE_NG_ENTRY_POINT = 'application/ng-entry-point';\n\nexport type GlobCache = Record<string, boolean | 'DIR' | 'FILE' | string[]>;\n\n/** A node that can be read through the `fs` api. */\nexport const URL_PROTOCOL_FILE = 'file://';\n\n/** A node specific to angular. */\nexport const URL_PROTOCOL_NG = 'ng://';\n\nexport function isEntryPoint(node: Node): node is EntryPointNode {\n  return node.type === TYPE_NG_ENTRY_POINT;\n}\n\nexport function isPackage(node: Node): node is PackageNode {\n  return node.type === TYPE_NG_PACKAGE;\n}\n\nexport function byEntryPoint(): ComplexPredicate<EntryPointNode> {\n  return by(isEntryPoint);\n}\n\nexport function isEntryPointInProgress(): ComplexPredicate<EntryPointNode> {\n  return by(isEntryPoint).and(isInProgress);\n}\n\nexport function isEntryPointDirty(): ComplexPredicate<EntryPointNode> {\n  return by(isEntryPoint).and(isDirty);\n}\n\nexport function isFileUrl(value: string): boolean {\n  return value.startsWith(URL_PROTOCOL_FILE);\n}\n\nexport function fileUrl(path: string): string {\n  return `${URL_PROTOCOL_FILE}${path}`;\n}\n\nexport function fileUrlPath(url: string): string {\n  if (url.startsWith(URL_PROTOCOL_FILE)) {\n    return url.substring(URL_PROTOCOL_FILE.length);\n  }\n}\n\nexport function ngUrl(path: string): string {\n  return `${URL_PROTOCOL_NG}${path}`;\n}\n\nexport class EntryPointNode extends Node {\n  readonly type = TYPE_NG_ENTRY_POINT;\n\n  constructor(\n    public readonly url: string,\n    sourcesFileCache: FileCache,\n    ngccProcessingCache: NgccProcessingCache,\n    moduleResolutionCache: ts.ModuleResolutionCache,\n  ) {\n    super(url);\n\n    this.cache = {\n      sourcesFileCache,\n      ngccProcessingCache,\n      analysesSourcesFileCache: new FileCache(),\n      moduleResolutionCache,\n    };\n  }\n\n  cache: {\n    oldPrograms?: Record<ts.ScriptTarget | 'analysis', Program | ts.Program>;\n    sourcesFileCache: FileCache;\n    ngccProcessingCache: NgccProcessingCache;\n    analysesSourcesFileCache: FileCache;\n    moduleResolutionCache: ts.ModuleResolutionCache;\n    rollupFESMCache?: RollupCache;\n    stylesheetProcessor?: StylesheetProcessor;\n  };\n\n  data: {\n    destinationFiles: DestinationFiles;\n    entryPoint: NgEntryPoint;\n    tsConfig?: ParsedConfiguration;\n  };\n}\n\nexport class PackageNode extends Node {\n  readonly type = TYPE_NG_PACKAGE;\n  data: NgPackage;\n\n  cache = {\n    globCache: {} as GlobCache,\n    sourcesFileCache: new FileCache(),\n    ngccProcessingCache: new NgccProcessingCache(),\n    moduleResolutionCache: ts.createModuleResolutionCache(process.cwd(), s => s),\n  };\n}\n"]}
+{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/lib/ng-package/nodes.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAGjC,wCAAqC;AACrC,4CAA4D;AAE5D,6CAAmD;AAEnD,0DAAsD;AAKzC,QAAA,eAAe,GAAG,wBAAwB,CAAC;AAC3C,QAAA,mBAAmB,GAAG,4BAA4B,CAAC;AAIhE,oDAAoD;AACvC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAE3C,kCAAkC;AACrB,QAAA,eAAe,GAAG,OAAO,CAAC;AAEvC,SAAgB,YAAY,CAAC,IAAU;IACrC,OAAO,IAAI,CAAC,IAAI,KAAK,2BAAmB,CAAC;AAC3C,CAAC;AAFD,oCAEC;AAED,SAAgB,SAAS,CAAC,IAAU;IAClC,OAAO,IAAI,CAAC,IAAI,KAAK,uBAAe,CAAC;AACvC,CAAC;AAFD,8BAEC;AAED,SAAgB,YAAY;IAC1B,OAAO,WAAE,CAAC,YAAY,CAAC,CAAC;AAC1B,CAAC;AAFD,oCAEC;AAED,SAAgB,sBAAsB;IACpC,OAAO,WAAE,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;AAC5C,CAAC;AAFD,wDAEC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,WAAE,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,gBAAO,CAAC,CAAC;AACvC,CAAC;AAFD,8CAEC;AAED,SAAgB,SAAS,CAAC,KAAa;IACrC,OAAO,KAAK,CAAC,UAAU,CAAC,yBAAiB,CAAC,CAAC;AAC7C,CAAC;AAFD,8BAEC;AAED,SAAgB,OAAO,CAAC,IAAY;IAClC,OAAO,GAAG,yBAAiB,GAAG,IAAI,EAAE,CAAC;AACvC,CAAC;AAFD,0BAEC;AAED,SAAgB,WAAW,CAAC,GAAW;IACrC,IAAI,GAAG,CAAC,UAAU,CAAC,yBAAiB,CAAC,EAAE;QACrC,OAAO,GAAG,CAAC,SAAS,CAAC,yBAAiB,CAAC,MAAM,CAAC,CAAC;KAChD;AACH,CAAC;AAJD,kCAIC;AAED,SAAgB,KAAK,CAAC,IAAY;IAChC,OAAO,GAAG,uBAAe,GAAG,IAAI,EAAE,CAAC;AACrC,CAAC;AAFD,sBAEC;AAED,MAAa,cAAe,SAAQ,WAAI;IAGtC,YACkB,GAAW,EAC3B,gBAA2B,EAC3B,mBAAwC,EACxC,qBAA+C;QAE/C,KAAK,CAAC,GAAG,CAAC,CAAC;QALK,QAAG,GAAH,GAAG,CAAQ;QAHpB,SAAI,GAAG,2BAAmB,CAAC;QAUlC,IAAI,CAAC,KAAK,GAAG;YACX,gBAAgB;YAChB,mBAAmB;YACnB,wBAAwB,EAAE,IAAI,sBAAS,EAAE;YACzC,qBAAqB;SACtB,CAAC;IACJ,CAAC;CAmBF;AApCD,wCAoCC;AAED,MAAa,WAAY,SAAQ,WAAI;IAArC;;QACW,SAAI,GAAG,uBAAe,CAAC;QAGhC,UAAK,GAAG;YACN,SAAS,EAAE,EAAe;YAC1B,gBAAgB,EAAE,IAAI,sBAAS,EAAE;YACjC,mBAAmB,EAAE,IAAI,gCAAmB,EAAE;YAC9C,qBAAqB,EAAE,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SAC7E,CAAC;IACJ,CAAC;CAAA;AAVD,kCAUC","sourcesContent":["import * as ts from 'typescript';\nimport { RollupCache } from 'rollup';\nimport { NgtscProgram, ParsedConfiguration, Program } from '@angular/compiler-cli';\nimport { Node } from '../graph/node';\nimport { by, isInProgress, isDirty } from '../graph/select';\nimport { NgEntryPoint, DestinationFiles } from './entry-point/entry-point';\nimport { NgccProcessingCache } from './ngcc-cache';\nimport { NgPackage } from './package';\nimport { FileCache } from '../file-system/file-cache';\nimport { ComplexPredicate } from '../graph/build-graph';\nimport * as ivy from '../ivy';\nimport { StylesheetProcessor } from '../styles/stylesheet-processor';\n\nexport const TYPE_NG_PACKAGE = 'application/ng-package';\nexport const TYPE_NG_ENTRY_POINT = 'application/ng-entry-point';\n\nexport type GlobCache = Record<string, boolean | 'DIR' | 'FILE' | string[]>;\n\n/** A node that can be read through the `fs` api. */\nexport const URL_PROTOCOL_FILE = 'file://';\n\n/** A node specific to angular. */\nexport const URL_PROTOCOL_NG = 'ng://';\n\nexport function isEntryPoint(node: Node): node is EntryPointNode {\n  return node.type === TYPE_NG_ENTRY_POINT;\n}\n\nexport function isPackage(node: Node): node is PackageNode {\n  return node.type === TYPE_NG_PACKAGE;\n}\n\nexport function byEntryPoint(): ComplexPredicate<EntryPointNode> {\n  return by(isEntryPoint);\n}\n\nexport function isEntryPointInProgress(): ComplexPredicate<EntryPointNode> {\n  return by(isEntryPoint).and(isInProgress);\n}\n\nexport function isEntryPointDirty(): ComplexPredicate<EntryPointNode> {\n  return by(isEntryPoint).and(isDirty);\n}\n\nexport function isFileUrl(value: string): boolean {\n  return value.startsWith(URL_PROTOCOL_FILE);\n}\n\nexport function fileUrl(path: string): string {\n  return `${URL_PROTOCOL_FILE}${path}`;\n}\n\nexport function fileUrlPath(url: string): string {\n  if (url.startsWith(URL_PROTOCOL_FILE)) {\n    return url.substring(URL_PROTOCOL_FILE.length);\n  }\n}\n\nexport function ngUrl(path: string): string {\n  return `${URL_PROTOCOL_NG}${path}`;\n}\n\nexport class EntryPointNode extends Node {\n  readonly type = TYPE_NG_ENTRY_POINT;\n\n  constructor(\n    public readonly url: string,\n    sourcesFileCache: FileCache,\n    ngccProcessingCache: NgccProcessingCache,\n    moduleResolutionCache: ts.ModuleResolutionCache,\n  ) {\n    super(url);\n\n    this.cache = {\n      sourcesFileCache,\n      ngccProcessingCache,\n      analysesSourcesFileCache: new FileCache(),\n      moduleResolutionCache,\n    };\n  }\n\n  cache: {\n    oldPrograms?: Record<ts.ScriptTarget | 'analysis', Program | ts.Program>;\n    sourcesFileCache: FileCache;\n    ngccProcessingCache: NgccProcessingCache;\n    analysesSourcesFileCache: FileCache;\n    moduleResolutionCache: ts.ModuleResolutionCache;\n    rollupFESMCache?: RollupCache;\n    stylesheetProcessor?: StylesheetProcessor | ivy.StylesheetProcessor;\n    oldNgtscProgram?: NgtscProgram;\n    oldBuilder?: ts.EmitAndSemanticDiagnosticsBuilderProgram;\n  };\n\n  data: {\n    destinationFiles: DestinationFiles;\n    entryPoint: NgEntryPoint;\n    tsConfig?: ParsedConfiguration;\n  };\n}\n\nexport class PackageNode extends Node {\n  readonly type = TYPE_NG_PACKAGE;\n  data: NgPackage;\n\n  cache = {\n    globCache: {} as GlobCache,\n    sourcesFileCache: new FileCache(),\n    ngccProcessingCache: new NgccProcessingCache(),\n    moduleResolutionCache: ts.createModuleResolutionCache(process.cwd(), s => s),\n  };\n}\n"]}

package/lib/packagr.js

@@ -5,7 +5,6 @@ const injection_js_1 = require("injection-js");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const build_graph_1 = require("./graph/build-graph");
-const log = require("./utils/log");
 const init_tsconfig_di_1 = require("./ng-package/entry-point/init-tsconfig.di");
 const entry_point_di_1 = require("./ng-package/entry-point/entry-point.di");
 const package_di_1 = require("./ng-package/package.di");
@@ -99,11 +98,7 @@ class NgPackagr {
     buildAsObservable() {
         const injector = injection_js_1.ReflectiveInjector.resolveAndCreate(this.providers);
         const buildTransformOperator = injector.get(this.buildTransform);
-        return rxjs_1.of(new build_graph_1.BuildGraph()).pipe(buildTransformOperator, operators_1.catchError(err => {
-            // Report error and re-throw to subscribers
-            log.error(err);
-            return rxjs_1.throwError(err);
-        }), operators_1.map(() => undefined));
+        return rxjs_1.of(new build_graph_1.BuildGraph()).pipe(buildTransformOperator, operators_1.mapTo(undefined));
     }
 }
 exports.NgPackagr = NgPackagr;

package/lib/packagr.js.map

@@ -1 +1 @@
-{"version":3,"file":"packagr.js","sourceRoot":"","sources":["../../src/lib/packagr.ts"],"names":[],"mappings":";;;AAAA,+CAA4E;AAE5E,+BAAkE;AAClE,8CAAiD;AACjD,qDAAiD;AAEjD,mCAAmC;AACnC,gFAA4E;AAC5E,4EAAgF;AAChF,wDAA+E;AAC/E,6CAA8C;AAC9C,wDAA2E;AAE3E;;;;;;GAMG;AACH,MAAa,SAAS;IAGpB,YAAoB,SAAqB;QAArB,cAAS,GAAT,SAAS,CAAY;QAFjC,mBAAc,GAA8B,8BAAiB,CAAC,OAAO,CAAC;IAElC,CAAC;IAE7C;;;;;OAKG;IACI,WAAW,CAAC,OAAyB;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACI,aAAa,CAAC,SAAqB;QACxC,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;QAEnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAAC,aAA2C;QAC7D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kCAAe,CAAC,aAAa,CAAC,CAAC,CAAC;QAEpD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,kBAAkB,CAAC,SAAoC;QAC5D,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAEhC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAErD,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACI,iBAAiB;QACtB,MAAM,QAAQ,GAAG,iCAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrE,MAAM,sBAAsB,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEjE,OAAO,SAAY,CAAC,IAAI,wBAAU,EAAE,CAAC,CAAC,IAAI,CACxC,sBAAsB,EACtB,sBAAU,CAAC,GAAG,CAAC,EAAE;YACf,2CAA2C;YAC3C,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,OAAO,iBAAU,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,EACF,eAAG,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CACrB,CAAC;IACJ,CAAC;CACF;AAzGD,8BAyGC;AAEM,MAAM,SAAS,GAAG,GAAc,EAAE,CACvC,IAAI,SAAS,CAAC;IACZ,sCAAsC;IACtC,GAAG,8BAAiB;IACpB,GAAG,sCAAqB;CACzB,CAAC,CAAC;AALQ,QAAA,SAAS,aAKjB","sourcesContent":["import { InjectionToken, Provider, ReflectiveInjector } from 'injection-js';\nimport { ParsedConfiguration } from '@angular/compiler-cli';\nimport { of as observableOf, Observable, throwError } from 'rxjs';\nimport { map, catchError } from 'rxjs/operators';\nimport { BuildGraph } from './graph/build-graph';\nimport { Transform } from './graph/transform';\nimport * as log from './utils/log';\nimport { provideTsConfig } from './ng-package/entry-point/init-tsconfig.di';\nimport { ENTRY_POINT_PROVIDERS } from './ng-package/entry-point/entry-point.di';\nimport { PACKAGE_TRANSFORM, PACKAGE_PROVIDERS } from './ng-package/package.di';\nimport { provideProject } from './project.di';\nimport { provideOptions, NgPackagrOptions } from './ng-package/options.di';\n\n/**\n * The original ng-packagr implemented on top of a rxjs-ified and di-jectable transformation pipeline.\n *\n * See the `docs/transformations.md` for more prose description.\n *\n * @link https://github.com/ng-packagr/ng-packagr/pull/572\n */\nexport class NgPackagr {\n  private buildTransform: InjectionToken<Transform> = PACKAGE_TRANSFORM.provide;\n\n  constructor(private providers: Provider[]) {}\n\n  /**\n   * Adds options to ng-packagr\n   *\n   * @param options Ng Packagr Options\n   * @return Self instance for fluent API\n   */\n  public withOptions(options: NgPackagrOptions): NgPackagr {\n    this.providers.push(provideOptions(options));\n\n    return this;\n  }\n\n  /**\n   * Sets the path to the user's \"ng-package\" file (either `package.json`, `ng-package.json`, or `ng-package.js`)\n   *\n   * @param project File path\n   * @return Self instance for fluent API\n   */\n  public forProject(project: string): NgPackagr {\n    this.providers.push(provideProject(project));\n\n    return this;\n  }\n\n  /**\n   * Adds dependency injection providers.\n   *\n   * @param providers\n   * @return Self instance for fluent API\n   * @link https://github.com/mgechev/injection-js\n   */\n  public withProviders(providers: Provider[]): NgPackagr {\n    this.providers = [...this.providers, ...providers];\n\n    return this;\n  }\n\n  /**\n   * Overwrites the default TypeScript configuration.\n   *\n   * @param defaultValues A tsconfig providing default values to the compilation.\n   * @return Self instance for fluent API\n   */\n  public withTsConfig(defaultValues: ParsedConfiguration | string): NgPackagr {\n    this.providers.push(provideTsConfig(defaultValues));\n\n    return this;\n  }\n\n  /**\n   * Overwrites the 'build' transform.\n   *\n   * @param transform\n   * @return Self instance for fluent API\n   */\n  public withBuildTransform(transform: InjectionToken<Transform>): NgPackagr {\n    this.buildTransform = transform;\n\n    return this;\n  }\n\n  /**\n   * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n   *\n   * @return A promisified result of the transformation pipeline.\n   */\n  public build(): Promise<void> {\n    return this.buildAsObservable().toPromise();\n  }\n\n  /**\n   * Builds and watch for changes by kick-starting the 'watch' transform over an (initially) empty `BuildGraph``\n   *\n   * @return An observable result of the transformation pipeline.\n   */\n  public watch(): Observable<void> {\n    this.providers.push(provideOptions({ watch: true }));\n\n    return this.buildAsObservable();\n  }\n\n  /**\n   * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n   *\n   * @return An observable result of the transformation pipeline.\n   */\n  public buildAsObservable(): Observable<void> {\n    const injector = ReflectiveInjector.resolveAndCreate(this.providers);\n    const buildTransformOperator = injector.get(this.buildTransform);\n\n    return observableOf(new BuildGraph()).pipe(\n      buildTransformOperator,\n      catchError(err => {\n        // Report error and re-throw to subscribers\n        log.error(err);\n        return throwError(err);\n      }),\n      map(() => undefined),\n    );\n  }\n}\n\nexport const ngPackagr = (): NgPackagr =>\n  new NgPackagr([\n    // Add default providers to this list.\n    ...PACKAGE_PROVIDERS,\n    ...ENTRY_POINT_PROVIDERS,\n  ]);\n"]}
+{"version":3,"file":"packagr.js","sourceRoot":"","sources":["../../src/lib/packagr.ts"],"names":[],"mappings":";;;AAAA,+CAA4E;AAE5E,+BAAsD;AACtD,8CAAuC;AACvC,qDAAiD;AAEjD,gFAA4E;AAC5E,4EAAgF;AAChF,wDAA+E;AAC/E,6CAA8C;AAC9C,wDAA2E;AAE3E;;;;;;GAMG;AACH,MAAa,SAAS;IAGpB,YAAoB,SAAqB;QAArB,cAAS,GAAT,SAAS,CAAY;QAFjC,mBAAc,GAA8B,8BAAiB,CAAC,OAAO,CAAC;IAElC,CAAC;IAE7C;;;;;OAKG;IACI,WAAW,CAAC,OAAyB;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACI,aAAa,CAAC,SAAqB;QACxC,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;QAEnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAAC,aAA2C;QAC7D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kCAAe,CAAC,aAAa,CAAC,CAAC,CAAC;QAEpD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,kBAAkB,CAAC,SAAoC;QAC5D,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAEhC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAErD,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACI,iBAAiB;QACtB,MAAM,QAAQ,GAAG,iCAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrE,MAAM,sBAAsB,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEjE,OAAO,SAAY,CAAC,IAAI,wBAAU,EAAE,CAAC,CAAC,IAAI,CACxC,sBAAsB,EACtB,iBAAK,CAAC,SAAS,CAAC,CACjB,CAAC;IACJ,CAAC;CACF;AApGD,8BAoGC;AAEM,MAAM,SAAS,GAAG,GAAc,EAAE,CACvC,IAAI,SAAS,CAAC;IACZ,sCAAsC;IACtC,GAAG,8BAAiB;IACpB,GAAG,sCAAqB;CACzB,CAAC,CAAC;AALQ,QAAA,SAAS,aAKjB","sourcesContent":["import { InjectionToken, Provider, ReflectiveInjector } from 'injection-js';\nimport { ParsedConfiguration } from '@angular/compiler-cli';\nimport { of as observableOf, Observable } from 'rxjs';\nimport { mapTo } from 'rxjs/operators';\nimport { BuildGraph } from './graph/build-graph';\nimport { Transform } from './graph/transform';\nimport { provideTsConfig } from './ng-package/entry-point/init-tsconfig.di';\nimport { ENTRY_POINT_PROVIDERS } from './ng-package/entry-point/entry-point.di';\nimport { PACKAGE_TRANSFORM, PACKAGE_PROVIDERS } from './ng-package/package.di';\nimport { provideProject } from './project.di';\nimport { provideOptions, NgPackagrOptions } from './ng-package/options.di';\n\n/**\n * The original ng-packagr implemented on top of a rxjs-ified and di-jectable transformation pipeline.\n *\n * See the `docs/transformations.md` for more prose description.\n *\n * @link https://github.com/ng-packagr/ng-packagr/pull/572\n */\nexport class NgPackagr {\n  private buildTransform: InjectionToken<Transform> = PACKAGE_TRANSFORM.provide;\n\n  constructor(private providers: Provider[]) {}\n\n  /**\n   * Adds options to ng-packagr\n   *\n   * @param options Ng Packagr Options\n   * @return Self instance for fluent API\n   */\n  public withOptions(options: NgPackagrOptions): NgPackagr {\n    this.providers.push(provideOptions(options));\n\n    return this;\n  }\n\n  /**\n   * Sets the path to the user's \"ng-package\" file (either `package.json`, `ng-package.json`, or `ng-package.js`)\n   *\n   * @param project File path\n   * @return Self instance for fluent API\n   */\n  public forProject(project: string): NgPackagr {\n    this.providers.push(provideProject(project));\n\n    return this;\n  }\n\n  /**\n   * Adds dependency injection providers.\n   *\n   * @param providers\n   * @return Self instance for fluent API\n   * @link https://github.com/mgechev/injection-js\n   */\n  public withProviders(providers: Provider[]): NgPackagr {\n    this.providers = [...this.providers, ...providers];\n\n    return this;\n  }\n\n  /**\n   * Overwrites the default TypeScript configuration.\n   *\n   * @param defaultValues A tsconfig providing default values to the compilation.\n   * @return Self instance for fluent API\n   */\n  public withTsConfig(defaultValues: ParsedConfiguration | string): NgPackagr {\n    this.providers.push(provideTsConfig(defaultValues));\n\n    return this;\n  }\n\n  /**\n   * Overwrites the 'build' transform.\n   *\n   * @param transform\n   * @return Self instance for fluent API\n   */\n  public withBuildTransform(transform: InjectionToken<Transform>): NgPackagr {\n    this.buildTransform = transform;\n\n    return this;\n  }\n\n  /**\n   * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n   *\n   * @return A promisified result of the transformation pipeline.\n   */\n  public build(): Promise<void> {\n    return this.buildAsObservable().toPromise();\n  }\n\n  /**\n   * Builds and watch for changes by kick-starting the 'watch' transform over an (initially) empty `BuildGraph``\n   *\n   * @return An observable result of the transformation pipeline.\n   */\n  public watch(): Observable<void> {\n    this.providers.push(provideOptions({ watch: true }));\n\n    return this.buildAsObservable();\n  }\n\n  /**\n   * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n   *\n   * @return An observable result of the transformation pipeline.\n   */\n  public buildAsObservable(): Observable<void> {\n    const injector = ReflectiveInjector.resolveAndCreate(this.providers);\n    const buildTransformOperator = injector.get(this.buildTransform);\n\n    return observableOf(new BuildGraph()).pipe(\n      buildTransformOperator,\n      mapTo(undefined),\n    );\n  }\n}\n\nexport const ngPackagr = (): NgPackagr =>\n  new NgPackagr([\n    // Add default providers to this list.\n    ...PACKAGE_PROVIDERS,\n    ...ENTRY_POINT_PROVIDERS,\n  ]);\n"]}

package/lib/ts/cache-compiler-host.d.ts

@@ -5,3 +5,4 @@ import { EntryPointNode } from '../ng-package/nodes';
 import { BuildGraph } from '../graph/build-graph';
 import { FileCache } from '../file-system/file-cache';
 export declare function cacheCompilerHost(graph: BuildGraph, entryPoint: EntryPointNode, compilerOptions: ng.CompilerOptions, moduleResolutionCache: ts.ModuleResolutionCache, stylesheetProcessor?: StylesheetProcessor, sourcesFileCache?: FileCache, setParentNodes?: boolean): ng.CompilerHost;
+export declare function augmentProgramWithVersioning(program: ts.Program): void;

package/lib/ts/cache-compiler-host.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cacheCompilerHost = void 0;
+exports.augmentProgramWithVersioning = exports.cacheCompilerHost = void 0;
 const ts = require("typescript");
 const ng = require("@angular/compiler-cli");
 const path = require("path");
@@ -8,6 +8,7 @@ const path_1 = require("../utils/path");
 const log_1 = require("../utils/log");
 const nodes_1 = require("../ng-package/nodes");
 const node_1 = require("../graph/node");
+const crypto_1 = require("crypto");
 function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionCache, stylesheetProcessor, sourcesFileCache = entryPoint.cache.sourcesFileCache, setParentNodes = true) {
     const tsHost = ts.createCompilerHost(compilerOptions, setParentNodes);
     const compilerHost = ng.createCompilerHost({ options: compilerOptions, tsHost });
@@ -61,17 +62,17 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
             }
             return cache.content;
         },
-        // ng specific
-        moduleNameToFileName: (moduleName, containingFile) => {
-            const { resolvedModule } = ts.resolveModuleName(moduleName, path_1.ensureUnixPath(containingFile), compilerOptions, compilerHost, moduleResolutionCache);
-            return resolvedModule && resolvedModule.resolvedFileName;
-        },
         resolveModuleNames: (moduleNames, containingFile) => {
             return moduleNames.map(moduleName => {
                 const { resolvedModule } = ts.resolveModuleName(moduleName, path_1.ensureUnixPath(containingFile), compilerOptions, compilerHost, moduleResolutionCache);
                 return resolvedModule;
             });
         },
+        // ng specific
+        moduleNameToFileName: (moduleName, containingFile) => {
+            const { resolvedModule } = ts.resolveModuleName(moduleName, path_1.ensureUnixPath(containingFile), compilerOptions, compilerHost, moduleResolutionCache);
+            return resolvedModule && resolvedModule.resolvedFileName;
+        },
         resourceNameToFileName: (resourceName, containingFilePath) => {
             const resourcePath = path.resolve(path.dirname(containingFilePath), resourceName);
             const containingNode = getNode(containingFilePath);
@@ -83,7 +84,7 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
             addDependee(fileName);
             const cache = sourcesFileCache.getOrCreate(fileName);
             if (cache.content === undefined) {
-                if (/(html|htm|svg)$/.test(path.extname(fileName))) {
+                if (/(?:html?|svg)$/.test(path.extname(fileName))) {
                     // template
                     cache.content = compilerHost.readFile.call(this, fileName);
                 }
@@ -100,7 +101,6 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
                 if (cache.content === undefined) {
                     throw new Error(`Cannot read file ${fileName}.`);
                 }
-                ;
                 cache.exists = true;
             }
             return cache.content;
@@ -108,4 +108,17 @@ function cacheCompilerHost(graph, entryPoint, compilerOptions, moduleResolutionC
     };
 }
 exports.cacheCompilerHost = cacheCompilerHost;
+function augmentProgramWithVersioning(program) {
+    const baseGetSourceFiles = program.getSourceFiles;
+    program.getSourceFiles = function (...parameters) {
+        const files = baseGetSourceFiles(...parameters);
+        for (const file of files) {
+            if (file.version === undefined) {
+                file.version = crypto_1.createHash('sha256').update(file.text).digest('hex');
+            }
+        }
+        return files;
+    };
+}
+exports.augmentProgramWithVersioning = augmentProgramWithVersioning;
 //# sourceMappingURL=cache-compiler-host.js.map

package/lib/ts/cache-compiler-host.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../src/lib/ts/cache-compiler-host.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\nimport * as ng from '@angular/compiler-cli';\nimport * as path from 'path';\nimport { ensureUnixPath } from '../utils/path';\nimport { error } from '../utils/log';\nimport { StylesheetProcessor } from '../styles/stylesheet-processor';\nimport { EntryPointNode, fileUrl } from '../ng-package/nodes';\nimport { BuildGraph } from '../graph/build-graph';\nimport { FileCache } from '../file-system/file-cache';\nimport { Node } from '../graph/node';\n\nexport function cacheCompilerHost(\n  graph: BuildGraph,\n  entryPoint: EntryPointNode,\n  compilerOptions: ng.CompilerOptions,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  stylesheetProcessor?: StylesheetProcessor,\n  sourcesFileCache: FileCache = entryPoint.cache.sourcesFileCache,\n  setParentNodes = true,\n): ng.CompilerHost {\n  const tsHost = ts.createCompilerHost(compilerOptions, setParentNodes);\n  const compilerHost = ng.createCompilerHost({ options: compilerOptions, tsHost });\n\n  const getNode = (fileName: string) => {\n    const nodeUri = fileUrl(ensureUnixPath(fileName));\n    let node = graph.get(nodeUri);\n\n    if (!node) {\n      node = new Node(nodeUri);\n      graph.put(node);\n    }\n\n    return node;\n  };\n\n  const addDependee = (fileName: string) => {\n    const node = getNode(fileName);\n    entryPoint.dependsOn(node);\n  };\n\n  return {\n    ...compilerHost,\n\n    // ts specific\n    fileExists: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.exists === undefined) {\n        cache.exists = compilerHost.fileExists.call(this, fileName);\n      }\n      return cache.exists;\n    },\n\n    getSourceFile: (fileName: string, languageVersion: ts.ScriptTarget) => {\n      addDependee(fileName);\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (!cache.sourceFile) {\n        cache.sourceFile = compilerHost.getSourceFile.call(this, fileName, languageVersion);\n      }\n      return cache.sourceFile;\n    },\n\n    writeFile: (\n      fileName: string,\n      data: string,\n      writeByteOrderMark: boolean,\n      onError?: (message: string) => void,\n      sourceFiles?: ReadonlyArray<ts.SourceFile>,\n    ) => {\n      if (fileName.endsWith('.d.ts')) {\n        sourceFiles.forEach(source => {\n          const cache = sourcesFileCache.getOrCreate(source.fileName);\n          if (!cache.declarationFileName) {\n            cache.declarationFileName = ensureUnixPath(fileName);\n          }\n        });\n      }\n\n      compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);\n    },\n\n    readFile: (fileName: string) => {\n      addDependee(fileName);\n\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        cache.content = compilerHost.readFile.call(this, fileName);\n      }\n      return cache.content;\n    },\n\n    // ng specific\n    moduleNameToFileName: (moduleName: string, containingFile: string) => {\n      const { resolvedModule } = ts.resolveModuleName(\n        moduleName,\n        ensureUnixPath(containingFile),\n        compilerOptions,\n        compilerHost,\n        moduleResolutionCache,\n      );\n\n      return resolvedModule && resolvedModule.resolvedFileName;\n    },\n\n    resolveModuleNames: (moduleNames: string[], containingFile: string) => {\n      return moduleNames.map(moduleName => {\n        const { resolvedModule } = ts.resolveModuleName(\n          moduleName,\n          ensureUnixPath(containingFile),\n          compilerOptions,\n          compilerHost,\n          moduleResolutionCache,\n        );\n\n        return resolvedModule;\n      });\n    },\n\n    resourceNameToFileName: (resourceName: string, containingFilePath: string) => {\n      const resourcePath = path.resolve(path.dirname(containingFilePath), resourceName);\n      const containingNode = getNode(containingFilePath);\n      const resourceNode = getNode(resourcePath);\n      containingNode.dependsOn(resourceNode);\n\n      return resourcePath;\n    },\n\n    readResource: (fileName: string) => {\n      addDependee(fileName);\n\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        if (/(html|htm|svg)$/.test(path.extname(fileName))) {\n          // template\n          cache.content = compilerHost.readFile.call(this, fileName);\n        } else {\n          // stylesheet\n          try {\n            cache.content = stylesheetProcessor.process(fileName);\n          } catch (err) {\n            error('\\n' + err.message + ` in stylesheet file ${fileName}.`);\n            throw err;\n          }\n        }\n\n        if (cache.content === undefined) {\n          throw new Error(`Cannot read file ${fileName}.`);\n        };\n\n        cache.exists = true;\n      }\n\n      return cache.content;\n    },\n  };\n}\n"]}
+{"version":3,"file":"cache-compiler-host.js","sourceRoot":"","sources":["../../../src/lib/ts/cache-compiler-host.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ts from 'typescript';\nimport * as ng from '@angular/compiler-cli';\nimport * as path from 'path';\nimport { ensureUnixPath } from '../utils/path';\nimport { error } from '../utils/log';\nimport { StylesheetProcessor } from '../styles/stylesheet-processor';\nimport { EntryPointNode, fileUrl } from '../ng-package/nodes';\nimport { BuildGraph } from '../graph/build-graph';\nimport { FileCache } from '../file-system/file-cache';\nimport { Node } from '../graph/node';\nimport { createHash } from 'crypto';\n\nexport function cacheCompilerHost(\n  graph: BuildGraph,\n  entryPoint: EntryPointNode,\n  compilerOptions: ng.CompilerOptions,\n  moduleResolutionCache: ts.ModuleResolutionCache,\n  stylesheetProcessor?: StylesheetProcessor,\n  sourcesFileCache: FileCache = entryPoint.cache.sourcesFileCache,\n  setParentNodes = true,\n): ng.CompilerHost {\n  const tsHost = ts.createCompilerHost(compilerOptions, setParentNodes);\n  const compilerHost = ng.createCompilerHost({ options: compilerOptions, tsHost });\n\n  const getNode = (fileName: string) => {\n    const nodeUri = fileUrl(ensureUnixPath(fileName));\n    let node = graph.get(nodeUri);\n\n    if (!node) {\n      node = new Node(nodeUri);\n      graph.put(node);\n    }\n\n    return node;\n  };\n\n  const addDependee = (fileName: string) => {\n    const node = getNode(fileName);\n    entryPoint.dependsOn(node);\n  };\n\n  return {\n    ...compilerHost,\n\n    // ts specific\n    fileExists: (fileName: string) => {\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.exists === undefined) {\n        cache.exists = compilerHost.fileExists.call(this, fileName);\n      }\n      return cache.exists;\n    },\n\n    getSourceFile: (fileName: string, languageVersion: ts.ScriptTarget) => {\n      addDependee(fileName);\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (!cache.sourceFile) {\n        cache.sourceFile = compilerHost.getSourceFile.call(this, fileName, languageVersion);\n      }\n      return cache.sourceFile;\n    },\n\n    writeFile: (\n      fileName: string,\n      data: string,\n      writeByteOrderMark: boolean,\n      onError?: (message: string) => void,\n      sourceFiles?: ReadonlyArray<ts.SourceFile>,\n    ) => {\n      if (fileName.endsWith('.d.ts')) {\n        sourceFiles.forEach(source => {\n          const cache = sourcesFileCache.getOrCreate(source.fileName);\n          if (!cache.declarationFileName) {\n            cache.declarationFileName = ensureUnixPath(fileName);\n          }\n        });\n      }\n\n      compilerHost.writeFile.call(this, fileName, data, writeByteOrderMark, onError, sourceFiles);\n    },\n\n    readFile: (fileName: string) => {\n      addDependee(fileName);\n\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        cache.content = compilerHost.readFile.call(this, fileName);\n      }\n      return cache.content;\n    },\n\n    resolveModuleNames: (moduleNames: string[], containingFile: string) => {\n      return moduleNames.map(moduleName => {\n        const { resolvedModule } = ts.resolveModuleName(\n          moduleName,\n          ensureUnixPath(containingFile),\n          compilerOptions,\n          compilerHost,\n          moduleResolutionCache,\n        );\n\n        return resolvedModule;\n      });\n    },\n\n    // ng specific\n    moduleNameToFileName: (moduleName: string, containingFile: string) => {\n      const { resolvedModule } = ts.resolveModuleName(\n        moduleName,\n        ensureUnixPath(containingFile),\n        compilerOptions,\n        compilerHost,\n        moduleResolutionCache,\n      );\n\n      return resolvedModule && resolvedModule.resolvedFileName;\n    },\n\n    resourceNameToFileName: (resourceName: string, containingFilePath: string) => {\n      const resourcePath = path.resolve(path.dirname(containingFilePath), resourceName);\n      const containingNode = getNode(containingFilePath);\n      const resourceNode = getNode(resourcePath);\n      containingNode.dependsOn(resourceNode);\n\n      return resourcePath;\n    },\n\n    readResource: (fileName: string) => {\n      addDependee(fileName);\n\n      const cache = sourcesFileCache.getOrCreate(fileName);\n      if (cache.content === undefined) {\n        if (/(?:html?|svg)$/.test(path.extname(fileName))) {\n          // template\n          cache.content = compilerHost.readFile.call(this, fileName);\n        } else {\n          // stylesheet\n          try {\n            cache.content = stylesheetProcessor.process(fileName);\n          } catch (err) {\n            error('\\n' + err.message + ` in stylesheet file ${fileName}.`);\n            throw err;\n          }\n        }\n\n        if (cache.content === undefined) {\n          throw new Error(`Cannot read file ${fileName}.`);\n        }\n\n        cache.exists = true;\n      }\n\n      return cache.content;\n    },\n  };\n}\n\nexport function augmentProgramWithVersioning(program: ts.Program): void {\n  const baseGetSourceFiles = program.getSourceFiles;\n  program.getSourceFiles = function (...parameters) {\n    const files: readonly (ts.SourceFile & { version?: string })[] = baseGetSourceFiles(...parameters);\n\n    for (const file of files) {\n      if (file.version === undefined) {\n        file.version = createHash('sha256').update(file.text).digest('hex');\n      }\n    }\n\n    return files;\n  };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ng-packagr",
-  "version": "12.0.7",
+  "version": "12.1.1",
   "description": "Compile and package Angular libraries in Angular Package Format (APF)",
   "keywords": [
     "apf",
@@ -59,6 +59,6 @@
   "peerDependencies": {
     "@angular/compiler-cli": "^12.0.0 || ^12.1.0-next.0",
     "tslib": "^2.1.0",
-    "typescript": "~4.2.3"
+    "typescript": "~4.2.3 || ~4.3.2"
   }
 }