@nrwl/angular 12.10.0 → 13.0.0-beta.12

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

@@ -0,0 +1,178 @@
+"use strict";
+/**
+ * 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 option.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const cacache = require("cacache");
+const crypto_1 = require("crypto");
+const esbuild_executor_1 = require("ng-packagr/lib/esbuild/esbuild-executor");
+const fs_1 = require("ng-packagr/lib/utils/fs");
+const path = require("path");
+const postcss_1 = require("postcss");
+const postcssPresetEnv = require("postcss-preset-env");
+const postcssUrl = require("postcss-url");
+const worker_threads_1 = require("worker_threads");
+const tailwindcss_1 = require("../utilities/tailwindcss");
+const stylesheet_processor_1 = require("./stylesheet-processor");
+const ngPackagrVersion = require('ng-packagr/package.json').version;
+function processCss({ filePath, browserslistData, cssUrl, styleIncludePaths, basePath, cachePath, alwaysUseWasm, watch, }) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const esbuild = new esbuild_executor_1.EsbuildExecutor(alwaysUseWasm);
+        const content = yield fs_1.readFile(filePath, 'utf8');
+        let key;
+        if (!content.includes('@import') && !content.includes('@use')) {
+            // No transitive deps, we can cache more aggressively.
+            key = generateKey(content, browserslistData, filePath);
+            const result = yield readCacheEntry(cachePath, key);
+            if (result) {
+                return result;
+            }
+        }
+        // Render pre-processor language (sass, styl, less)
+        const renderedCss = yield renderCss(filePath, content, basePath, styleIncludePaths);
+        // We cannot cache CSS re-rendering phase, because a transitive dependency via (@import) can case different CSS output.
+        // Example a change in a mixin or SCSS variable.
+        if (!key) {
+            key = generateKey(renderedCss, browserslistData, filePath);
+            const cachedResult = yield readCacheEntry(cachePath, key);
+            if (cachedResult) {
+                return cachedResult;
+            }
+        }
+        // Render postcss (autoprefixing and friends)
+        const result = yield optimizeCss(filePath, renderedCss, browserslistData, basePath, styleIncludePaths, cssUrl, watch);
+        const warnings = result.warnings().map((w) => w.toString());
+        const { code, warnings: esBuildWarnings } = yield esbuild.transform(result.css, {
+            loader: 'css',
+            minify: true,
+            sourcefile: filePath,
+        });
+        if (esBuildWarnings.length > 0) {
+            warnings.push(...(yield esbuild.formatMessages(esBuildWarnings, { kind: 'warning' })));
+        }
+        // Add to cache
+        yield cacache.put(cachePath, key, JSON.stringify({
+            css: code,
+            warnings,
+        }));
+        return {
+            css: code,
+            warnings,
+        };
+    });
+}
+function renderCss(filePath, css, basePath, styleIncludePaths) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const ext = path.extname(filePath);
+        switch (ext) {
+            case '.sass':
+            case '.scss': {
+                /*
+                 * Please be aware of the few differences in behaviour https://github.com/sass/dart-sass/blob/master/README.md#behavioral-differences-from-ruby-sass
+                 * By default `npm install` will install sass.
+                 * To use node-sass you need to use:
+                 *   Npm:
+                 *     `npm install node-sass --save-dev`
+                 *   Yarn:
+                 *     `yarn add node-sass --dev`
+                 */
+                let sassCompiler;
+                try {
+                    sassCompiler = require('node-sass'); // Check if node-sass is explicitly included.
+                }
+                catch (_a) {
+                    sassCompiler = yield Promise.resolve().then(() => require('sass'));
+                }
+                return sassCompiler
+                    .renderSync({
+                    file: filePath,
+                    data: css,
+                    indentedSyntax: '.sass' === ext,
+                    importer: yield Promise.resolve().then(() => require('node-sass-tilde-importer')),
+                    includePaths: styleIncludePaths,
+                })
+                    .css.toString();
+            }
+            case '.less': {
+                const { css: content } = yield (yield Promise.resolve().then(() => require('less'))).render(css, {
+                    filename: filePath,
+                    javascriptEnabled: true,
+                    paths: styleIncludePaths,
+                });
+                return content;
+            }
+            case '.styl':
+            case '.stylus': {
+                const stylus = yield Promise.resolve().then(() => require('stylus'));
+                return (stylus(css)
+                    // add paths for resolve
+                    .set('paths', [basePath, '.', ...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;
+        }
+    });
+}
+function optimizeCss(filePath, css, browsers, basePath, includePaths, cssUrl, watch) {
+    const postCssPlugins = [];
+    if (cssUrl !== stylesheet_processor_1.CssUrl.none) {
+        postCssPlugins.push(postcssUrl({ url: cssUrl }));
+    }
+    postCssPlugins.push(...tailwindcss_1.getTailwindPostCssPluginsIfPresent(basePath, includePaths, watch));
+    postCssPlugins.push(postcssPresetEnv({
+        browsers,
+        autoprefixer: true,
+        stage: 3,
+    }));
+    return postcss_1.default(postCssPlugins).process(css, {
+        from: filePath,
+        to: filePath.replace(path.extname(filePath), '.css'),
+    });
+}
+function generateKey(content, browserslistData, filePath) {
+    return crypto_1.createHash('sha1')
+        .update(ngPackagrVersion)
+        .update(content)
+        .update(browserslistData.join(''))
+        .update(filePath)
+        .digest('hex');
+}
+function readCacheEntry(cachePath, key) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const entry = yield cacache.get.info(cachePath, key);
+        if (entry) {
+            return JSON.parse(yield fs_1.readFile(entry.path, 'utf8'));
+        }
+        return undefined;
+    });
+}
+worker_threads_1.parentPort.on('message', ({ signal, port, workerOptions }) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const result = yield processCss(workerOptions);
+        port.postMessage(Object.assign({}, result));
+    }
+    catch (error) {
+        port.postMessage({ error: error.message });
+    }
+    finally {
+        // Change the value of signal[0] to 1
+        Atomics.add(signal, 0, 1);
+        // Unlock the main thread
+        Atomics.notify(signal, 0);
+        port.close();
+    }
+}));
+//# sourceMappingURL=stylesheet-processor-worker.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stylesheet-processor-worker.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor-worker.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,37 @@
+/**
+ * Adapted from the original ng-packagr source.
+ *
+ * Changes made:
+ * - 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 interface WorkerResult {
+    css: string;
+    warnings: string[];
+    error?: string;
+}
+export declare class StylesheetProcessor {
+    private readonly basePath;
+    private readonly cssUrl?;
+    private readonly styleIncludePaths?;
+    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;
+}

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

@@ -0,0 +1,10 @@
+/**
+ * Adapted from the original ng-packagr source.
+ *
+ * Changes made:
+ * - Use our own StylesheetProcessor instead of the one provided by ng-packagr.
+ */
+import { FactoryProvider, InjectionToken } from 'injection-js';
+import { StylesheetProcessor } from './stylesheet-processor';
+export declare const NX_STYLESHEET_PROCESSOR_TOKEN: InjectionToken<StylesheetProcessor>;
+export declare const NX_STYLESHEET_PROCESSOR: FactoryProvider;

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

