@nrwl/angular 13.5.0-beta.1 → 13.5.0-beta.5

package/README.md

@@ -15,126 +15,10 @@
 
 <hr>
 
-# Angular Plugin for Nx
-
-The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications, and libraries within an Nx workspace. It provides:
-
-- Integration with libraries such as Jest, Cypress, Karma, Protractor, and Storybook.
-- Helper services, and functions to use along with NgRx libraries.
-- Scaffolding for upgrading AngularJS applications.
-- Scaffolding for creating buildable libraries that can be published to npm.
-- Utilities for automatic workspace refactoring.
-
-## Adding the Angular plugin
-
-Adding the Angular plugin to a workspace can be done with the following:
-
-```bash
-#yarn
-yarn add @nrwl/angular
-```
-
-```bash
-#npm
-npm install @nrwl/angular
-```
-
-For more information about the `@nrwl/angular` package take a look at the [Angular Plugin Overview](https://nx.dev/angular/overview).
-
-# Smart, Fast and Extensible Build System
+# Nx: Smart, Fast and Extensible Build System
 
 Nx is a next generation build system with first class monorepo support and powerful integrations.
 
+This package is an [Angular plugin for Nx](https://nx.dev/angular/overview).
 
-## Getting Started
-
-### Creating an Nx Workspace
-
-**Using `npx`**
-
-```bash
-npx create-nx-workspace
-```
-
-**Using `npm init`**
-
-```bash
-npm init nx-workspace
-```
-
-**Using `yarn create`**
-
-```bash
-yarn create nx-workspace
-```
-
-The `create-nx-workspace` command will ask you to select a preset, which will configure some plugins and create your applications to help you get started.
-
-```
-? What to create in the new workspace (Use arrow keys)
-❯ apps              [an empty workspace with no plugins with a layout that works best for building apps]
-  core              [an empty workspace with no plugins set up to publish npm packages (similar to yarn workspaces)]
-  ts                [an empty workspace with the JS/TS plugin preinstalled]
-  react             [a workspace with a single React application]
-  angular           [a workspace with a single Angular application]
-  next.js           [a workspace with a single Next.js application]
-  gatsby            [a workspace with a single Gatsby application]
-  nest              [a workspace with a single Nest application]
-  express           [a workspace with a single Express application]
-  web components    [a workspace with a single app built using web components]
-  react-native      [a workspace with a single React Native application]
-  react-express     [a workspace with a full stack application (React + Express)]
-```
-
-Select the preset that works best for you.
-
-### Adding Nx to an Existing Monorepo
-
-Run:
-
-```bash
-npx add-nx-to-monorepo@latest
-```
-
-
-```
-
-✔ Workspace name (e.g., org name)     · happyorg
-✔ What to create in the new workspace · angular
-✔ Application name                    · my app
-✔ Default stylesheet format           · css
-
-```
-
-### Serving Application
-
-- Run `nx serve myapp` to serve the newly generated application!
-- Run `nx test myapp` to test it.
-- Run `nx e2e myapp-e2e` to run e2e tests for it.
-
-You can also use `ng` instead of `nx`:
-
-- Run `ng serve myapp` to serve the newly generated application!
-- Run `ng test myapp` to test it.
-- Run `ng e2e myapp-e2e` to run e2e tests for it.
-
-## Quick Start Videos
-
-<a href="https://www.youtube.com/watch?v=mVKMse-gFBI" target="_blank">
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-angular-video.png" width="350" alt="Nx - Quick Start Videos"></p>
-</a>
-
-- [Nx Dev Tools for Monorepos, In-Depth Explainer](https://youtu.be/h5FIGDn5YM0)
-
-## Documentation & Resources
-
-A few links to help you get started:
-
-- [Nx.Dev: Documentation, Guides, Interactive Tutorials](https://nx.dev)
-- [Tutorial: Adding Nx to an Existing Monorepo](https://nx.dev/migration/adding-to-monorepo)
-- [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
-- [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
-
-<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank"><img src="./images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
-
+{{content}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "13.5.0-beta.1",
+  "version": "13.5.0-beta.5",
   "description": "Angular Plugin for Nx",
   "repository": {
     "type": "git",
@@ -56,11 +56,11 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~13.1.0",
-    "@nrwl/cypress": "13.5.0-beta.1",
-    "@nrwl/devkit": "13.5.0-beta.1",
-    "@nrwl/jest": "13.5.0-beta.1",
-    "@nrwl/linter": "13.5.0-beta.1",
-    "@nrwl/storybook": "13.5.0-beta.1",
+    "@nrwl/cypress": "13.5.0-beta.5",
+    "@nrwl/devkit": "13.5.0-beta.5",
+    "@nrwl/jest": "13.5.0-beta.5",
+    "@nrwl/linter": "13.5.0-beta.5",
+    "@nrwl/storybook": "13.5.0-beta.5",
     "@schematics/angular": "~13.1.0",
     "@phenomnomnominal/tsquery": "4.1.1",
     "ignore": "^5.0.4",

package/src/builders/webpack-browser/webpack-browser.impl.js

@@ -34,7 +34,7 @@ function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackC
             // The extra Webpack configuration file can export a synchronous or asynchronous function,
             // for instance: `module.exports = async config => { ... }`.
             if (typeof customWebpackConfiguration === 'function') {
-                return customWebpackConfiguration(baseWebpackConfig);
+                return customWebpackConfiguration(baseWebpackConfig, options, context.target);
             }
             else {
                 return (0, webpack_merge_1.merge)(baseWebpackConfig, 

package/src/builders/webpack-browser/webpack-browser.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":";;;AAAA,yDAImC;AACnC,iEAAsE;AAGtE,yCAAiD;AACjD,0EAAgF;AAChF,6FAI4D;AAC5D,2BAAgC;AAChC,+BAA4B;AAC5B,+BAA4C;AAC5C,8CAA2C;AAC3C,iDAAsC;AACtC,kDAAkE;AAQlE,SAAS,QAAQ,CACf,OAA6B,EAC7B,OAAuB;IAEvB,MAAM,EAAE,mBAAmB,KAAyB,OAAO,EAA3B,eAAe,uBAAK,OAAO,EAArD,uBAA2C,CAAU,CAAC;IAC5D,8CAA8C;IAC9C,mDAAmD;IACnD,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,sCAAsC,CAC3C,eAAe,EACf,OAAO,EACP,mBAAmB,CACpB,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,OAAO,IAAA,qCAAqB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,sCAAsC,CAC7C,OAAe,EACf,OAAuB,EACvB,mBAA2B;IAE3B,OAAO,IAAA,qCAAqB,EAAC,OAAO,EAAE,OAAc,EAAE;QACpD,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,MAAM,0BAA0B,GAAG,IAAA,oCAA0B,EAC3D,mBAAmB,EACnB,OAAO,CAAC,QAAQ,CACjB,CAAC;YACF,0FAA0F;YAC1F,4DAA4D;YAC5D,IAAI,OAAO,0BAA0B,KAAK,UAAU,EAAE;gBACpD,OAAO,0BAA0B,CAC/B,iBAAiB,EACjB,OAAO,EACP,OAAO,CAAC,MAAM,CACf,CAAC;aACH;iBAAM;gBACL,OAAO,IAAA,qBAAK,EACV,iBAAiB;gBACjB,gFAAgF;gBAChF,yFAAyF;gBACzF,4CAA4C;gBAC5C,MAAM,0BAA0B,CACjC,CAAC;aACH;QACH,CAAC,CAAA;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,GAAG,CACV,OAA6B,EAC7B,OAAuB;IAEvB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,mDAA4B,EAC3D,IAAA,sCAAsB,GAAE,EACxB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EACrB,OAAO,CAAC,MAAM,CAAC,aAAa,CAC7B,CAAC;IAEF,OAAO,CAAC,QAAQ,GAAG,IAAA,wCAAiB,EAClC,IAAA,WAAI,EAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7C,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,IAAI,CAAC,IAAI,EAChB,YAAY,CACb,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAEhD,OAAO,IAAA,SAAE,EACP,IAAA,0DAAmC,EACjC,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EACrB,YAAY,CACb,CACF,CAAC,IAAI,CACJ,IAAA,qBAAS,EAAC,CAAC,MAAM,EAAE,EAAE;QACnB,IAAI,MAAM,EAAE;YACV,OAAO,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACnC;aAAM;YACL,0BAA0B;YAC1B,OAAO,IAAA,SAAE,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,kBAAe,IAAA,yBAAa,EAAoC,GAAG,CAAQ,CAAC"}

package/src/generators/setup-tailwind/files/v2/tailwind.config.js__tmpl__

@@ -1,4 +1,4 @@
-<% if (projectType === 'application') { %>const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
 const { join } = require('path');
 
 module.exports = {
@@ -6,7 +6,7 @@ module.exports = {
   purge: [
     join(__dirname, '<%= relativeSourceRoot %>/**/*.{html,ts}'),
     ...createGlobPatternsForDependencies(__dirname),
-  ],<% } else { %>module.exports = {<% } %>
+  ],
   darkMode: false, // or 'media' or 'class'
   theme: {
     extend: {},

package/src/generators/setup-tailwind/files/v3/tailwind.config.js__tmpl__

@@ -1,11 +1,11 @@
-<% if (projectType === 'application') { %>const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
+const { createGlobPatternsForDependencies } = require('@nrwl/angular/tailwind');
 const { join } = require('path');
 
 module.exports = {
   content: [
     join(__dirname, '<%= relativeSourceRoot %>/**/*.{html,ts}'),
     ...createGlobPatternsForDependencies(__dirname),
-  ],<% } else { %>module.exports = {<% } %>
+  ],
   theme: {
     extend: {},
   },

package/src/generators/setup-tailwind/lib/add-tailwind-config.js

@@ -10,7 +10,6 @@ function addTailwindConfig(tree, options, project, tailwindVersion) {
     }
     const filesDir = tailwindVersion === '3' ? 'files/v3' : 'files/v2';
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', filesDir), project.root, {
-        projectType: project.projectType,
         relativeSourceRoot: (0, path_1.relative)(project.root, project.sourceRoot),
         tmpl: '',
     });

package/src/generators/setup-tailwind/lib/add-tailwind-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-tailwind-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-tailwind/lib/add-tailwind-config.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAAgC;AAGhC,SAAgB,iBAAiB,CAC/B,IAAU,EACV,OAAyB,EACzB,OAA6B,EAC7B,eAA0B;IAE1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE;QACtE,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,gEAAgE,OAAO,CAAC,OAAO;kFACf,CAC7E,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,eAAe,KAAK,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;IAEnE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,EAC5C,OAAO,CAAC,IAAI,EACZ;QACE,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,kBAAkB,EAAE,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;QAC9D,IAAI,EAAE,EAAE;KACT,CACF,CAAC;AACJ,CAAC;AAzBD,8CAyBC"}
+{"version":3,"file":"add-tailwind-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-tailwind/lib/add-tailwind-config.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAAgC;AAGhC,SAAgB,iBAAiB,CAC/B,IAAU,EACV,OAAyB,EACzB,OAA6B,EAC7B,eAA0B;IAE1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,EAAE;QACtE,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,gEAAgE,OAAO,CAAC,OAAO;kFACf,CAC7E,CAAC;KACH;IAED,MAAM,QAAQ,GAAG,eAAe,KAAK,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;IAEnE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,EAC5C,OAAO,CAAC,IAAI,EACZ;QACE,kBAAkB,EAAE,IAAA,eAAQ,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;QAC9D,IAAI,EAAE,EAAE;KACT,CACF,CAAC;AACJ,CAAC;AAxBD,8CAwBC"}

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autoprefixerVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularArchitectsModuleFederationPluginVersion = exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
-exports.nxVersion = '13.5.0-beta.1';
+exports.nxVersion = '13.5.0-beta.5';
 exports.angularVersion = '~13.1.0';
 exports.angularDevkitVersion = '~13.1.0';
 exports.angularJsVersion = '1.7.9';