ng-packagr 13.0.0-rc.0 → 13.0.0

package/README.md

@@ -74,7 +74,7 @@ Create one `package.json` per npm package, run _ng-packagr_ for each!
 
 ## Features
 
-* :gift: Implements [Angular Package Format](https://docs.google.com/document/d/1CZC2rcpxffTDfRDs6p1cfbmKNLA6x5O-NtkJglDaBVs/preview)
+* :gift: Implements [Angular Package Format](https://angular.io/guide/angular-package-format)
   * :checkered_flag: Bundles your library in FESM2020
   * :school_satchel: npm package can be consumed by [Angular CLI](https://github.com/angular/angular-cli), [Webpack](https://github.com/webpack/webpack), or [SystemJS](https://github.com/systemjs/systemjs)
   * :dancer: Creates type definitions (`.d.ts`)
@@ -100,7 +100,7 @@ Create one `package.json` per npm package, run _ng-packagr_ for each!
 
 ## Knowledge
 
-[Angular Package Format v12.0](https://docs.google.com/document/d/1CZC2rcpxffTDfRDs6p1cfbmKNLA6x5O-NtkJglDaBVs/preview), design document at Google Docs
+[Angular Package Format documentation](https://angular.io/guide/angular-package-format)
 
 Packaging Angular Libraries - Jason Aden at Angular Mountain View Meetup ([Jan 2018, 45min talk](https://www.youtube.com/watch?v=QfvwQEJVOig&t=3612s))
 

package/cli/main.js

@@ -36,12 +36,14 @@ commander_1.program
     .option('-p, --project [path]', "Path to the 'ng-package.json' or 'package.json' file.", parseProjectPath, DEFAULT_PROJECT_PATH)
     .option('-c, --config [config]', 'Path to a tsconfig file.', (value) => value ? path.resolve(value) : undefined);
 commander_1.program.on('option:version', () => {
-    void (0, public_api_1.version)().then(() => process.exit(0));
+    void version().then(() => process.exit(0));
 });
 commander_1.program.parse(process.argv);
-const { config, project, watch } = commander_1.program.opts();
-(0, public_api_1.execute)(public_api_1.build, { config, project, watch: !!watch }).catch(err => {
-    (0, log_1.error)(err.message);
-    process.exit(1);
-});
+const { config, project, watch, version } = commander_1.program.opts();
+if (!version) {
+    (0, public_api_1.execute)(public_api_1.build, { config, project, watch: !!watch }).catch(err => {
+        (0, 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,yCAAoC;AACpC,2CAA6B;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,mBAAO;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,mBAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAChC,KAAK,IAAA,oBAAO,GAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,mBAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,mBAAO,CAAC,IAAI,EAAE,CAAC;AAClD,IAAA,oBAAO,EAAC,kBAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;IAC9D,IAAA,WAAK,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC","sourcesContent":["#!/usr/bin/env node\n\nimport { 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  void version().then(() => 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"]}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAEA,yCAAoC;AACpC,2CAA6B;AAC7B,0CAAyC;AACzC,8CAA+C;AAE/C,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,mBAAO;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,mBAAO,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAChC,KAAK,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,mBAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAE5B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,mBAAO,CAAC,IAAI,EAAE,CAAC;AAE3D,IAAI,CAAC,OAAO,EAAE;IACZ,IAAA,oBAAO,EAAC,kBAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;QAC9D,IAAA,WAAK,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;CACJ","sourcesContent":["#!/usr/bin/env node\n\nimport { program } from 'commander';\nimport * as path from 'path';\nimport { error } from '../lib/utils/log';\nimport { build, execute } 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  void version().then(() => process.exit(0));\n});\n\nprogram.parse(process.argv);\n\nconst { config, project, watch, version } = program.opts();\n\nif (!version) {\n  execute(build, { config, project, watch: !!watch }).catch(err => {\n    error(err.message);\n    process.exit(1);\n  });\n}\n"]}

package/lib/commands/version.command.js

@@ -12,7 +12,7 @@ const ng_compiler_cli_1 = require("../utils/ng-compiler-cli");
  */
 const version = async () => {
     (0, log_1.msg)(`ng-packagr:            ` + require('../../package.json').version);
-    (0, log_1.msg)(`@angular/compiler:     ` + (await (0, ng_compiler_cli_1.ngCompilerCli)()).VERSION);
+    (0, log_1.msg)(`@angular/compiler:     ` + (await (0, ng_compiler_cli_1.ngCompilerCli)()).VERSION.full);
     (0, log_1.msg)(`rollup:                ` + rollup_1.VERSION);
     (0, log_1.msg)(`typescript:            ` + typescript_1.version);
 };

package/lib/commands/version.command.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.command.js","sourceRoot":"","sources":["../../../src/lib/commands/version.command.ts"],"names":[],"mappings":";;;AAAA,mCAAmD;AACnD,2CAAmD;AACnD,sCAAmC;AACnC,8DAAyD;AAGzD;;;;GAIG;AACI,MAAM,OAAO,GAAgC,KAAK,IAAI,EAAE;IAC7D,IAAA,SAAG,EAAC,yBAAyB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC;IACvE,IAAA,SAAG,EAAC,yBAAyB,GAAG,CAAC,MAAM,IAAA,+BAAa,GAAE,CAAC,CAAC,OAAO,CAAC,CAAC;IACjE,IAAA,SAAG,EAAC,yBAAyB,GAAG,gBAAc,CAAC,CAAC;IAChD,IAAA,SAAG,EAAC,yBAAyB,GAAG,oBAAU,CAAC,CAAC;AAC9C,CAAC,CAAC;AALW,QAAA,OAAO,WAKlB","sourcesContent":["import { VERSION as ROLLUP_VERSION } from 'rollup';\nimport { version as TS_VERSION } from 'typescript';\nimport { msg } from '../utils/log';\nimport { ngCompilerCli } from '../utils/ng-compiler-cli';\nimport { Command } from './command';\n\n/**\n * Prints version information.\n *\n * @stable\n */\nexport const version: Command<any, Promise<void>> = async () => {\n  msg(`ng-packagr:            ` + require('../../package.json').version);\n  msg(`@angular/compiler:     ` + (await ngCompilerCli()).VERSION);\n  msg(`rollup:                ` + ROLLUP_VERSION);\n  msg(`typescript:            ` + TS_VERSION);\n};\n"]}
+{"version":3,"file":"version.command.js","sourceRoot":"","sources":["../../../src/lib/commands/version.command.ts"],"names":[],"mappings":";;;AAAA,mCAAmD;AACnD,2CAAmD;AACnD,sCAAmC;AACnC,8DAAyD;AAGzD;;;;GAIG;AACI,MAAM,OAAO,GAAgC,KAAK,IAAI,EAAE;IAC7D,IAAA,SAAG,EAAC,yBAAyB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC;IACvE,IAAA,SAAG,EAAC,yBAAyB,GAAG,CAAC,MAAM,IAAA,+BAAa,GAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,IAAA,SAAG,EAAC,yBAAyB,GAAG,gBAAc,CAAC,CAAC;IAChD,IAAA,SAAG,EAAC,yBAAyB,GAAG,oBAAU,CAAC,CAAC;AAC9C,CAAC,CAAC;AALW,QAAA,OAAO,WAKlB","sourcesContent":["import { VERSION as ROLLUP_VERSION } from 'rollup';\nimport { version as TS_VERSION } from 'typescript';\nimport { msg } from '../utils/log';\nimport { ngCompilerCli } from '../utils/ng-compiler-cli';\nimport { Command } from './command';\n\n/**\n * Prints version information.\n *\n * @stable\n */\nexport const version: Command<any, Promise<void>> = async () => {\n  msg(`ng-packagr:            ` + require('../../package.json').version);\n  msg(`@angular/compiler:     ` + (await ngCompilerCli()).VERSION.full);\n  msg(`rollup:                ` + ROLLUP_VERSION);\n  msg(`typescript:            ` + TS_VERSION);\n};\n"]}

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

@@ -1,3 +1,4 @@
+import * as chokidar from 'chokidar';
 import { Observable } from 'rxjs';
 declare type AllFileWatchEvents = 'change' | 'unlink' | 'add' | 'unlinkDir' | 'addDir';
 export declare type FileWatchEvent = Exclude<AllFileWatchEvents, 'unlinkDir' | 'addDir'>;
@@ -5,5 +6,8 @@ export interface FileChangedEvent {
     filePath: string;
     event: FileWatchEvent;
 }
-export declare function createFileWatch(projectPath: string, ignoredPaths?: (RegExp | string)[]): Observable<FileChangedEvent>;
+export declare function createFileWatch(basePaths: string | string[], ignoredPaths?: (RegExp | string)[]): {
+    watcher: chokidar.FSWatcher;
+    onFileChange: Observable<FileChangedEvent>;
+};
 export {};

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

@@ -21,19 +21,27 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFileWatch = void 0;
 const chokidar = __importStar(require("chokidar"));
+const os_1 = require("os");
 const path = __importStar(require("path"));
 const rxjs_1 = require("rxjs");
 const log = __importStar(require("../utils/log"));
 const path_1 = require("../utils/path");
-function createFileWatch(projectPath, ignoredPaths = []) {
-    log.debug(`Watching for changes: projectPath: ${projectPath}, ignoredPaths: ${ignoredPaths}`);
-    const watch = chokidar.watch(projectPath, {
+function createFileWatch(basePaths, ignoredPaths = []) {
+    log.debug(`Watching for changes: basePath: ${basePaths}, ignoredPaths: ${ignoredPaths}`);
+    const watch = chokidar.watch([], {
         ignoreInitial: true,
-        ignored: [...ignoredPaths, /((^[/\\])\..)|(\.mjs$)|(\.map$)|(\.metadata\.json|node_modules)/],
+        ignored: [...ignoredPaths, /\.map$/],
         persistent: true,
     });
+    const isLinux = (0, os_1.platform)() === 'linux';
     const handleFileChange = (event, filePath, observer) => {
         log.debug(`Watch: Path changed. Event: ${event}, Path: ${filePath}`);
+        if (isLinux) {
+            // Workaround for Linux where chokidar will not handle future events
+            // for files that were unlinked and immediately recreated.
+            watch.unwatch(filePath);
+            watch.add(filePath);
+        }
         if (event === 'unlinkDir' || event === 'addDir') {
             // we don't need to trigger on directory removed or renamed as chokidar will fire the changes for each file
             return;
@@ -43,10 +51,13 @@ function createFileWatch(projectPath, ignoredPaths = []) {
             event,
         });
     };
-    return rxjs_1.Observable.create((observer) => {
-        watch.on('all', (event, filePath) => handleFileChange(event, filePath, observer));
-        return () => watch.close();
-    });
+    return {
+        watcher: watch,
+        onFileChange: new rxjs_1.Observable(observer => {
+            watch.on('all', (event, filePath) => handleFileChange(event, filePath, observer));
+            return () => watch.close();
+        }),
+    };
 }
 exports.createFileWatch = createFileWatch;
 //# sourceMappingURL=file-watcher.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"file-watcher.js","sourceRoot":"","sources":["../../../src/lib/file-system/file-watcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AACrC,2CAA6B;AAC7B,+BAA4C;AAC5C,kDAAoC;AACpC,wCAA+C;AAU/C,SAAgB,eAAe,CAC7B,WAAmB,EACnB,eAAoC,EAAE;IAEtC,GAAG,CAAC,KAAK,CAAC,sCAAsC,WAAW,mBAAmB,YAAY,EAAE,CAAC,CAAC;IAE9F,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE;QACxC,aAAa,EAAE,IAAI;QACnB,OAAO,EAAE,CAAC,GAAG,YAAY,EAAE,iEAAiE,CAAC;QAC7F,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,CAAC,KAAyB,EAAE,QAAgB,EAAE,QAAoC,EAAE,EAAE;QAC7G,GAAG,CAAC,KAAK,CAAC,+BAA+B,KAAK,WAAW,QAAQ,EAAE,CAAC,CAAC;QAErE,IAAI,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC/C,2GAA2G;YAC3G,OAAO;SACR;QAED,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,IAAA,qBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAChD,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,OAAO,iBAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAyB,EAAE,QAAgB,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAE9G,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC;AA/BD,0CA+BC","sourcesContent":["import * as chokidar from 'chokidar';\nimport * as path from 'path';\nimport { Observable, Observer } from 'rxjs';\nimport * as log from '../utils/log';\nimport { ensureUnixPath } from '../utils/path';\n\ntype AllFileWatchEvents = 'change' | 'unlink' | 'add' | 'unlinkDir' | 'addDir';\nexport type FileWatchEvent = Exclude<AllFileWatchEvents, 'unlinkDir' | 'addDir'>;\n\nexport interface FileChangedEvent {\n  filePath: string;\n  event: FileWatchEvent;\n}\n\nexport function createFileWatch(\n  projectPath: string,\n  ignoredPaths: (RegExp | string)[] = [],\n): Observable<FileChangedEvent> {\n  log.debug(`Watching for changes: projectPath: ${projectPath}, ignoredPaths: ${ignoredPaths}`);\n\n  const watch = chokidar.watch(projectPath, {\n    ignoreInitial: true,\n    ignored: [...ignoredPaths, /((^[/\\\\])\\..)|(\\.mjs$)|(\\.map$)|(\\.metadata\\.json|node_modules)/],\n    persistent: true,\n  });\n\n  const handleFileChange = (event: AllFileWatchEvents, filePath: string, observer: Observer<FileChangedEvent>) => {\n    log.debug(`Watch: Path changed. Event: ${event}, Path: ${filePath}`);\n\n    if (event === 'unlinkDir' || event === 'addDir') {\n      // we don't need to trigger on directory removed or renamed as chokidar will fire the changes for each file\n      return;\n    }\n\n    observer.next({\n      filePath: ensureUnixPath(path.resolve(filePath)),\n      event,\n    });\n  };\n\n  return Observable.create((observer) => {\n    watch.on('all', (event: AllFileWatchEvents, filePath: string) => handleFileChange(event, filePath, observer));\n\n    return () => watch.close();\n  });\n}\n"]}
+{"version":3,"file":"file-watcher.js","sourceRoot":"","sources":["../../../src/lib/file-system/file-watcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAqC;AACrC,2BAA8B;AAC9B,2CAA6B;AAC7B,+BAA4C;AAC5C,kDAAoC;AACpC,wCAA+C;AAU/C,SAAgB,eAAe,CAC7B,SAA4B,EAC5B,eAAoC,EAAE;IAKtC,GAAG,CAAC,KAAK,CAAC,mCAAmC,SAAS,mBAAmB,YAAY,EAAE,CAAC,CAAC;IAEzF,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE;QAC/B,aAAa,EAAE,IAAI;QACnB,OAAO,EAAE,CAAC,GAAG,YAAY,EAAE,QAAQ,CAAC;QACpC,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC;IACvC,MAAM,gBAAgB,GAAG,CAAC,KAAyB,EAAE,QAAgB,EAAE,QAAoC,EAAE,EAAE;QAC7G,GAAG,CAAC,KAAK,CAAC,+BAA+B,KAAK,WAAW,QAAQ,EAAE,CAAC,CAAC;QAErE,IAAI,OAAO,EAAE;YACX,oEAAoE;YACpE,0DAA0D;YAC1D,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACxB,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;SACrB;QAED,IAAI,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC/C,2GAA2G;YAC3G,OAAO;SACR;QAED,QAAQ,CAAC,IAAI,CAAC;YACZ,QAAQ,EAAE,IAAA,qBAAc,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAChD,KAAK;SACN,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,OAAO;QACL,OAAO,EAAE,KAAK;QACd,YAAY,EAAE,IAAI,iBAAU,CAAC,QAAQ,CAAC,EAAE;YACtC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAyB,EAAE,QAAgB,EAAE,EAAE,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;YAE9G,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC7B,CAAC,CAAC;KACH,CAAC;AACJ,CAAC;AA7CD,0CA6CC","sourcesContent":["import * as chokidar from 'chokidar';\nimport { platform } from 'os';\nimport * as path from 'path';\nimport { Observable, Observer } from 'rxjs';\nimport * as log from '../utils/log';\nimport { ensureUnixPath } from '../utils/path';\n\ntype AllFileWatchEvents = 'change' | 'unlink' | 'add' | 'unlinkDir' | 'addDir';\nexport type FileWatchEvent = Exclude<AllFileWatchEvents, 'unlinkDir' | 'addDir'>;\n\nexport interface FileChangedEvent {\n  filePath: string;\n  event: FileWatchEvent;\n}\n\nexport function createFileWatch(\n  basePaths: string | string[],\n  ignoredPaths: (RegExp | string)[] = [],\n): {\n  watcher: chokidar.FSWatcher;\n  onFileChange: Observable<FileChangedEvent>;\n} {\n  log.debug(`Watching for changes: basePath: ${basePaths}, ignoredPaths: ${ignoredPaths}`);\n\n  const watch = chokidar.watch([], {\n    ignoreInitial: true,\n    ignored: [...ignoredPaths, /\\.map$/],\n    persistent: true,\n  });\n\n  const isLinux = platform() === 'linux';\n  const handleFileChange = (event: AllFileWatchEvents, filePath: string, observer: Observer<FileChangedEvent>) => {\n    log.debug(`Watch: Path changed. Event: ${event}, Path: ${filePath}`);\n\n    if (isLinux) {\n      // Workaround for Linux where chokidar will not handle future events\n      // for files that were unlinked and immediately recreated.\n      watch.unwatch(filePath);\n      watch.add(filePath);\n    }\n\n    if (event === 'unlinkDir' || event === 'addDir') {\n      // we don't need to trigger on directory removed or renamed as chokidar will fire the changes for each file\n      return;\n    }\n\n    observer.next({\n      filePath: ensureUnixPath(path.resolve(filePath)),\n      event,\n    });\n  };\n\n  return {\n    watcher: watch,\n    onFileChange: new Observable(observer => {\n      watch.on('all', (event: AllFileWatchEvents, filePath: string) => handleFileChange(event, filePath, observer));\n\n      return () => watch.close();\n    }),\n  };\n}\n"]}

package/lib/flatten/downlevel-plugin.d.ts

@@ -2,4 +2,4 @@ import { TransformResult } from 'rollup';
 /**
  * Downlevels a .js file from `ES2015` to `ES2015`. Internally, uses `tsc`.
  */
-export declare function downlevelCodeWithTsc(code: string, filePath: string, cacheDirectory?: false | string): Promise<TransformResult>;
+export declare function downlevelCodeWithTsc(code: string, filePath: string): Promise<TransformResult>;

package/lib/flatten/downlevel-plugin.js

@@ -22,7 +22,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.downlevelCodeWithTsc = void 0;
 const path = __importStar(require("path"));
 const typescript_1 = require("typescript");
-const cache_1 = require("../utils/cache");
 const log = __importStar(require("../utils/log"));
 /**
  * Base `tsc` `CompilerOptions` shared among various downleveling methods.
@@ -39,15 +38,8 @@ const COMPILER_OPTIONS = {
 /**
  * Downlevels a .js file from `ES2015` to `ES2015`. Internally, uses `tsc`.
  */
-async function downlevelCodeWithTsc(code, filePath, cacheDirectory) {
+async function downlevelCodeWithTsc(code, filePath) {
     log.debug(`tsc ${filePath}`);
-    const key = (0, cache_1.generateKey)(code);
-    if (cacheDirectory) {
-        const result = await (0, cache_1.readCacheEntry)(cacheDirectory, key);
-        if (result) {
-            return result;
-        }
-    }
     const compilerOptions = {
         ...COMPILER_OPTIONS,
         mapRoot: path.dirname(filePath),
@@ -55,12 +47,6 @@ async function downlevelCodeWithTsc(code, filePath, cacheDirectory) {
     const { outputText, sourceMapText } = (0, typescript_1.transpileModule)(code, {
         compilerOptions,
     });
-    if (cacheDirectory) {
-        await (0, cache_1.saveCacheEntry)(cacheDirectory, key, JSON.stringify({
-            code: outputText,
-            map: sourceMapText,
-        }));
-    }
     return {
         code: outputText,
         map: JSON.parse(sourceMapText),

package/lib/flatten/downlevel-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"downlevel-plugin.js","sourceRoot":"","sources":["../../../src/lib/flatten/downlevel-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAE7B,2CAA8G;AAE9G,0CAA6E;AAC7E,kDAAoC;AAEpC;;GAEG;AACH,MAAM,gBAAgB,GAAoB;IACxC,MAAM,EAAE,yBAAY,CAAC,MAAM;IAC3B,MAAM,EAAE,uBAAU,CAAC,MAAM;IACzB,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,gBAAgB,EAAE,iCAAoB,CAAC,OAAO;CAC/C,CAAC;AAEF;;GAEG;AACI,KAAK,UAAU,oBAAoB,CACxC,IAAY,EACZ,QAAgB,EAChB,cAA+B;IAE/B,GAAG,CAAC,KAAK,CAAC,OAAO,QAAQ,EAAE,CAAC,CAAC;IAE7B,MAAM,GAAG,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,cAAc,EAAE;QAClB,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAc,EAAC,cAAc,EAAE,GAAG,CAAC,CAAC;QACzD,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAC;SACf;KACF;IAED,MAAM,eAAe,GAAoB;QACvC,GAAG,gBAAgB;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;KAChC,CAAC;IAEF,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC,IAAI,EAAE;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,IAAI,cAAc,EAAE;QAClB,MAAM,IAAA,sBAAc,EAClB,cAAc,EACd,GAAG,EACH,IAAI,CAAC,SAAS,CAAC;YACb,IAAI,EAAE,UAAU;YAChB,GAAG,EAAE,aAAa;SACnB,CAAC,CACH,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;KAC/B,CAAC;AACJ,CAAC;AAvCD,oDAuCC","sourcesContent":["import * as path from 'path';\nimport { TransformResult } from 'rollup';\nimport { CompilerOptions, ModuleKind, ModuleResolutionKind, ScriptTarget, transpileModule } from 'typescript';\n\nimport { generateKey, readCacheEntry, saveCacheEntry } from '../utils/cache';\nimport * as log from '../utils/log';\n\n/**\n * Base `tsc` `CompilerOptions` shared among various downleveling methods.\n */\nconst COMPILER_OPTIONS: CompilerOptions = {\n  target: ScriptTarget.ES2015,\n  module: ModuleKind.ESNext,\n  allowJs: true,\n  sourceMap: true,\n  importHelpers: true,\n  downlevelIteration: true,\n  moduleResolution: ModuleResolutionKind.Classic,\n};\n\n/**\n * Downlevels a .js file from `ES2015` to `ES2015`. Internally, uses `tsc`.\n */\nexport async function downlevelCodeWithTsc(\n  code: string,\n  filePath: string,\n  cacheDirectory?: false | string,\n): Promise<TransformResult> {\n  log.debug(`tsc ${filePath}`);\n\n  const key = generateKey(code);\n  if (cacheDirectory) {\n    const result = await readCacheEntry(cacheDirectory, key);\n    if (result) {\n      return result;\n    }\n  }\n\n  const compilerOptions: CompilerOptions = {\n    ...COMPILER_OPTIONS,\n    mapRoot: path.dirname(filePath),\n  };\n\n  const { outputText, sourceMapText } = transpileModule(code, {\n    compilerOptions,\n  });\n\n  if (cacheDirectory) {\n    await saveCacheEntry(\n      cacheDirectory,\n      key,\n      JSON.stringify({\n        code: outputText,\n        map: sourceMapText,\n      }),\n    );\n  }\n\n  return {\n    code: outputText,\n    map: JSON.parse(sourceMapText),\n  };\n}\n"]}
+{"version":3,"file":"downlevel-plugin.js","sourceRoot":"","sources":["../../../src/lib/flatten/downlevel-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAE7B,2CAA8G;AAE9G,kDAAoC;AAEpC;;GAEG;AACH,MAAM,gBAAgB,GAAoB;IACxC,MAAM,EAAE,yBAAY,CAAC,MAAM;IAC3B,MAAM,EAAE,uBAAU,CAAC,MAAM;IACzB,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,IAAI;IACf,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,gBAAgB,EAAE,iCAAoB,CAAC,OAAO;CAC/C,CAAC;AAEF;;GAEG;AACI,KAAK,UAAU,oBAAoB,CAAC,IAAY,EAAE,QAAgB;IACvE,GAAG,CAAC,KAAK,CAAC,OAAO,QAAQ,EAAE,CAAC,CAAC;IAC7B,MAAM,eAAe,GAAoB;QACvC,GAAG,gBAAgB;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;KAChC,CAAC;IAEF,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC,IAAI,EAAE;QAC1D,eAAe;KAChB,CAAC,CAAC;IAEH,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;KAC/B,CAAC;AACJ,CAAC;AAfD,oDAeC","sourcesContent":["import * as path from 'path';\nimport { TransformResult } from 'rollup';\nimport { CompilerOptions, ModuleKind, ModuleResolutionKind, ScriptTarget, transpileModule } from 'typescript';\n\nimport * as log from '../utils/log';\n\n/**\n * Base `tsc` `CompilerOptions` shared among various downleveling methods.\n */\nconst COMPILER_OPTIONS: CompilerOptions = {\n  target: ScriptTarget.ES2015,\n  module: ModuleKind.ESNext,\n  allowJs: true,\n  sourceMap: true,\n  importHelpers: true,\n  downlevelIteration: true,\n  moduleResolution: ModuleResolutionKind.Classic,\n};\n\n/**\n * Downlevels a .js file from `ES2015` to `ES2015`. Internally, uses `tsc`.\n */\nexport async function downlevelCodeWithTsc(code: string, filePath: string): Promise<TransformResult> {\n  log.debug(`tsc ${filePath}`);\n  const compilerOptions: CompilerOptions = {\n    ...COMPILER_OPTIONS,\n    mapRoot: path.dirname(filePath),\n  };\n\n  const { outputText, sourceMapText } = transpileModule(code, {\n    compilerOptions,\n  });\n\n  return {\n    code: outputText,\n    map: JSON.parse(sourceMapText),\n  };\n}\n"]}

package/lib/flatten/rollup.d.ts

@@ -1,5 +1,6 @@
 import * as rollup from 'rollup';
 import { TransformHook } from 'rollup';
+import { OutputFileCache } from '../ng-package/nodes';
 /**
  * Options used in `ng-packagr` for writing flat bundle files.
  *
@@ -12,6 +13,13 @@ export interface RollupOptions {
     sourceRoot: string;
     transform?: TransformHook;
     cache?: rollup.RollupCache;
+    cacheDirectory?: string | false;
+    fileCache: OutputFileCache;
+    cacheKey: string;
 }
 /** Runs rollup over the given entry file, writes a bundle file. */
-export declare function rollupBundleFile(opts: RollupOptions): Promise<rollup.RollupCache>;
+export declare function rollupBundleFile(opts: RollupOptions): Promise<{
+    cache: rollup.RollupCache;
+    code: string;
+    map: rollup.SourceMap;
+}>;

package/lib/flatten/rollup.js

@@ -23,39 +23,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rollupBundleFile = void 0;
-const plugin_commonjs_1 = __importDefault(require("@rollup/plugin-commonjs"));
 const plugin_json_1 = __importDefault(require("@rollup/plugin-json"));
 const plugin_node_resolve_1 = __importDefault(require("@rollup/plugin-node-resolve"));
 const path = __importStar(require("path"));
 const rollup = __importStar(require("rollup"));
 const rollup_plugin_sourcemaps_1 = __importDefault(require("rollup-plugin-sourcemaps"));
+const cache_1 = require("../utils/cache");
 const log = __importStar(require("../utils/log"));
+const path_1 = require("../utils/path");
 /** Runs rollup over the given entry file, writes a bundle file. */
 async function rollupBundleFile(opts) {
+    var _a;
     log.debug(`rollup (v${rollup.VERSION}) ${opts.entry} to ${opts.dest}`);
+    const cacheDirectory = opts.cacheDirectory;
     // Create the bundle
     const bundle = await rollup.rollup({
         context: 'this',
         external: moduleId => isExternalDependency(moduleId),
         inlineDynamicImports: false,
-        cache: opts.cache,
+        cache: (_a = opts.cache) !== null && _a !== void 0 ? _a : (cacheDirectory ? await (0, cache_1.readCacheEntry)(cacheDirectory, opts.cacheKey) : undefined),
         input: opts.entry,
         plugins: [
-            (0, plugin_json_1.default)(),
             (0, plugin_node_resolve_1.default)(),
-            (0, plugin_commonjs_1.default)(),
-            (0, rollup_plugin_sourcemaps_1.default)(),
+            (0, rollup_plugin_sourcemaps_1.default)({
+                readFile: (path, callback) => {
+                    const fileData = opts.fileCache.get((0, path_1.ensureUnixPath)(path));
+                    callback(fileData ? null : new Error(`Could not load '${path}' from memory.`), fileData === null || fileData === void 0 ? void 0 : fileData.content);
+                },
+            }),
+            (0, plugin_json_1.default)(),
             opts.transform ? { transform: opts.transform, name: 'downlevel-ts' } : undefined,
         ],
         onwarn: warning => {
-            if (typeof warning === 'string') {
-                log.warn(warning);
-            }
-            else {
-                if (warning.code === 'THIS_IS_UNDEFINED') {
-                    return;
-                }
-                log.warn(warning.message);
+            switch (warning.code) {
+                case 'UNUSED_EXTERNAL_IMPORT':
+                case 'THIS_IS_UNDEFINED':
+                    break;
+                default:
+                    log.warn(warning.message);
+                    break;
             }
         },
         preserveSymlinks: true,
@@ -64,14 +70,22 @@ async function rollupBundleFile(opts) {
         treeshake: false,
     });
     // Output the bundle to disk
-    await bundle.write({
+    const output = await bundle.write({
         name: opts.moduleName,
         format: 'es',
         file: opts.dest,
         banner: '',
         sourcemap: true,
     });
-    return bundle.cache;
+    if (cacheDirectory) {
+        await (0, cache_1.saveCacheEntry)(cacheDirectory, opts.cacheKey, JSON.stringify(bundle.cache));
+    }
+    const { code, map } = output.output[0];
+    return {
+        code,
+        map,
+        cache: bundle.cache,
+    };
 }
 exports.rollupBundleFile = rollupBundleFile;
 function isExternalDependency(moduleId) {

package/lib/flatten/rollup.js.map

@@ -1 +1 @@
-{"version":3,"file":"rollup.js","sourceRoot":"","sources":["../../../src/lib/flatten/rollup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8EAA+C;AAC/C,sEAA6C;AAC7C,sFAAsD;AACtD,2CAA6B;AAC7B,+CAAiC;AAEjC,wFAAkD;AAClD,kDAAoC;AAgBpC,mEAAmE;AAC5D,KAAK,UAAU,gBAAgB,CAAC,IAAmB;IACxD,GAAG,CAAC,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAEvE,oBAAoB;IACpB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACjC,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC;QACpD,oBAAoB,EAAE,KAAK;QAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,OAAO,EAAE;YACP,IAAA,qBAAU,GAAE;YACZ,IAAA,6BAAW,GAAE;YACb,IAAA,yBAAQ,GAAE;YACV,IAAA,kCAAU,GAAE;YACZ,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,SAAS;SACjF;QACD,MAAM,EAAE,OAAO,CAAC,EAAE;YAChB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC/B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACnB;iBAAM;gBACL,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAmB,EAAE;oBACxC,OAAO;iBACR;gBAED,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAC3B;QACH,CAAC;QACD,gBAAgB,EAAE,IAAI;QACtB,8CAA8C;QAC9C,qDAAqD;QACrD,SAAS,EAAE,KAAK;KACjB,CAAC,CAAC;IAEH,4BAA4B;IAC5B,MAAM,MAAM,CAAC,KAAK,CAAC;QACjB,IAAI,EAAE,IAAI,CAAC,UAAU;QACrB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,KAAK,CAAC;AACtB,CAAC;AA5CD,4CA4CC;AAED,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,oEAAoE;IACpE,yFAAyF;IACzF,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QACrF,yGAAyG;QACzG,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import commonJs from '@rollup/plugin-commonjs';\nimport rollupJson from '@rollup/plugin-json';\nimport nodeResolve from '@rollup/plugin-node-resolve';\nimport * as path from 'path';\nimport * as rollup from 'rollup';\nimport { TransformHook } from 'rollup';\nimport sourcemaps from 'rollup-plugin-sourcemaps';\nimport * as log from '../utils/log';\n\n/**\n * Options used in `ng-packagr` for writing flat bundle files.\n *\n * These options are passed through to rollup.\n */\nexport interface RollupOptions {\n  moduleName: string;\n  entry: string;\n  dest: string;\n  sourceRoot: string;\n  transform?: TransformHook;\n  cache?: rollup.RollupCache;\n}\n\n/** Runs rollup over the given entry file, writes a bundle file. */\nexport async function rollupBundleFile(opts: RollupOptions): Promise<rollup.RollupCache> {\n  log.debug(`rollup (v${rollup.VERSION}) ${opts.entry} to ${opts.dest}`);\n\n  // Create the bundle\n  const bundle = await rollup.rollup({\n    context: 'this',\n    external: moduleId => isExternalDependency(moduleId),\n    inlineDynamicImports: false,\n    cache: opts.cache,\n    input: opts.entry,\n    plugins: [\n      rollupJson(),\n      nodeResolve(),\n      commonJs(),\n      sourcemaps(),\n      opts.transform ? { transform: opts.transform, name: 'downlevel-ts' } : undefined,\n    ],\n    onwarn: warning => {\n      if (typeof warning === 'string') {\n        log.warn(warning);\n      } else {\n        if (warning.code === 'THIS_IS_UNDEFINED') {\n          return;\n        }\n\n        log.warn(warning.message);\n      }\n    },\n    preserveSymlinks: true,\n    // Disable treeshaking when generating bundles\n    // see: https://github.com/angular/angular/pull/32069\n    treeshake: false,\n  });\n\n  // Output the bundle to disk\n  await bundle.write({\n    name: opts.moduleName,\n    format: 'es',\n    file: opts.dest,\n    banner: '',\n    sourcemap: true,\n  });\n\n  return bundle.cache;\n}\n\nfunction isExternalDependency(moduleId: string): boolean {\n  // more information about why we don't check for 'node_modules' path\n  // https://github.com/rollup/rollup-plugin-node-resolve/issues/110#issuecomment-350353632\n  if (moduleId.startsWith('.') || moduleId.startsWith('/') || path.isAbsolute(moduleId)) {\n    // if it's either 'absolute', marked to embed, starts with a '.' or '/' or is the umd bundle and is tslib\n    return false;\n  }\n\n  return true;\n}\n"]}
+{"version":3,"file":"rollup.js","sourceRoot":"","sources":["../../../src/lib/flatten/rollup.ts"],"names":[],"mappings":"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","sourcesContent":["import rollupJson from '@rollup/plugin-json';\nimport nodeResolve from '@rollup/plugin-node-resolve';\nimport * as path from 'path';\nimport * as rollup from 'rollup';\nimport { TransformHook } from 'rollup';\nimport sourcemaps from 'rollup-plugin-sourcemaps';\nimport { OutputFileCache } from '../ng-package/nodes';\nimport { readCacheEntry, saveCacheEntry } from '../utils/cache';\nimport * as log from '../utils/log';\nimport { ensureUnixPath } from '../utils/path';\n\n/**\n * Options used in `ng-packagr` for writing flat bundle files.\n *\n * These options are passed through to rollup.\n */\nexport interface RollupOptions {\n  moduleName: string;\n  entry: string;\n  dest: string;\n  sourceRoot: string;\n  transform?: TransformHook;\n  cache?: rollup.RollupCache;\n  cacheDirectory?: string | false;\n  fileCache: OutputFileCache;\n  cacheKey: string;\n}\n\n/** Runs rollup over the given entry file, writes a bundle file. */\nexport async function rollupBundleFile(\n  opts: RollupOptions,\n): Promise<{ cache: rollup.RollupCache; code: string; map: rollup.SourceMap }> {\n  log.debug(`rollup (v${rollup.VERSION}) ${opts.entry} to ${opts.dest}`);\n\n  const cacheDirectory = opts.cacheDirectory;\n\n  // Create the bundle\n  const bundle = await rollup.rollup({\n    context: 'this',\n    external: moduleId => isExternalDependency(moduleId),\n    inlineDynamicImports: false,\n    cache: opts.cache ?? (cacheDirectory ? await readCacheEntry(cacheDirectory, opts.cacheKey) : undefined),\n    input: opts.entry,\n    plugins: [\n      nodeResolve(),\n      sourcemaps({\n        readFile: (path: string, callback: (error: Error | null, data: Buffer | string) => void) => {\n          const fileData = opts.fileCache.get(ensureUnixPath(path));\n          callback(fileData ? null : new Error(`Could not load '${path}' from memory.`), fileData?.content);\n        },\n      }),\n      rollupJson(),\n      opts.transform ? { transform: opts.transform, name: 'downlevel-ts' } : undefined,\n    ],\n    onwarn: warning => {\n      switch (warning.code) {\n        case 'UNUSED_EXTERNAL_IMPORT':\n        case 'THIS_IS_UNDEFINED':\n          break;\n\n        default:\n          log.warn(warning.message);\n          break;\n      }\n    },\n    preserveSymlinks: true,\n    // Disable treeshaking when generating bundles\n    // see: https://github.com/angular/angular/pull/32069\n    treeshake: false,\n  });\n\n  // Output the bundle to disk\n  const output = await bundle.write({\n    name: opts.moduleName,\n    format: 'es',\n    file: opts.dest,\n    banner: '',\n    sourcemap: true,\n  });\n\n  if (cacheDirectory) {\n    await saveCacheEntry(cacheDirectory, opts.cacheKey, JSON.stringify(bundle.cache));\n  }\n\n  const { code, map } = output.output[0];\n\n  return {\n    code,\n    map,\n    cache: bundle.cache,\n  };\n}\n\nfunction isExternalDependency(moduleId: string): boolean {\n  // more information about why we don't check for 'node_modules' path\n  // https://github.com/rollup/rollup-plugin-node-resolve/issues/110#issuecomment-350353632\n  if (moduleId.startsWith('.') || moduleId.startsWith('/') || path.isAbsolute(moduleId)) {\n    // if it's either 'absolute', marked to embed, starts with a '.' or '/' or is the umd bundle and is tslib\n    return false;\n  }\n\n  return true;\n}\n"]}

package/lib/graph/build-graph.d.ts

@@ -1,3 +1,4 @@
+import { FSWatcher } from 'chokidar';
 import { Node } from './node';
 export declare type SimplePredicate<T = Node> = {
     (value: T, index: number): boolean;
@@ -18,6 +19,7 @@ export interface Traversable<T> {
  */
 export declare class BuildGraph implements Traversable<Node> {
     private store;
+    watcher?: FSWatcher;
     put(value: Node | Node[]): this;
     private insert;
     get(url: string): Node;

package/lib/graph/build-graph.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildGraph = void 0;
+const nodes_1 = require("../ng-package/nodes");
 /**
  * A tree of source files. Eventually, it's a graph. Ideally, it's an acyclic directed graph.
  * Technically, it's implemented as a map-like collection with references between map entries.
@@ -24,6 +25,9 @@ class BuildGraph {
             const oldNode = this.store.get(node.url);
             oldNode['_dependees'].delete(oldNode);
         }
+        if (this.watcher && node.url.startsWith(nodes_1.URL_PROTOCOL_FILE)) {
+            this.watcher.add(node.url.substr(nodes_1.URL_PROTOCOL_FILE.length));
+        }
         this.store.set(node.url, node);
     }
     get(url) {

package/lib/graph/build-graph.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-graph.js","sourceRoot":"","sources":["../../../src/lib/graph/build-graph.ts"],"names":[],"mappings":";;;AAoBA;;;GAGG;AACH,MAAa,UAAU;IAAvB;QACU,UAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;IAmD1C,CAAC;IAjDQ,GAAG,CAAC,KAAoB;QAC7B,IAAI,KAAK,YAAY,KAAK,EAAE;YAC1B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1C;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACpB;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,IAAU;QACvB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC5B,+BAA+B;YAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SACvC;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAEM,GAAG,CAAC,GAAW;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAEM,GAAG,CAAC,GAAW;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAEM,OAAO;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAEnC,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAEM,IAAI,CAAC,EAAmB;QAC7B,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAwB,EAA6B;QAChE,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAQ,CAAC;IAC1C,CAAC;IAEM,IAAI,CAAwB,EAA6B;QAC9D,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAkB,CAAC;IAClD,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;CACF;AApDD,gCAoDC","sourcesContent":["import { Node } from './node';\n\nexport type SimplePredicate<T = Node> = {\n  (value: T, index: number): boolean;\n  and?: (criteria: SimplePredicate<T>) => SimplePredicate<T>;\n};\n\nexport type ComplexPredicate<T = Node, R extends T = T> =\n  | SimplePredicate<T>\n  | {\n      (value: T, index: number): value is R;\n      and?: (criteria: ComplexPredicate<T, R>) => ComplexPredicate<T, R>;\n    };\n\nexport interface Traversable<T> {\n  filter<R extends T = T>(by: ComplexPredicate<T, R>): R[];\n  find<R extends T = T>(by: ComplexPredicate<T, R>): R | undefined;\n  some(by: SimplePredicate<T>): boolean;\n}\n\n/**\n * A tree of source files. Eventually, it's a graph. Ideally, it's an acyclic directed graph.\n * Technically, it's implemented as a map-like collection with references between map entries.\n */\nexport class BuildGraph implements Traversable<Node> {\n  private store = new Map<string, Node>();\n\n  public put(value: Node | Node[]) {\n    if (value instanceof Array) {\n      value.forEach(node => this.insert(node));\n    } else {\n      this.insert(value);\n    }\n\n    return this;\n  }\n\n  private insert(node: Node) {\n    if (this.store.has(node.url)) {\n      // Clean up dependee references\n      const oldNode = this.store.get(node.url);\n      oldNode['_dependees'].delete(oldNode);\n    }\n\n    this.store.set(node.url, node);\n  }\n\n  public get(url: string): Node {\n    return this.store.get(url);\n  }\n\n  public has(url: string): boolean {\n    return this.store.has(url);\n  }\n\n  public entries(): Node[] {\n    const values = this.store.values();\n\n    return Array.from(values);\n  }\n\n  public some(by: SimplePredicate): boolean {\n    return this.entries().some(by);\n  }\n\n  public filter<T extends Node = Node>(by: ComplexPredicate<Node, T>): T[] {\n    return this.entries().filter(by) as T[];\n  }\n\n  public find<T extends Node = Node>(by: ComplexPredicate<Node, T>): T | undefined {\n    return this.entries().find(by) as T | undefined;\n  }\n\n  get size(): number {\n    return this.store.size;\n  }\n}\n"]}
+{"version":3,"file":"build-graph.js","sourceRoot":"","sources":["../../../src/lib/graph/build-graph.ts"],"names":[],"mappings":";;;AACA,+CAAwD;AAqBxD;;;GAGG;AACH,MAAa,UAAU;IAAvB;QACU,UAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;IAwD1C,CAAC;IArDQ,GAAG,CAAC,KAAoB;QAC7B,IAAI,KAAK,YAAY,KAAK,EAAE;YAC1B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1C;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACpB;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,IAAU;QACvB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC5B,+BAA+B;YAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SACvC;QAED,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,yBAAiB,CAAC,EAAE;YAC1D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,yBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;SAC7D;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC;IAEM,GAAG,CAAC,GAAW;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAEM,GAAG,CAAC,GAAW;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAEM,OAAO;QACZ,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAEnC,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAEM,IAAI,CAAC,EAAmB;QAC7B,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAEM,MAAM,CAAwB,EAA6B;QAChE,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAQ,CAAC;IAC1C,CAAC;IAEM,IAAI,CAAwB,EAA6B;QAC9D,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAkB,CAAC;IAClD,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;CACF;AAzDD,gCAyDC","sourcesContent":["import { FSWatcher } from 'chokidar';\nimport { URL_PROTOCOL_FILE } from '../ng-package/nodes';\nimport { Node } from './node';\n\nexport type SimplePredicate<T = Node> = {\n  (value: T, index: number): boolean;\n  and?: (criteria: SimplePredicate<T>) => SimplePredicate<T>;\n};\n\nexport type ComplexPredicate<T = Node, R extends T = T> =\n  | SimplePredicate<T>\n  | {\n      (value: T, index: number): value is R;\n      and?: (criteria: ComplexPredicate<T, R>) => ComplexPredicate<T, R>;\n    };\n\nexport interface Traversable<T> {\n  filter<R extends T = T>(by: ComplexPredicate<T, R>): R[];\n  find<R extends T = T>(by: ComplexPredicate<T, R>): R | undefined;\n  some(by: SimplePredicate<T>): boolean;\n}\n\n/**\n * A tree of source files. Eventually, it's a graph. Ideally, it's an acyclic directed graph.\n * Technically, it's implemented as a map-like collection with references between map entries.\n */\nexport class BuildGraph implements Traversable<Node> {\n  private store = new Map<string, Node>();\n  watcher?: FSWatcher;\n\n  public put(value: Node | Node[]) {\n    if (value instanceof Array) {\n      value.forEach(node => this.insert(node));\n    } else {\n      this.insert(value);\n    }\n\n    return this;\n  }\n\n  private insert(node: Node) {\n    if (this.store.has(node.url)) {\n      // Clean up dependee references\n      const oldNode = this.store.get(node.url);\n      oldNode['_dependees'].delete(oldNode);\n    }\n\n    if (this.watcher && node.url.startsWith(URL_PROTOCOL_FILE)) {\n      this.watcher.add(node.url.substr(URL_PROTOCOL_FILE.length));\n    }\n\n    this.store.set(node.url, node);\n  }\n\n  public get(url: string): Node {\n    return this.store.get(url);\n  }\n\n  public has(url: string): boolean {\n    return this.store.has(url);\n  }\n\n  public entries(): Node[] {\n    const values = this.store.values();\n\n    return Array.from(values);\n  }\n\n  public some(by: SimplePredicate): boolean {\n    return this.entries().some(by);\n  }\n\n  public filter<T extends Node = Node>(by: ComplexPredicate<Node, T>): T[] {\n    return this.entries().filter(by) as T[];\n  }\n\n  public find<T extends Node = Node>(by: ComplexPredicate<Node, T>): T | undefined {\n    return this.entries().find(by) as T | undefined;\n  }\n\n  get size(): number {\n    return this.store.size;\n  }\n}\n"]}

package/lib/ng-package/entry-point/write-bundles.transform.js

@@ -5,9 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeBundlesTransform = void 0;
 const ora_1 = __importDefault(require("ora"));
+const path_1 = require("path");
 const downlevel_plugin_1 = require("../../flatten/downlevel-plugin");
 const rollup_1 = require("../../flatten/rollup");
 const transform_1 = require("../../graph/transform");
+const cache_1 = require("../../utils/cache");
+const fs_1 = require("../../utils/fs");
 const nodes_1 = require("../nodes");
 const writeBundlesTransform = (options) => (0, transform_1.transformFromPromise)(async (graph) => {
     const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
@@ -18,15 +21,52 @@ const writeBundlesTransform = (options) => (0, transform_1.transformFromPromise)
         hideCursor: false,
         discardStdin: false,
     });
+    const key = await (0, cache_1.generateKey)(ngEntryPoint.moduleId, esm2020, 'fesm-bundles', tsConfig.options.compilationMode);
+    const hash = await (0, cache_1.generateKey)(...[...cache.outputCache.values()].map(({ version }) => version));
+    const cacheDirectory = options.cacheEnabled && options.cacheDirectory;
+    if (cacheDirectory) {
+        const cacheResult = await (0, cache_1.readCacheEntry)(options.cacheDirectory, key);
+        if ((cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.hash) === hash) {
+            try {
+                spinner.start('Writing FESM bundles');
+                await Promise.all([
+                    (0, fs_1.mkdir)((0, path_1.dirname)(fesm2020), { recursive: true }),
+                    (0, fs_1.mkdir)((0, path_1.dirname)(fesm2015), { recursive: true }),
+                ]);
+                await Promise.all([
+                    (0, fs_1.writeFile)(fesm2020, cacheResult.fesm2020.code),
+                    (0, fs_1.writeFile)(`${fesm2020}.map`, JSON.stringify(cacheResult.fesm2020.map)),
+                    (0, fs_1.writeFile)(fesm2015, cacheResult.fesm2015.code),
+                    (0, fs_1.writeFile)(`${fesm2015}.map`, JSON.stringify(cacheResult.fesm2015.map)),
+                ]);
+                spinner.succeed('Writing FESM bundles');
+            }
+            catch (error) {
+                spinner.fail();
+                throw error;
+            }
+            return;
+        }
+    }
+    const fesmCache = {
+        hash,
+    };
     try {
         spinner.start('Generating FESM2020');
-        const rollupFESMCache = await (0, rollup_1.rollupBundleFile)({
+        const { cache: rollupFESMCache, code, map, } = await (0, rollup_1.rollupBundleFile)({
             sourceRoot: tsConfig.options.sourceRoot,
             entry: esm2020,
             moduleName: ngEntryPoint.moduleId,
             dest: fesm2020,
             cache: cache.rollupFESM2020Cache,
+            cacheDirectory,
+            fileCache: cache.outputCache,
+            cacheKey: await (0, cache_1.generateKey)(esm2020, ngEntryPoint.moduleId, fesm2020, tsConfig.options.compilationMode),
         });
+        fesmCache.fesm2020 = {
+            code,
+            map,
+        };
         spinner.succeed();
         if (options.watch) {
             cache.rollupFESM2020Cache = rollupFESMCache;
@@ -38,14 +78,21 @@ const writeBundlesTransform = (options) => (0, transform_1.transformFromPromise)
     }
     try {
         spinner.start('Generating FESM2015');
-        const rollupFESMCache = await (0, rollup_1.rollupBundleFile)({
+        const { cache: rollupFESMCache, code, map, } = await (0, rollup_1.rollupBundleFile)({
             sourceRoot: tsConfig.options.sourceRoot,
             entry: esm2020,
             moduleName: ngEntryPoint.moduleId,
             dest: fesm2015,
-            transform: (code, id) => (0, downlevel_plugin_1.downlevelCodeWithTsc)(code, id, options.cacheEnabled && options.cacheDirectory),
+            transform: downlevel_plugin_1.downlevelCodeWithTsc,
             cache: cache.rollupFESM2015Cache,
+            cacheDirectory,
+            fileCache: cache.outputCache,
+            cacheKey: await (0, cache_1.generateKey)(esm2020, ngEntryPoint.moduleId, fesm2015, tsConfig.options.compilationMode),
         });
+        fesmCache.fesm2015 = {
+            code,
+            map,
+        };
         spinner.succeed();
         if (options.watch) {
             cache.rollupFESM2015Cache = rollupFESMCache;
@@ -55,6 +102,9 @@ const writeBundlesTransform = (options) => (0, transform_1.transformFromPromise)
         spinner.fail();
         throw error;
     }
+    if (cacheDirectory) {
+        await (0, cache_1.saveCacheEntry)(cacheDirectory, key, JSON.stringify(fesmCache));
+    }
 });
 exports.writeBundlesTransform = writeBundlesTransform;
 //# sourceMappingURL=write-bundles.transform.js.map

package/lib/ng-package/entry-point/write-bundles.transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"write-bundles.transform.js","sourceRoot":"","sources":["../../../../src/lib/ng-package/entry-point/write-bundles.transform.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,qEAAsE;AACtE,iDAAwD;AACxD,qDAA6D;AAC7D,oCAAkE;AAG3D,MAAM,qBAAqB,GAAG,CAAC,OAAyB,EAAE,EAAE,CACjE,IAAA,gCAAoB,EAAC,KAAK,EAAC,KAAK,EAAC,EAAE;IACjC,MAAM,UAAU,GAAmB,KAAK,CAAC,IAAI,CAAC,IAAA,8BAAsB,GAAE,CAAC,CAAC;IACxE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;IACjF,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC;IAEzD,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC;QAClB,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,KAAK;KACpB,CAAC,CAAC;IAEH,IAAI;QACF,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACrC,MAAM,eAAe,GAAG,MAAM,IAAA,yBAAgB,EAAC;YAC7C,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU;YACvC,KAAK,EAAE,OAAO;YACd,UAAU,EAAE,YAAY,CAAC,QAAQ;YACjC,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,KAAK,CAAC,mBAAmB;SACjC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,EAAE,CAAC;QAElB,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,KAAK,CAAC,mBAAmB,GAAG,eAAe,CAAC;SAC7C;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,MAAM,KAAK,CAAC;KACb;IAED,IAAI;QACF,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACrC,MAAM,eAAe,GAAG,MAAM,IAAA,yBAAgB,EAAC;YAC7C,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU;YACvC,KAAK,EAAE,OAAO;YACd,UAAU,EAAE,YAAY,CAAC,QAAQ;YACjC,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,IAAA,uCAAoB,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,cAAc,CAAC;YACvG,KAAK,EAAE,KAAK,CAAC,mBAAmB;SACjC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,EAAE,CAAC;QAElB,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,KAAK,CAAC,mBAAmB,GAAG,eAAe,CAAC;SAC7C;KACF;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,MAAM,KAAK,CAAC;KACb;AACH,CAAC,CAAC,CAAC;AAlDQ,QAAA,qBAAqB,yBAkD7B","sourcesContent":["import ora from 'ora';\nimport { downlevelCodeWithTsc } from '../../flatten/downlevel-plugin';\nimport { rollupBundleFile } from '../../flatten/rollup';\nimport { transformFromPromise } from '../../graph/transform';\nimport { EntryPointNode, isEntryPointInProgress } from '../nodes';\nimport { NgPackagrOptions } from '../options.di';\n\nexport const writeBundlesTransform = (options: NgPackagrOptions) =>\n  transformFromPromise(async graph => {\n    const entryPoint: EntryPointNode = graph.find(isEntryPointInProgress());\n    const { destinationFiles, entryPoint: ngEntryPoint, tsConfig } = entryPoint.data;\n    const cache = entryPoint.cache;\n    const { fesm2020, fesm2015, esm2020 } = destinationFiles;\n\n    const spinner = ora({\n      hideCursor: false,\n      discardStdin: false,\n    });\n\n    try {\n      spinner.start('Generating FESM2020');\n      const rollupFESMCache = await rollupBundleFile({\n        sourceRoot: tsConfig.options.sourceRoot,\n        entry: esm2020,\n        moduleName: ngEntryPoint.moduleId,\n        dest: fesm2020,\n        cache: cache.rollupFESM2020Cache,\n      });\n      spinner.succeed();\n\n      if (options.watch) {\n        cache.rollupFESM2020Cache = rollupFESMCache;\n      }\n    } catch (error) {\n      spinner.fail();\n      throw error;\n    }\n\n    try {\n      spinner.start('Generating FESM2015');\n      const rollupFESMCache = await rollupBundleFile({\n        sourceRoot: tsConfig.options.sourceRoot,\n        entry: esm2020,\n        moduleName: ngEntryPoint.moduleId,\n        dest: fesm2015,\n        transform: (code, id) => downlevelCodeWithTsc(code, id, options.cacheEnabled && options.cacheDirectory),\n        cache: cache.rollupFESM2015Cache,\n      });\n      spinner.succeed();\n\n      if (options.watch) {\n        cache.rollupFESM2015Cache = rollupFESMCache;\n      }\n    } catch (error) {\n      spinner.fail();\n      throw error;\n    }\n  });\n"]}
+{"version":3,"file":"write-bundles.transform.js","sourceRoot":"","sources":["../../../../src/lib/ng-package/entry-point/write-bundles.transform.ts"],"names":[],"mappings":"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","sourcesContent":["import ora from 'ora';\nimport { dirname } from 'path';\nimport { SourceMap } from 'rollup';\nimport { downlevelCodeWithTsc } from '../../flatten/downlevel-plugin';\nimport { rollupBundleFile } from '../../flatten/rollup';\nimport { transformFromPromise } from '../../graph/transform';\nimport { generateKey, readCacheEntry, saveCacheEntry } from '../../utils/cache';\nimport { mkdir, writeFile } from '../../utils/fs';\nimport { EntryPointNode, isEntryPointInProgress } from '../nodes';\nimport { NgPackagrOptions } from '../options.di';\n\ninterface BundlesCache {\n  hash: string;\n  fesm2020: {\n    code: string;\n    map: SourceMap;\n  };\n  fesm2015: {\n    code: string;\n    map: SourceMap;\n  };\n}\n\nexport const writeBundlesTransform = (options: NgPackagrOptions) =>\n  transformFromPromise(async graph => {\n    const entryPoint: EntryPointNode = graph.find(isEntryPointInProgress());\n    const { destinationFiles, entryPoint: ngEntryPoint, tsConfig } = entryPoint.data;\n    const cache = entryPoint.cache;\n    const { fesm2020, fesm2015, esm2020 } = destinationFiles;\n\n    const spinner = ora({\n      hideCursor: false,\n      discardStdin: false,\n    });\n\n    const key = await generateKey(ngEntryPoint.moduleId, esm2020, 'fesm-bundles', tsConfig.options.compilationMode);\n    const hash = await generateKey(...[...cache.outputCache.values()].map(({ version }) => version));\n    const cacheDirectory = options.cacheEnabled && options.cacheDirectory;\n    if (cacheDirectory) {\n      const cacheResult: BundlesCache = await readCacheEntry(options.cacheDirectory, key);\n\n      if (cacheResult?.hash === hash) {\n        try {\n          spinner.start('Writing FESM bundles');\n          await Promise.all([\n            mkdir(dirname(fesm2020), { recursive: true }),\n            mkdir(dirname(fesm2015), { recursive: true }),\n          ]);\n\n          await Promise.all([\n            writeFile(fesm2020, cacheResult.fesm2020.code),\n            writeFile(`${fesm2020}.map`, JSON.stringify(cacheResult.fesm2020.map)),\n            writeFile(fesm2015, cacheResult.fesm2015.code),\n            writeFile(`${fesm2015}.map`, JSON.stringify(cacheResult.fesm2015.map)),\n          ]);\n\n          spinner.succeed('Writing FESM bundles');\n        } catch (error) {\n          spinner.fail();\n          throw error;\n        }\n\n        return;\n      }\n    }\n\n    const fesmCache: Partial<BundlesCache> = {\n      hash,\n    };\n\n    try {\n      spinner.start('Generating FESM2020');\n      const {\n        cache: rollupFESMCache,\n        code,\n        map,\n      } = await rollupBundleFile({\n        sourceRoot: tsConfig.options.sourceRoot,\n        entry: esm2020,\n        moduleName: ngEntryPoint.moduleId,\n        dest: fesm2020,\n        cache: cache.rollupFESM2020Cache,\n        cacheDirectory,\n        fileCache: cache.outputCache,\n        cacheKey: await generateKey(esm2020, ngEntryPoint.moduleId, fesm2020, tsConfig.options.compilationMode),\n      });\n\n      fesmCache.fesm2020 = {\n        code,\n        map,\n      };\n\n      spinner.succeed();\n\n      if (options.watch) {\n        cache.rollupFESM2020Cache = rollupFESMCache;\n      }\n    } catch (error) {\n      spinner.fail();\n      throw error;\n    }\n\n    try {\n      spinner.start('Generating FESM2015');\n      const {\n        cache: rollupFESMCache,\n        code,\n        map,\n      } = await rollupBundleFile({\n        sourceRoot: tsConfig.options.sourceRoot,\n        entry: esm2020,\n        moduleName: ngEntryPoint.moduleId,\n        dest: fesm2015,\n        transform: downlevelCodeWithTsc,\n        cache: cache.rollupFESM2015Cache,\n        cacheDirectory,\n        fileCache: cache.outputCache,\n        cacheKey: await generateKey(esm2020, ngEntryPoint.moduleId, fesm2015, tsConfig.options.compilationMode),\n      });\n\n      fesmCache.fesm2015 = {\n        code,\n        map,\n      };\n\n      spinner.succeed();\n\n      if (options.watch) {\n        cache.rollupFESM2015Cache = rollupFESMCache;\n      }\n    } catch (error) {\n      spinner.fail();\n      throw error;\n    }\n\n    if (cacheDirectory) {\n      await saveCacheEntry(cacheDirectory, key, JSON.stringify(fesmCache));\n    }\n  });\n"]}

package/lib/ng-package/entry-point/write-package.transform.js

@@ -51,24 +51,28 @@ const writePackageTransform = (options) => (0, transform_1.transformFromPromise)
         '**/node_modules/**',
         `${ngPackage.dest}/**`,
     ];
-    if (ngPackage.assets.length && !ngEntryPoint.isSecondaryEntryPoint) {
+    if (!ngEntryPoint.isSecondaryEntryPoint) {
         const assetFiles = [];
         // COPY ASSET FILES TO DESTINATION
         spinner.start('Copying assets');
         try {
-            for (let asset of ngPackage.assets) {
-                asset = path.join(ngPackage.src, asset);
-                if (await (0, fs_1.exists)(asset)) {
-                    const stats = await (0, fs_1.stat)(asset);
+            for (const asset of [...ngPackage.assets, 'LICENSE', '**/README.md']) {
+                let assetFullPath = path.join(ngPackage.src, asset);
+                try {
+                    const stats = await (0, fs_1.stat)(assetFullPath);
                     if (stats.isFile()) {
-                        assetFiles.push(asset);
+                        assetFiles.push(assetFullPath);
                         continue;
                     }
                     if (stats.isDirectory()) {
-                        asset = path.join(asset, '**/*');
+                        assetFullPath = path.join(assetFullPath, '**/*');
                     }
                 }
-                const files = await (0, glob_1.globFiles)(asset, {
+                catch { }
+                if (asset === 'LICENSE') {
+                    continue;
+                }
+                const files = await (0, glob_1.globFiles)(assetFullPath, {
                     ignore: ignorePaths,
                     cache: ngPackageNode.cache.globCache,
                     dot: true,