@@ -0,0 +1,18 @@
+"use strict";
+/**
+ * Adapted from the original ng-packagr source.
+ *
+ * Changes made:
+ * - Use our own StylesheetProcessor instead of the one provided by ng-packagr.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NX_STYLESHEET_PROCESSOR = exports.NX_STYLESHEET_PROCESSOR_TOKEN = void 0;
+const injection_js_1 = require("injection-js");
+const stylesheet_processor_1 = require("./stylesheet-processor");
+exports.NX_STYLESHEET_PROCESSOR_TOKEN = new injection_js_1.InjectionToken(`nx.v1.stylesheetProcessor`);
+exports.NX_STYLESHEET_PROCESSOR = {
+    provide: exports.NX_STYLESHEET_PROCESSOR_TOKEN,
+    useFactory: () => stylesheet_processor_1.StylesheetProcessor,
+    deps: [],
+};
+//# sourceMappingURL=stylesheet-processor.di.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stylesheet-processor.di.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.di.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAA+D;AAC/D,iEAA6D;AAEhD,QAAA,6BAA6B,GACxC,IAAI,6BAAc,CAAsB,2BAA2B,CAAC,CAAC;AAE1D,QAAA,uBAAuB,GAAoB;IACtD,OAAO,EAAE,qCAA6B;IACtC,UAAU,EAAE,GAAG,EAAE,CAAC,0CAAmB;IACrC,IAAI,EAAE,EAAE;CACT,CAAC"}

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

@@ -0,0 +1,70 @@
+"use strict";
+/**
+ * Adapted from the original ng-packagr source.
+ *
+ * Changes made:
+ * - Added watch mode parameter.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StylesheetProcessor = exports.CssUrl = void 0;
+const browserslist = require("browserslist");
+const findCacheDirectory = require("find-cache-dir");
+const esbuild_executor_1 = require("ng-packagr/lib/esbuild/esbuild-executor");
+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");
+var CssUrl;
+(function (CssUrl) {
+    CssUrl["inline"] = "inline";
+    CssUrl["none"] = "none";
+})(CssUrl = exports.CssUrl || (exports.CssUrl = {}));
+class StylesheetProcessor {
+    constructor(basePath, cssUrl, styleIncludePaths, watch) {
+        this.basePath = basePath;
+        this.cssUrl = cssUrl;
+        this.styleIncludePaths = styleIncludePaths;
+        this.watch = watch;
+        this.alwaysUseWasm = !esbuild_executor_1.EsbuildExecutor.hasNativeSupport();
+        this.cachePath =
+            findCacheDirectory({ name: 'ng-packagr-styles' }) || os_1.tmpdir();
+    }
+    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);
+            }
+            warnings.forEach((msg) => log.warn(msg));
+            return css;
+        }
+        finally {
+            ioChannel.port1.close();
+            ioChannel.port2.close();
+            this.worker.unref();
+        }
+    }
+}
+exports.StylesheetProcessor = StylesheetProcessor;
+//# sourceMappingURL=stylesheet-processor.js.map

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

@@ -0,0 +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"}

package/src/executors/package/ng-packagr-adjustments/utilities/tailwindcss.d.ts

@@ -0,0 +1 @@
+export declare function getTailwindPostCssPluginsIfPresent(basePath: string, includePaths?: string[], watch?: boolean): any[];

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

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTailwindPostCssPluginsIfPresent = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const app_root_1 = require("@nrwl/tao/src/utils/app-root");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const postcssImport = require("postcss-import");
+function getTailwindPostCssPluginsIfPresent(basePath, includePaths, watch) {
+    // Try to find TailwindCSS configuration file in the project or workspace root.
+    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)) {
+            tailwindConfigPath = fullPath;
+            break;
+        }
+    }
+    // Only load Tailwind CSS plugin if configuration file was found.
+    if (!tailwindConfigPath) {
+        return [];
+    }
+    let tailwindPackagePath;
+    try {
+        tailwindPackagePath = require.resolve('tailwindcss');
+    }
+    catch (_a) {
+        const relativeTailwindConfigPath = 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.`);
+        return [];
+    }
+    if (!tailwindPackagePath) {
+        return [];
+    }
+    if (process.env['TAILWIND_MODE'] === undefined) {
+        process.env['TAILWIND_MODE'] = watch ? 'watch' : 'build';
+    }
+    return [
+        postcssImport({
+            addModulesDirectories: includePaths !== null && includePaths !== void 0 ? includePaths : [],
+            resolve: (url) => (url.startsWith('~') ? url.substr(1) : url),
+        }),
+        require(tailwindPackagePath)({ config: tailwindConfigPath }),
+    ];
+}
+exports.getTailwindPostCssPluginsIfPresent = getTailwindPostCssPluginsIfPresent;
+//# sourceMappingURL=tailwindcss.js.map

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

@@ -0,0 +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"}

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

@@ -9,10 +9,16 @@ 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 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* () {
-        const packager = (yield Promise.resolve().then(() => require('ng-packagr'))).ngPackagr();
+        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.withBuildTransform(package_di_1.NX_PACKAGE_TRANSFORM.provide);
         if (options.tsConfig) {
             // read the tsconfig and modify its path in memory to
             // pass it on to ngpackagr
@@ -31,7 +37,7 @@ 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('4.0'), context.root, context.projectName, context.targetName, context.configurationName);
+            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 }));
             }

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

@@ -1 +1 @@
-{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":";;;;AAAA,4CAA4C;AAE5C,0EAAgF;AAEhF,6FAK4D;AAE5D,+BAA+B;AAC/B,+BAA4B;AAC5B,mDAA+C;AAC/C,8CAAuD;AAGvD,SAAe,mBAAmB,CAChC,OAA2C,EAC3C,OAAwB,EACxB,mBAAoD;;QAEpD,MAAM,QAAQ,GAAG,CAAC,2CAAa,YAAY,EAAC,CAAC,CAAC,SAAS,EAAE,CAAC;QAC1D,QAAQ,CAAC,UAAU,CAAC,cAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAE5D,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,qDAAqD;YACrD,0BAA0B;YAC1B,MAAM,cAAc,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC9D,kCAAW,CAAC,mBAAmB,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC/D,QAAQ,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;SACvC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CAAA;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,mBAIuB;IAEvB,OAAO,UACL,OAA2C,EAC3C,OAAwB;;YAExB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,mDAA4B,CAC3D,sCAAsB,CAAC,KAAK,CAAC,EAC7B,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,IACE,CAAC,0DAAmC,CAClC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,YAAY,CACb,EACD;gBACA,6BAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAC;aAC5C;YAED,SAAS,iBAAiB;gBACxB,IACE,YAAY,CAAC,MAAM,GAAG,CAAC;oBACvB,OAAO,CAAC,uCAAuC,EAC/C;oBACA,oEAA6C,CAC3C,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,EACzB,MAAM,EACN,YAAY,EACZ,OAAO,CAAC,qCAAqC,CAC9C,CAAC;iBACH;YACH,CAAC;YAED,IAAI,OAAO,CAAC,KAAK,EAAE;gBACjB,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,8BAAa,CACzB,WAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAC5D,qBAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,EACvC,eAAG,CAAC,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC,EAC9B,iBAAK,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CACzB,CACF,CAAA,CAAA,CAAA,EAAC;aACH;YAED,6BAAO,WAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;iBAC7D,IAAI,CACH,qBAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,EACvC,eAAG,CAAC,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC,EAC9B,iBAAK,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CACzB;iBACA,SAAS,EAAE,EAAC;QACjB,CAAC;KAAA,CAAC;AACJ,CAAC;AAhED,sDAgEC;AAEY,QAAA,eAAe,GAAG,qBAAqB,CAAC,mBAAmB,CAAC,CAAC;AAE1E,kBAAe,uBAAe,CAAC"}
+{"version":3,"file":"package.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/package/package.impl.ts"],"names":[],"mappings":"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"}

package/src/generators/application/application.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from '@nrwl/devkit';
 import type { Schema } from './schema';
+import { Tree } from '@nrwl/devkit';
 export declare function applicationGenerator(host: Tree, schema: Partial<Schema>): Promise<() => void>;
 export default applicationGenerator;

package/src/generators/application/application.js.map

@@ -1 +1 @@
-{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/application/application.ts"],"names":[],"mappings":"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"}

package/src/generators/application/lib/add-protractor.d.ts

@@ -1,3 +1,3 @@
-import type { Tree } from '@nrwl/devkit';
+import { Tree } from '@nrwl/devkit';
 import type { NormalizedSchema } from './normalized-schema';
 export declare function addProtractor(host: Tree, options: NormalizedSchema): Promise<void>;

package/src/generators/application/lib/add-protractor.js

@@ -3,22 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProtractor = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const devkit_2 = require("@nrwl/devkit");
 const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
 const workspace_1 = require("@nrwl/workspace");
 function addProtractor(host, options) {
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { standaloneAsDefault } = devkit_1.getWorkspaceLayout(host);
         const protractorSchematic = ngcli_adapter_1.wrapAngularDevkitSchematic('@schematics/angular', 'e2e');
         yield protractorSchematic(host, {
             relatedAppName: options.name,
             rootSelector: `${options.prefix}-root`,
         });
-        if (options.standaloneConfig || standaloneAsDefault) {
+        if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : devkit_1.getWorkspaceLayout(host).standaloneAsDefault) {
             yield workspace_1.convertToNxProjectGenerator(host, {
                 project: options.e2eProjectName,
             });
         }
-        devkit_1.moveFilesToNewDirectory(host, devkit_1.joinPathFragments(options.appProjectRoot, 'e2e'), options.e2eProjectRoot);
+        devkit_2.moveFilesToNewDirectory(host, devkit_2.joinPathFragments(options.appProjectRoot, 'e2e'), options.e2eProjectRoot);
     });
 }
 exports.addProtractor = addProtractor;

package/src/generators/application/lib/add-protractor.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AAGA,yCAIsB;AACtB,8DAAwE;AACxE,+CAA8D;AAE9D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;QACvE,MAAM,EAAE,mBAAmB,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,mBAAmB,GAAG,0CAA0B,CACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,gBAAgB,IAAI,mBAAmB,EAAE;YACnD,MAAM,uCAA2B,CAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,cAAc;aAChC,CAAC,CAAC;SACJ;QAED,gCAAuB,CACrB,IAAI,EACJ,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;IACJ,CAAC;CAAA;AAxBD,sCAwBC"}
+{"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AAAA,yCAAwD;AAGxD,yCAA0E;AAC1E,8DAAwE;AACxE,+CAA8D;AAE9D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;;QACvE,MAAM,mBAAmB,GAAG,0CAA0B,CACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,2BAAkB,CAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;YACA,MAAM,uCAA2B,CAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,cAAc;aAChC,CAAC,CAAC;SACJ;QAED,gCAAuB,CACrB,IAAI,EACJ,0BAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;;CACH;AAzBD,sCAyBC"}

package/src/generators/application/lib/normalize-options.js

@@ -4,7 +4,7 @@ exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const linter_1 = require("@nrwl/linter");
 function normalizeOptions(host, options) {
-    var _a;
+    var _a, _b;
     const { appsDir, npmScope, standaloneAsDefault } = devkit_1.getWorkspaceLayout(host);
     const appDirectory = options.directory
         ? `${devkit_1.names(options.directory).fileName}/${devkit_1.names(options.name).fileName}`
@@ -20,9 +20,9 @@ function normalizeOptions(host, options) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const defaultPrefix = npmScope;
-    options.standaloneConfig = options.standaloneConfig || standaloneAsDefault;
+    options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
     // Set defaults and then overwrite with user options
-    return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, unitTestRunner: "jest" /* Jest */, e2eTestRunner: "cypress" /* Cypress */, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix: (_a = options.prefix) !== null && _a !== void 0 ? _a : defaultPrefix, name: appProjectName, appProjectRoot,
+    return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: false, skipFormat: false, unitTestRunner: "jest" /* Jest */, e2eTestRunner: "cypress" /* Cypress */, linter: linter_1.Linter.EsLint, strict: true }, options), { prefix: (_b = options.prefix) !== null && _b !== void 0 ? _b : defaultPrefix, name: appProjectName, appProjectRoot,
         e2eProjectRoot,
         e2eProjectName,
         parsedTags });

