@nrwl/angular 13.1.3 → 13.2.0-beta.1

package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js

@@ -9,67 +9,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileNgcTransformFactory = void 0;
 const tslib_1 = require("tslib");
 const transform_1 = require("ng-packagr/lib/graph/transform");
-const ivy = require("ng-packagr/lib/ivy");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const compile_source_files_1 = require("ng-packagr/lib/ngc/compile-source-files");
 const ngcc_processor_1 = require("ng-packagr/lib/ngc/ngcc-processor");
 const tsconfig_1 = require("ng-packagr/lib/ts/tsconfig");
+const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const ora = require("ora");
 const path = require("path");
 const ts = require("typescript");
-const stylesheet_processor_1 = require("../../ivy/styles/stylesheet-processor");
-function isEnabled(variable) {
-    return (typeof variable === 'string' &&
-        (variable === '1' || variable.toLowerCase() === 'true'));
-}
 const compileNgcTransformFactory = (StylesheetProcessor, options) => {
-    return transform_1.transformFromPromise((graph) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        var _c, _d;
+    return (0, transform_1.transformFromPromise)((graph) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+        var _a;
+        var _b;
         const spinner = ora({
             hideCursor: false,
             discardStdin: false,
         });
         try {
-            const entryPoint = graph.find(nodes_1.isEntryPointInProgress());
+            const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
             const entryPoints = graph.filter(nodes_1.isEntryPoint);
             // Add paths mappings for dependencies
-            const tsConfig = tsconfig_1.setDependenciesTsConfigPaths(entryPoint.data.tsConfig, entryPoints);
+            const tsConfig = (0, tsconfig_1.setDependenciesTsConfigPaths)(entryPoint.data.tsConfig, entryPoints);
             // Compile TypeScript sources
-            const { esm2015, declarations } = entryPoint.data.destinationFiles;
+            const { esm2020, declarations } = entryPoint.data.destinationFiles;
             const { basePath, cssUrl, styleIncludePaths } = entryPoint.data.entryPoint;
             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.
-                    yield 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 stylesheet_processor_1.StylesheetProcessor(basePath, cssUrl, styleIncludePaths));
-                yield 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, options.watch));
-                yield 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);
+            spinner.start(`Compiling with Angular sources in Ivy ${tsConfig.options.compilationMode || 'full'} compilation mode.`);
+            const ngccProcessor = new ngcc_processor_1.NgccProcessor(yield (0, ng_compiler_cli_1.ngccCompilerCli)(), ngccProcessingCache, tsConfig.project, tsConfig.options, entryPoints);
+            if (!entryPoint.data.entryPoint.isSecondaryEntryPoint) {
+                // Only run the async version of NGCC during the primary entrypoint processing.
+                yield ngccProcessor.process();
             }