package/src/generators/application/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAIA,yCAAyD;AAEzD,yCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,IAAI,cAAc,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;QACvC,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;KAC1C;IAED,MAAM,cAAc,GAAG,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,cAAc,GAAG,GAAG,OAAO,IAAI,YAAY,MAAM,CAAC;IAExD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,mBAAmB,CAAC;IAE3E,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,cAAc,qBACd,aAAa,2BACb,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU,IACV;AACJ,CAAC;AA/CD,4CA+CC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AAIA,yCAAyD;AAEzD,yCAAsC;AAEtC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,2BAAkB,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS;QACpC,CAAC,CAAC,GAAG,cAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QACxE,CAAC,CAAC,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAEjC,IAAI,cAAc,GAAG,GAAG,cAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,MAAM,CAAC;IAC3D,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;QACvC,cAAc,GAAG,GAAG,cAAc,MAAM,CAAC;KAC1C;IAED,MAAM,cAAc,GAAG,GAAG,OAAO,IAAI,YAAY,EAAE,CAAC;IACpD,MAAM,cAAc,GAAG,GAAG,OAAO,IAAI,YAAY,MAAM,CAAC;IAExD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,aAAa,GAAG,QAAQ,CAAC;IAE/B,OAAO,CAAC,gBAAgB,GAAG,MAAA,OAAO,CAAC,gBAAgB,mCAAI,mBAAmB,CAAC;IAE3E,oDAAoD;IACpD,qCACE,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,KAAK,EAClB,cAAc,EAAE,KAAK,EACrB,SAAS,EAAE,KAAK,EAChB,UAAU,EAAE,KAAK,EACjB,cAAc,qBACd,aAAa,2BACb,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,MAAM,EAAE,IAAI,IACT,OAAO,KACV,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,aAAa,EACvC,IAAI,EAAE,cAAc,EACpB,cAAc;QACd,cAAc;QACd,cAAc;QACd,UAAU,IACV;AACJ,CAAC;AA/CD,4CA+CC"}

package/src/generators/application/lib/update-config-files.js

@@ -11,17 +11,10 @@ function updateConfigFiles(host, options) {
 }
 exports.updateConfigFiles = updateConfigFiles;
 function addProjectToNx(host, options) {
-    // nx.json
-    devkit_1.updateJson(host, '/nx.json', (json) => {
-        const resultJson = Object.assign(Object.assign({}, json), { projects: Object.assign(Object.assign({}, json.projects), { [options.name]: { tags: options.parsedTags } }) });
-        if (options.e2eTestRunner === 'protractor') {
-            resultJson.projects[options.e2eProjectName] = { tags: [] };
-            resultJson.projects[options.e2eProjectName].implicitDependencies = [
-                options.name,
-            ];
-        }
-        return resultJson;
-    });
+    // tags, implicit dependencies
+    const projectConfig = devkit_1.readProjectConfiguration(host, options.name);
+    const resultJson = Object.assign(Object.assign({}, projectConfig), { tags: options.parsedTags });
+    devkit_1.updateProjectConfiguration(host, options.name, resultJson);
 }
 function updateTsConfigCompilerOptions(host, options) {
     // tsconfig.app.json

package/src/generators/application/lib/update-config-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-config-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-config-files.ts"],"names":[],"mappings":";;;;AAGA,yCAOsB;AACtB,+CAAyD;AAGzD,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,6BAA6B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,oCAAoC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AAJD,8CAIC;AAED,SAAS,cAAc,CAAC,IAAU,EAAE,OAAyB;IAC3D,8BAA8B;IAC9B,MAAM,aAAa,GAAG,iCAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,MAAM,UAAU,mCACX,aAAa,KAChB,IAAI,EAAE,OAAO,CAAC,UAAU,GACzB,CAAC;IACF,mCAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,6BAA6B,CAAC,IAAU,EAAE,OAAyB;IAC1E,oBAAoB;IACpB,mBAAU,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACrE,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,uBAAc,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,OAEjE,CAAC,CAAC;AACN,CAAC;AAED,SAAS,oCAAoC,CAC3C,IAAU,EACV,OAAyB;IAEzB,iBAAiB;IACjB,MAAM,OAAO,GAAG,iCAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7D,IAAI,YAAY,GAAG,kCAAsB,CACvC,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,cAAc,CACvB,CAAC;IAEF,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;IAEjC,2DAA2D;IAC3D,sBAAsB;IACtB,MAAM,KAAwB,YAAY,CAAC,OAAO,CAAC,KAAK,EAAlD,EAAE,QAAQ,OAAwC,EAAnC,IAAI,sBAAnB,YAAqB,CAA6B,CAAC;IACzD,YAAY,CAAC,OAAO,CAAC,KAAK,mBACxB,QAAQ,EACR,OAAO,EAAE,CAAC,sBAAsB,CAAC,IAC9B,IAAI,CACR,CAAC;IAEF,IAAI,YAAY,CAAC,UAAU,EAAE;QAC3B,OAAO,YAAY,CAAC,UAAU,CAAC;KAChC;IAED,mCAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAE7D,IAAI,OAAO,CAAC,cAAc,sBAAwB,EAAE;QAClD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gCAAgC,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC,CAAC;KAC7D;IAED,IAAI,OAAO,CAAC,aAAa,sBAAuB,EAAE;QAChD,MAAM,QAAQ,GAAG,oBAAW,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACxC,mCAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;SAC1D;KACF;IAED,mCAAmC;IACnC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,cAAc,CAAC,CAAC;AACvD,CAAC"}

package/src/generators/application/lib/update-e2e-project.js

@@ -16,6 +16,8 @@ function updateE2eProject(tree, options) {
         targets: {
             e2e: proj.targets.e2e,
         },
+        implicitDependencies: [options.name],
+        tags: [],
     };
     project.targets.e2e.options.protractorConfig = `${options.e2eProjectRoot}/protractor.conf.js`;
     // update workspace.json / angular.json

package/src/generators/application/lib/update-e2e-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,cAAc,OAAO,CAAC,IAAI,GAAG,CAC9B,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAEpE,MAAM,IAAI,GAAG,iCAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;SACtB;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC;IAC9F,uCAAuC;IACvC,gCAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IACxB,mCAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAErD,sBAAsB;IACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,EAAE;QAC/D,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,IAAI,CAAC,CAAC;KACjE;IAED,mBAAU,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACvE,uCACK,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,uBAAc,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,OAEjE;IACJ,CAAC,CAAC,CAAC;IAEH,kBAAkB;IAClB,mBAAU,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;QACnE,uCACK,IAAI,KACP,OAAO,EAAE,GAAG,uBAAc,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAoB,IACtE;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AArDD,4CAqDC"}
+{"version":3,"file":"update-e2e-project.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/update-e2e-project.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AAGtB,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC;IAC7D,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,CACR,IAAI,EACJ,OAAO,CAAC,OAAO,CACb,GAAG,OAAO,CAAC,IAAI,kBAAkB,EACjC,cAAc,OAAO,CAAC,IAAI,GAAG,CAC9B,CACF,CAAC;IAEF,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAEpE,MAAM,IAAI,GAAG,iCAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;SACtB;QACD,oBAAoB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QACpC,IAAI,EAAE,EAAE;KACT,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,GAAG,GAAG,OAAO,CAAC,cAAc,qBAAqB,CAAC;IAC9F,uCAAuC;IACvC,gCAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;IACxB,mCAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAErD,sBAAsB;IACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,CAAC,EAAE;QAC/D,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,IAAI,CAAC,CAAC;KACjE;IAED,mBAAU,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;QACvE,uCACK,IAAI,KACP,OAAO,EAAE,iBAAiB,EAC1B,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,MAAM,EAAE,GAAG,uBAAc,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,OAEjE;IACJ,CAAC,CAAC,CAAC;IAEH,kBAAkB;IAClB,mBAAU,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,cAAc,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;QACnE,uCACK,IAAI,KACP,OAAO,EAAE,GAAG,uBAAc,CAAC,OAAO,CAAC,cAAc,CAAC,oBAAoB,IACtE;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAvDD,4CAuDC"}

package/src/generators/application/schema.json

@@ -125,8 +125,7 @@
     },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": false
+      "type": "boolean"
     },
     "mfe": {
       "description": "Generate a Module Federation configuration for the application",