+            (_a = (_b = entryPoint.cache).stylesheetProcessor) !== null && _a !== void 0 ? _a : (_b.stylesheetProcessor = new StylesheetProcessor(basePath, cssUrl, styleIncludePaths, options.cacheEnabled && options.cacheDirectory, options.watch));
+            yield (0, compile_source_files_1.compileSourceFiles)(graph, tsConfig, moduleResolutionCache, {
+                outDir: path.dirname(esm2020),
+                declarationDir: path.dirname(declarations),
+                declaration: true,
+                target: ts.ScriptTarget.ES2020,
+            }, entryPoint.cache.stylesheetProcessor, ngccProcessor, options.watch);
         }
         catch (error) {
             spinner.fail();

package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-ngc.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compile-ngc.transform.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;AAEH,8DAGwC;AACxC,2DAIyC;AAEzC,kFAA6E;AAC7E,sEAAkE;AAClE,yDAA0E;AAC1E,0EAAuE;AACvE,2BAA2B;AAC3B,6BAA6B;AAC7B,iCAAiC;AAG1B,MAAM,0BAA0B,GAAG,CACxC,mBAAoD,EACpD,OAAyB,EACd,EAAE;IACb,OAAO,IAAA,gCAAoB,EAAC,CAAO,KAAK,EAAE,EAAE;;;QAC1C,MAAM,OAAO,GAAG,GAAG,CAAC;YAClB,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,KAAK;SACpB,CAAC,CAAC;QAEH,IAAI;YACF,MAAM,UAAU,GAAmB,KAAK,CAAC,IAAI,CAAC,IAAA,8BAAsB,GAAE,CAAC,CAAC;YACxE,MAAM,WAAW,GAAqB,KAAK,CAAC,MAAM,CAAC,oBAAY,CAAC,CAAC;YACjE,sCAAsC;YACtC,MAAM,QAAQ,GAAG,IAAA,uCAA4B,EAC3C,UAAU,CAAC,IAAI,CAAC,QAAQ,EACxB,WAAW,CACZ,CAAC;YAEF,6BAA6B;YAC7B,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC;YACnE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAC3C,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;YAC7B,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC;YAExE,OAAO,CAAC,KAAK,CACX,yCACE,QAAQ,CAAC,OAAO,CAAC,eAAe,IAAI,MACtC,oBAAoB,CACrB,CAAC;YACF,MAAM,aAAa,GAAG,IAAI,8BAAa,CACrC,MAAM,IAAA,iCAAe,GAAE,EACvB,mBAAmB,EACnB,QAAQ,CAAC,OAAO,EAChB,QAAQ,CAAC,OAAO,EAChB,WAAW,CACZ,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE;gBACrD,+EAA+E;gBAC/E,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC;aAC/B;YAED,YAAA,UAAU,CAAC,KAAK,EAAC,mBAAmB,uCAAnB,mBAAmB,GAAK,IAAI,mBAAmB,CAC9D,QAAQ,EACR,MAAM,EACN,iBAAiB,EACjB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,cAAc,EAC9C,OAAO,CAAC,KAAK,CACP,EAAC;YAET,MAAM,IAAA,yCAAkB,EACtB,KAAK,EACL,QAAQ,EACR,qBAAqB,EACrB;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,UAAU,CAAC,KAAK,CAAC,mBAAmB,EACpC,aAAa,EACb,OAAO,CAAC,KAAK,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,CAAA,CAAC,CAAC;AACL,CAAC,CAAC;AAxEW,QAAA,0BAA0B,8BAwErC"}

package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/entry-point.di.js

@@ -15,7 +15,7 @@ const write_bundles_di_1 = require("ng-packagr/lib/ng-package/entry-point/write-
 const write_package_di_1 = require("ng-packagr/lib/ng-package/entry-point/write-package.di");
 const compile_ngc_di_1 = require("./compile-ngc.di");
 exports.NX_ENTRY_POINT_TRANSFORM_TOKEN = new injection_js_1.InjectionToken(`nx.v1.entryPointTransform`);
-exports.NX_ENTRY_POINT_TRANSFORM = transform_di_1.provideTransform({
+exports.NX_ENTRY_POINT_TRANSFORM = (0, transform_di_1.provideTransform)({
     provide: exports.NX_ENTRY_POINT_TRANSFORM_TOKEN,
     useFactory: entry_point_transform_1.entryPointTransformFactory,
     deps: [

package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/entry-point.di.js.map

@@ -1 +1 @@
-{"version":3,"file":"entry-point.di.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/entry-point.di.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,+CAAwD;AAExD,oEAG2C;AAC3C,uGAAyG;AACzG,6FAGgE;AAChE,6FAGgE;AAChE,qDAG0B;AAEb,QAAA,8BAA8B,GAAG,IAAI,6BAAc,CAC9D,2BAA2B,CAC5B,CAAC;AAEW,QAAA,wBAAwB,GAAsB,+BAAgB,CAAC;IAC1E,OAAO,EAAE,sCAA8B;IACvC,UAAU,EAAE,kDAA0B;IACtC,IAAI,EAAE;QACJ,qCAAoB;QACpB,gDAA6B;QAC7B,gDAA6B;KAC9B;CACF,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAe;IAClD,gCAAwB;IACxB,GAAG,yCAAwB;IAC3B,0CAAuB;IACvB,0CAAuB;CACxB,CAAC"}
+{"version":3,"file":"entry-point.di.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/entry-point.di.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,+CAAwD;AAExD,oEAG2C;AAC3C,uGAAyG;AACzG,6FAGgE;AAChE,6FAGgE;AAChE,qDAG0B;AAEb,QAAA,8BAA8B,GAAG,IAAI,6BAAc,CAC9D,2BAA2B,CAC5B,CAAC;AAEW,QAAA,wBAAwB,GAAsB,IAAA,+BAAgB,EAAC;IAC1E,OAAO,EAAE,sCAA8B;IACvC,UAAU,EAAE,kDAA0B;IACtC,IAAI,EAAE;QACJ,qCAAoB;QACpB,gDAA6B;QAC7B,gDAA6B;KAC9B;CACF,CAAC,CAAC;AAEU,QAAA,wBAAwB,GAAe;IAClD,gCAAwB;IACxB,GAAG,yCAAwB;IAC3B,0CAAuB;IACvB,0CAAuB;CACxB,CAAC"}

package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js

@@ -16,7 +16,7 @@ const package_transform_1 = require("ng-packagr/lib/ng-package/package.transform
 const project_di_1 = require("ng-packagr/lib/project.di");
 const entry_point_di_1 = require("./entry-point/entry-point.di");
 exports.NX_PACKAGE_TRANSFORM_TOKEN = new injection_js_1.InjectionToken(`nx.v1.packageTransform`);
-exports.NX_PACKAGE_TRANSFORM = transform_di_1.provideTransform({
+exports.NX_PACKAGE_TRANSFORM = (0, transform_di_1.provideTransform)({
     provide: exports.NX_PACKAGE_TRANSFORM_TOKEN,
     useFactory: package_transform_1.packageTransformFactory,
     deps: [
@@ -30,7 +30,6 @@ exports.NX_PACKAGE_TRANSFORM = transform_di_1.provideTransform({
 exports.NX_PACKAGE_PROVIDERS = [
     exports.NX_PACKAGE_TRANSFORM,
     options_di_1.DEFAULT_OPTIONS_PROVIDER,
-    init_tsconfig_di_1.provideTsConfig(),
     init_tsconfig_di_1.INIT_TS_CONFIG_TRANSFORM,
     analyse_sources_di_1.ANALYSE_SOURCES_TRANSFORM,
 ];

package/src/executors/package/ng-packagr-adjustments/ng-package/package.di.js.map

@@ -1 +1 @@
-{"version":3,"file":"package.di.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/package.di.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAAwD;AAExD,oEAG2C;AAC3C,iGAGkE;AAClE,6FAIgE;AAChE,qEAG8C;AAC9C,mFAAsF;AACtF,0DAA0D;AAC1D,iEAA8E;AAEjE,QAAA,0BAA0B,GAAG,IAAI,6BAAc,CAC1D,wBAAwB,CACzB,CAAC;AAEW,QAAA,oBAAoB,GAAsB,+BAAgB,CAAC;IACtE,OAAO,EAAE,kCAA0B;IACnC,UAAU,EAAE,2CAAuB;IACnC,IAAI,EAAE;QACJ,0BAAa;QACb,0BAAa;QACb,uCAAoB;QACpB,0CAAqB;QACrB,+CAA8B;KAC/B;CACF,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAe;IAC9C,4BAAoB;IACpB,qCAAwB;IACxB,kCAAe,EAAE;IACjB,2CAAwB;IACxB,8CAAyB;CAC1B,CAAC"}
+{"version":3,"file":"package.di.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/ng-package/package.di.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAAwD;AAExD,oEAG2C;AAC3C,iGAGkE;AAClE,6FAIgE;AAChE,qEAG8C;AAC9C,mFAAsF;AACtF,0DAA0D;AAC1D,iEAA8E;AAEjE,QAAA,0BAA0B,GAAG,IAAI,6BAAc,CAC1D,wBAAwB,CACzB,CAAC;AAEW,QAAA,oBAAoB,GAAsB,IAAA,+BAAgB,EAAC;IACtE,OAAO,EAAE,kCAA0B;IACnC,UAAU,EAAE,2CAAuB;IACnC,IAAI,EAAE;QACJ,0BAAa;QACb,0BAAa;QACb,uCAAoB;QACpB,0CAAqB;QACrB,+CAA8B;KAC/B;CACF,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAe;IAC9C,4BAAoB;IACpB,qCAAwB;IACxB,2CAAwB;IACxB,8CAAyB;CAC1B,CAAC"}

package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.d.ts

@@ -2,23 +2,21 @@
  * Adapted from the original ng-packagr source.
  *
  * Changes made:
+ * - Added the filePath parameter to the cache key.
+ * - Added PostCSS plugins needed to support TailwindCSS.
  * - Added watch mode parameter.
  */
 export declare enum CssUrl {
     inline = "inline",
     none = "none"
 }
-export interface WorkerOptions {
-    filePath: string;
-    basePath: string;
-    browserslistData: string[];
-    cssUrl?: CssUrl;
-    styleIncludePaths?: string[];
-    cachePath: string;
-    alwaysUseWasm: boolean;
-    watch?: boolean;
+export declare enum InlineStyleLanguage {
+    sass = "sass",
+    scss = "scss",
+    css = "css",
+    less = "less"
 }
-export interface WorkerResult {
+export interface Result {
     css: string;
     warnings: string[];
     error?: string;
@@ -27,11 +25,17 @@ export declare class StylesheetProcessor {
     private readonly basePath;
     private readonly cssUrl?;
     private readonly styleIncludePaths?;
+    private readonly cacheDirectory?;
     private readonly watch?;
     private browserslistData;
-    private worker;
-    private readonly cachePath;
-    private alwaysUseWasm;
-    constructor(basePath: string, cssUrl?: CssUrl, styleIncludePaths?: string[], watch?: boolean);
-    process(filePath: string): any;
+    private targets;
+    private postCssProcessor;
+    private esbuild;
+    constructor(basePath: string, cssUrl?: CssUrl, styleIncludePaths?: string[], cacheDirectory?: string | false, watch?: boolean);
+    process({ filePath, content, }: {
+        filePath: string;
+        content: string;
+    }): Promise<string>;
+    private createPostCssPlugins;
+    private renderCss;
 }

package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -3,68 +3,236 @@
  * Adapted from the original ng-packagr source.
  *
  * Changes made:
+ * - Added the filePath parameter to the cache key.
+ * - Added PostCSS plugins needed to support TailwindCSS.
  * - Added watch mode parameter.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StylesheetProcessor = exports.CssUrl = void 0;
+exports.StylesheetProcessor = exports.InlineStyleLanguage = exports.CssUrl = void 0;
+const tslib_1 = require("tslib");
 const browserslist = require("browserslist");
-const findCacheDirectory = require("find-cache-dir");
+const find_parent_dir_1 = require("find-parent-dir");
+const fs_1 = require("fs");
 const esbuild_executor_1 = require("ng-packagr/lib/esbuild/esbuild-executor");
+const cache_1 = require("ng-packagr/lib/utils/cache");
 const log = require("ng-packagr/lib/utils/log");
-const os_1 = require("os");
 const path_1 = require("path");
-const worker_threads_1 = require("worker_threads");
+const postcssPresetEnv = require("postcss-preset-env");
+const postcssUrl = require("postcss-url");
+const tailwindcss_1 = require("../utilities/tailwindcss");
+const postcss = require('postcss');
 var CssUrl;
 (function (CssUrl) {
     CssUrl["inline"] = "inline";
     CssUrl["none"] = "none";
 })(CssUrl = exports.CssUrl || (exports.CssUrl = {}));
+var InlineStyleLanguage;
+(function (InlineStyleLanguage) {
+    InlineStyleLanguage["sass"] = "sass";
+    InlineStyleLanguage["scss"] = "scss";
+    InlineStyleLanguage["css"] = "css";
+    InlineStyleLanguage["less"] = "less";
+})(InlineStyleLanguage = exports.InlineStyleLanguage || (exports.InlineStyleLanguage = {}));
 class StylesheetProcessor {
-    constructor(basePath, cssUrl, styleIncludePaths, watch) {
+    constructor(basePath, cssUrl, styleIncludePaths, cacheDirectory, watch) {
+        // By default, browserslist defaults are too inclusive
+        // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
         this.basePath = basePath;
         this.cssUrl = cssUrl;
         this.styleIncludePaths = styleIncludePaths;
+        this.cacheDirectory = cacheDirectory;
         this.watch = watch;
-        this.alwaysUseWasm = !esbuild_executor_1.EsbuildExecutor.hasNativeSupport();
-        this.cachePath =
-            findCacheDirectory({ name: 'ng-packagr-styles' }) || os_1.tmpdir();
+        this.esbuild = new esbuild_executor_1.EsbuildExecutor();
+        // We change the default query to browsers that Angular support.
+        // https://angular.io/guide/browser-support
+        browserslist.defaults = [
+            'last 1 Chrome version',
+            'last 1 Firefox version',
+            'last 2 Edge major versions',
+            'last 2 Safari major versions',
+            'last 2 iOS major versions',
+            'Firefox ESR',
+        ];
+        this.browserslistData = browserslist(undefined, { path: this.basePath });
+        this.targets = transformSupportedBrowsersToTargets(this.browserslistData);
+        this.postCssProcessor = this.createPostCssPlugins();
     }
-    process(filePath) {
-        if (!this.worker) {
-            this.worker = new worker_threads_1.Worker(path_1.join(__dirname, './stylesheet-processor-worker.js'));
-        }
-        if (!this.browserslistData) {
-            this.browserslistData = browserslist(undefined, { path: this.basePath });
-        }
-        const workerOptions = {
-            filePath,
-            basePath: this.basePath,
-            cssUrl: this.cssUrl,
-            styleIncludePaths: this.styleIncludePaths,
-            browserslistData: this.browserslistData,
-            cachePath: this.cachePath,
-            alwaysUseWasm: this.alwaysUseWasm,
-            watch: this.watch,
-        };
-        const ioChannel = new worker_threads_1.MessageChannel();
-        try {
-            const signal = new Int32Array(new SharedArrayBuffer(4));
-            this.worker.postMessage({ signal, port: ioChannel.port1, workerOptions }, [ioChannel.port1]);
-            // Sleep until signal[0] is 0
-            Atomics.wait(signal, 0, 0);
-            const { css, warnings, error } = worker_threads_1.receiveMessageOnPort(ioChannel.port2).message;
-            if (error) {
-                throw new Error(error);
+    process({ filePath, content, }) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            let key;
+            if (!content.includes('@import') &&
+                !content.includes('@use') &&
+                this.cacheDirectory) {
+                // No transitive deps, we can cache more aggressively.
+                key = yield (0, cache_1.generateKey)(content, ...this.browserslistData, filePath);
+                const result = yield (0, cache_1.readCacheEntry)(this.cacheDirectory, key);
+                if (result) {
+                    result.warnings.forEach((msg) => log.warn(msg));
+                    return result.css;
+                }
+            }
+            // Render pre-processor language (sass, styl, less)
+            const renderedCss = yield 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 = yield (0, cache_1.generateKey)(renderedCss, ...this.browserslistData, filePath);
+            }
+            if (this.cacheDirectory) {
+                const cachedResult = yield (0, cache_1.readCacheEntry)(this.cacheDirectory, key);
+                if (cachedResult) {
+                    cachedResult.warnings.forEach((msg) => log.warn(msg));
+                    return cachedResult.css;
+                }
+            }
+            // Render postcss (autoprefixing and friends)
+            const result = yield this.postCssProcessor.process(renderedCss, {
+                from: filePath,
+                to: filePath.replace((0, path_1.extname)(filePath), '.css'),
+            });
+            const warnings = result.warnings().map((w) => w.toString());
+            const { code, warnings: esBuildWarnings } = yield this.esbuild.transform(result.css, {
+                loader: 'css',
+                minify: true,
+                target: this.targets,
+                sourcefile: filePath,
+            });
+            if (esBuildWarnings.length > 0) {
+                warnings.push(...(yield this.esbuild.formatMessages(esBuildWarnings, {
+                    kind: 'warning',
+                })));
+            }
+            if (this.cacheDirectory) {
+                yield (0, cache_1.saveCacheEntry)(this.cacheDirectory, key, JSON.stringify({
+                    css: code,
+                    warnings,
+                }));
             }
             warnings.forEach((msg) => log.warn(msg));
-            return css;
-        }
-        finally {
-            ioChannel.port1.close();
-            ioChannel.port2.close();
-            this.worker.unref();
+            return code;
+        });
+    }
+    createPostCssPlugins() {
+        const postCssPlugins = [];
+        if (this.cssUrl !== CssUrl.none) {
+            postCssPlugins.push(postcssUrl({ url: this.cssUrl }));
         }
+        postCssPlugins.push(...(0, tailwindcss_1.getTailwindPostCssPluginsIfPresent)(this.basePath, this.styleIncludePaths, this.watch));
+        postCssPlugins.push(postcssPresetEnv({
+            browsers: this.browserslistData,
+            autoprefixer: true,
+            stage: 3,
+        }));
+        return postcss(postCssPlugins);
+    }
+    renderCss(filePath, css) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            const ext = (0, path_1.extname)(filePath);
+            switch (ext) {
+                case '.sass':
+                case '.scss': {
+                    return (yield Promise.resolve().then(() => require('sass')))
+                        .renderSync({
+                        file: filePath,
+                        data: css,
+                        indentedSyntax: '.sass' === ext,
+                        importer: customSassImporter,
+                        includePaths: this.styleIncludePaths,
+                    })
+                        .css.toString();
+                }
+                case '.less': {
+                    const { css: content } = yield (yield Promise.resolve().then(() => require('less'))).default.render(css, {
+                        filename: filePath,
+                        math: 'always',
+                        javascriptEnabled: true,
+                        paths: this.styleIncludePaths,
+                    });
+                    return content;
+                }
+                case '.styl':
+                case '.stylus': {
+                    const stylus = (yield Promise.resolve().then(() => require('stylus'))).default;
+                    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 transformSupportedBrowsersToTargets(supportedBrowsers) {
+    const transformed = [];
+    // https://esbuild.github.io/api/#target
+    const esBuildSupportedBrowsers = new Set([
+        'safari',
+        'firefox',
+        'edge',
+        'chrome',
+        'ios',
+    ]);
+    for (const browser of supportedBrowsers) {
+        let [browserName, version] = browser.split(' ');
+        // browserslist uses the name `ios_saf` for iOS Safari whereas esbuild uses `ios`
+        if (browserName === 'ios_saf') {
+            browserName = 'ios';
+            // browserslist also uses ranges for iOS Safari versions but only the lowest is required
+            // to perform minimum supported feature checks. esbuild also expects a single version.
+            [version] = version.split('-');
+        }
+        if (browserName === 'ie') {
+            transformed.push('edge12');
+        }
+        else if (esBuildSupportedBrowsers.has(browserName)) {
+            if (browserName === 'safari' && version === 'TP') {
+                // esbuild only supports numeric versions so `TP` is converted to a high number (999) since
+                // a Technology Preview (TP) of Safari is assumed to support all currently known features.
+                version = '999';
+            }
+            transformed.push(browserName + version);
+        }
+    }
+    return transformed.length ? transformed : undefined;
+}
+function customSassImporter(url, prev) {
+    // NB: Sass importer should always be sync as otherwise it will cause
+    // sass to go in the async path which is slower.
+    if (url[0] !== '~') {
+        return undefined;
+    }
+    const result = resolveImport(url.substr(1), prev);
+    if (!result) {
+        return undefined;
+    }
+    return {
+        file: result,
+        prev,
+    };
+}
+function resolveImport(target, basePath) {
+    const root = (0, find_parent_dir_1.sync)(basePath, 'node_modules');
+    if (!root) {
+        return undefined;
+    }
+    const filePath = (0, path_1.resolve)(root, 'node_modules', target);
+    if ((0, fs_1.existsSync)(filePath) || (0, fs_1.existsSync)((0, path_1.dirname)(filePath))) {
+        return filePath;
+    }
+    return resolveImport(target, (0, path_1.dirname)(root));
+}
 //# sourceMappingURL=stylesheet-processor.js.map

package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAA6C;AAC7C,qDAAqD;AACrD,8EAA0E;AAC1E,gDAAgD;AAChD,2BAA4B;AAC5B,+BAA4B;AAC5B,mDAA8E;AAE9E,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,2BAAiB,CAAA;IACjB,uBAAa,CAAA;AACf,CAAC,EAHW,MAAM,GAAN,cAAM,KAAN,cAAM,QAGjB;AAkBD,MAAa,mBAAmB;IAM9B,YACmB,QAAgB,EAChB,MAAe,EACf,iBAA4B,EAC5B,KAAe;QAHf,aAAQ,GAAR,QAAQ,CAAQ;QAChB,WAAM,GAAN,MAAM,CAAS;QACf,sBAAiB,GAAjB,iBAAiB,CAAW;QAC5B,UAAK,GAAL,KAAK,CAAU;QAN1B,kBAAa,GAAG,CAAC,kCAAe,CAAC,gBAAgB,EAAE,CAAC;QAQ1D,IAAI,CAAC,SAAS;YACZ,kBAAkB,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,CAAC,IAAI,WAAM,EAAE,CAAC;IAClE,CAAC;IAED,OAAO,CAAC,QAAgB;QACtB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,MAAM,GAAG,IAAI,uBAAM,CACtB,WAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,CACpD,CAAC;SACH;QAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC1E;QAED,MAAM,aAAa,GAAkB;YACnC,QAAQ;YACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,+BAAc,EAAE,CAAC;QAEvC,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,IAAI,CAAC,MAAM,CAAC,WAAW,CACrB,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,KAAK,EAAE,aAAa,EAAE,EAChD,CAAC,SAAS,CAAC,KAAK,CAAC,CAClB,CAAC;YAEF,6BAA6B;YAC7B,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAE3B,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,qCAAoB,CACnD,SAAS,CAAC,KAAK,CAChB,CAAC,OAAO,CAAC;YACV,IAAI,KAAK,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;aACxB;YAED,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACzC,OAAO,GAAG,CAAC;SACZ;gBAAS;YACR,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACxB,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;SACrB;IACH,CAAC;CACF;AAjED,kDAiEC"}
+{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.ts"],"names":[],"mappings":"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"}

package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.js

@@ -11,8 +11,8 @@ function getTailwindPostCssPluginsIfPresent(basePath, includePaths, watch) {
     const tailwindConfigFile = 'tailwind.config.js';
     let tailwindConfigPath;
     for (const path of [basePath, app_root_1.appRootPath]) {
-        const fullPath = path_1.join(path, tailwindConfigFile);
-        if (fs_1.existsSync(fullPath)) {
+        const fullPath = (0, path_1.join)(path, tailwindConfigFile);
+        if ((0, fs_1.existsSync)(fullPath)) {
             tailwindConfigPath = fullPath;
             break;
         }
@@ -26,7 +26,7 @@ function getTailwindPostCssPluginsIfPresent(basePath, includePaths, watch) {
         tailwindPackagePath = require.resolve('tailwindcss');
     }
     catch (_a) {
-        const relativeTailwindConfigPath = path_1.relative(app_root_1.appRootPath, tailwindConfigPath);
+        const relativeTailwindConfigPath = (0, path_1.relative)(app_root_1.appRootPath, tailwindConfigPath);
         devkit_1.logger.warn(`Tailwind CSS configuration file found (${relativeTailwindConfigPath})` +
             ` but the 'tailwindcss' package is not installed.` +
             ` To enable Tailwind CSS, please install the 'tailwindcss' package.`);

package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.js.map

@@ -1 +1 @@
-{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,2DAA2D;AAC3D,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAEhD,SAAgB,kCAAkC,CAChD,QAAgB,EAChB,YAAuB,EACvB,KAAe;IAEf,+EAA+E;IAC/E,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;IAChD,IAAI,kBAAsC,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,sBAAW,CAAC,EAAE;QAC1C,MAAM,QAAQ,GAAG,WAAI,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAChD,IAAI,eAAU,CAAC,QAAQ,CAAC,EAAE;YACxB,kBAAkB,GAAG,QAAQ,CAAC;YAC9B,MAAM;SACP;KACF;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,eAAQ,CACzC,sBAAW,EACX,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,EAAE,CAAC;KACX;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACtE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AArDD,gFAqDC"}
+{"version":3,"file":"tailwindcss.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,2DAA2D;AAC3D,2BAAgC;AAChC,+BAAsC;AACtC,gDAAgD;AAEhD,SAAgB,kCAAkC,CAChD,QAAgB,EAChB,YAAuB,EACvB,KAAe;IAEf,+EAA+E;IAC/E,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;IAChD,IAAI,kBAAsC,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,sBAAW,CAAC,EAAE;QAC1C,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAChD,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;YACxB,kBAAkB,GAAG,QAAQ,CAAC;YAC9B,MAAM;SACP;KACF;IAED,iEAAiE;IACjE,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,mBAAuC,CAAC;IAC5C,IAAI;QACF,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KACtD;IAAC,WAAM;QACN,MAAM,0BAA0B,GAAG,IAAA,eAAQ,EACzC,sBAAW,EACX,kBAAkB,CACnB,CAAC;QACF,eAAM,CAAC,IAAI,CACT,0CAA0C,0BAA0B,GAAG;YACrE,kDAAkD;YAClD,oEAAoE,CACvE,CAAC;QAEF,OAAO,EAAE,CAAC;KACX;IAED,IAAI,CAAC,mBAAmB,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;KAC1D;IAED,OAAO;QACL,aAAa,CAAC;YACZ,qBAAqB,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE;YACzC,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SACtE,CAAC;QACF,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;KAC7D,CAAC;AACJ,CAAC;AArDD,gFAqDC"}

package/src/executors/package/package.impl.js

@@ -2,47 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageExecutor = exports.createLibraryExecutor = void 0;
 const tslib_1 = require("tslib");
-const ng = require("@angular/compiler-cli");
 const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
 const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
+const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const path_1 = require("path");
 const rxjs_1 = require("rxjs");
 const rxjs_for_await_1 = require("rxjs-for-await");
 const operators_1 = require("rxjs/operators");
-const ts = require("typescript");
 const entry_point_di_1 = require("./ng-packagr-adjustments/ng-package/entry-point/entry-point.di");
 const package_di_1 = require("./ng-packagr-adjustments/ng-package/package.di");
 function initializeNgPackagr(options, context, projectDependencies) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         const packager = new (yield Promise.resolve().then(() => require('ng-packagr'))).NgPackagr([
             ...package_di_1.NX_PACKAGE_PROVIDERS,
             ...entry_point_di_1.NX_ENTRY_POINT_PROVIDERS,
         ]);
-        packager.forProject(path_1.resolve(context.root, options.project));
+        packager.forProject((0, path_1.resolve)(context.root, options.project));
         packager.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
         // read the tsconfig and modify its path in memory to
         // pass it on to ngpackagr if specified
         if (options.tsConfig) {
-            // these options are mandatory
-            // see https://github.com/ng-packagr/ng-packagr/blob/v12.2/src/lib/ts/tsconfig.ts#L16
-            const extraOptions = {
-                moduleResolution: ts.ModuleResolutionKind.NodeJs,
-                target: ts.ScriptTarget.ES2015,
-                experimentalDecorators: true,
-                // sourcemaps
-                sourceMap: false,
-                inlineSources: true,
-                inlineSourceMap: true,
-                outDir: '',
-                declaration: true,
-                // ng compiler to options
-                enableResourceInlining: true,
-                // these are required to set the appropriate EmitFlags
-                flatModuleId: 'AUTOGENERATED',
-                flatModuleOutFile: 'AUTOGENERATED',
-            };
-            const parsedTSConfig = ng.readConfiguration(options.tsConfig, extraOptions);
-            buildable_libs_utils_1.updatePaths(projectDependencies, parsedTSConfig.options.paths);
+            // read the tsconfig and modify its path in memory to
+            // pass it on to ngpackagr
+            const parsedTSConfig = (yield (0, ng_compiler_cli_1.ngCompilerCli)()).readConfiguration(options.tsConfig);
+            (0, buildable_libs_utils_1.updatePaths)(projectDependencies, parsedTSConfig.options.paths);
             packager.withTsConfig(parsedTSConfig);
         }
         return packager;
@@ -55,22 +38,22 @@ function initializeNgPackagr(options, context, projectDependencies) {
  */
 function createLibraryExecutor(initializeNgPackagr) {
     return function (options, context) {
-        return tslib_1.__asyncGenerator(this, arguments, function* () {
-            const { target, dependencies } = buildable_libs_utils_1.calculateProjectDependencies(project_graph_1.readCachedProjectGraph(), context.root, context.projectName, context.targetName, context.configurationName);
-            if (!buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt(context.root, context.projectName, context.targetName, dependencies)) {
-                return yield tslib_1.__await(Promise.resolve({ success: false }));
+        return (0, tslib_1.__asyncGenerator)(this, arguments, function* () {
+            const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, project_graph_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
+            if (!(0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.root, context.projectName, context.targetName, dependencies)) {
+                return yield (0, tslib_1.__await)(Promise.resolve({ success: false }));
             }
             function updatePackageJson() {
                 if (dependencies.length > 0 &&
                     options.updateBuildableProjectDepsInPackageJson) {
-                    buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
+                    (0, buildable_libs_utils_1.updateBuildableProjectPackageJsonDependencies)(context.root, context.projectName, context.targetName, context.configurationName, target, dependencies, options.buildableProjectDepsInPackageJsonType);
                 }
             }
             if (options.watch) {
-                return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(rxjs_for_await_1.eachValueFrom(rxjs_1.from(initializeNgPackagr(options, context, dependencies)).pipe(operators_1.switchMap((packagr) => packagr.watch()), operators_1.tap(() => updatePackageJson()), operators_1.mapTo({ success: true })))))));
+                return yield (0, tslib_1.__await)(yield (0, tslib_1.__await)(yield* (0, tslib_1.__asyncDelegator)((0, tslib_1.__asyncValues)((0, rxjs_for_await_1.eachValueFrom)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies)).pipe((0, operators_1.switchMap)((packagr) => packagr.watch()), (0, operators_1.tap)(() => updatePackageJson()), (0, operators_1.mapTo)({ success: true })))))));
             }
-            return yield tslib_1.__await(rxjs_1.from(initializeNgPackagr(options, context, dependencies))
-                .pipe(operators_1.switchMap((packagr) => packagr.build()), operators_1.tap(() => updatePackageJson()), operators_1.mapTo({ success: true }))
+            return yield (0, tslib_1.__await)((0, rxjs_1.from)(initializeNgPackagr(options, context, dependencies))
+                .pipe((0, operators_1.switchMap)((packagr) => packagr.build()), (0, operators_1.tap)(() => updatePackageJson()), (0, operators_1.mapTo)({ success: true }))
                 .toPromise());
         });
     };