@nrwl/react 14.8.7 → 14.9.0-beta.1

package/src/generators/application/files/{common → nx-welcome}/src/app/nx-welcome.tsx

@@ -238,6 +238,7 @@ export function NxWelcome({ title }: { title: string }) {
     #other-links {}
     .button-pill {
       padding: 1.5rem 2rem;
+      margin-bottom: 2rem;
       transition-duration: 300ms;
       transition-property: background-color, border-color, color, fill, stroke,
       opacity, box-shadow, transform, filter, backdrop-filter,
@@ -273,10 +274,10 @@ export function NxWelcome({ title }: { title: string }) {
     .button-pill:hover {
       color: rgba(255, 255, 255, 1) !important;
     }
-    #nx-console:hover {
+    .nx-console:hover {
       background-color: rgba(0, 122, 204, 1);
     }
-    #nx-console svg {
+    .nx-console svg {
       color: rgba(0, 122, 204, 1);
     }
     #nx-repo:hover {
@@ -532,7 +533,7 @@ export function NxWelcome({ title }: { title: string }) {
                 </svg>
               </a>
               <a
-                href="https://www.youtube.com/c/Nrwl_io/videos?utm_source=nx-project&sub_confirmation=1"
+                href="https://www.youtube.com/@NxDevtools/videos?utm_source=nx-project&sub_confirmation=1"
                 target="_blank"
                 rel="noreferrer"
                 className="list-item-link"
@@ -565,7 +566,7 @@ export function NxWelcome({ title }: { title: string }) {
                 </svg>
               </a>
               <a
-                href="https://nx.dev/react-tutorial/01-create-application?utm_source=nx-project"
+                href="https://nx.dev/react-tutorial/1-code-generation?utm_source=nx-project"
                 target="_blank"
                 rel="noreferrer"
                 className="list-item-link"
@@ -643,8 +644,7 @@ export function NxWelcome({ title }: { title: string }) {
             </div>
             <div id="other-links">
               <a
-                id="nx-console"
-                className="button-pill rounded shadow"
+                className="button-pill nx-console rounded shadow"
                 href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project"
                 target="_blank"
                 rel="noreferrer"
@@ -659,8 +659,30 @@ export function NxWelcome({ title }: { title: string }) {
                   <path d="M23.15 2.587L18.21.21a1.494 1.494 0 0 0-1.705.29l-9.46 8.63-4.12-3.128a.999.999 0 0 0-1.276.057L.327 7.261A1 1 0 0 0 .326 8.74L3.899 12 .326 15.26a1 1 0 0 0 .001 1.479L1.65 17.94a.999.999 0 0 0 1.276.057l4.12-3.128 9.46 8.63a1.492 1.492 0 0 0 1.704.29l4.942-2.377A1.5 1.5 0 0 0 24 20.06V3.939a1.5 1.5 0 0 0-.85-1.352zm-5.146 14.861L10.826 12l7.178-5.448v10.896z" />
                 </svg>
                 <span>
-                  Install Nx Console
-                  <span>Plugin for VSCode</span>
+                  Install Nx Console for VSCode
+                  <span>The official VSCode plugin for Nx.</span>
+                </span>
+              </a>
+              <a
+                className="button-pill nx-console rounded shadow"
+                href="https://plugins.jetbrains.com/plugin/21060-nx-console"
+                target="_blank"
+                rel="noreferrer"
+              >
+                <svg
+                  fill="currentColor"
+                  role="img"
+                  viewBox="0 0 24 24"
+                  xmlns="http://www.w3.org/2000/svg"
+                >
+                  <title>IntelliJ</title>
+                  <path d="M0 0v24h24V0zm3.723 3.111h5v1.834h-1.39v6.277h1.39v1.834h-5v-1.834h1.444V4.945H3.723zm11.055 0H17v6.5c0 .612-.055 1.111-.222 1.556-.167.444-.39.777-.723 1.11-.277.279-.666.557-1.11.668a3.933 3.933 0 0 1-1.445.278c-.778 0-1.444-.167-1.944-.445a4.81 4.81 0 0 1-1.279-1.056l1.39-1.555c.277.334.555.555.833.722.277.167.611.278.945.278.389 0 .721-.111 1-.389.221-.278.333-.667.333-1.278zM2.222 19.5h9V21h-9z"></path>
+                </svg>
+                <span>
+                  Install Nx Console for JetBrains
+                  <span>
+                    Available for WebStorm, Intellij IDEA Ultimate and more!
+                  </span>
                 </span>
               </a>
               <div id="nx-cloud" className="rounded shadow">

package/src/generators/application/files/{css-module → style-css-module}/src/app/__fileName__.tsx__tmpl__

@@ -3,7 +3,9 @@ import { Component } from 'react';
 <% } %>
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import styles from './<%= fileName %>.module.<%= style %>';
+<% if (!minimal) { %>
 import NxWelcome from "./nx-welcome";
+<% } %>
 
 <% if (classComponent) { %>
 export class App extends Component {
@@ -13,7 +15,14 @@ export function App() {
 <% } %>
   return (
     <>
+      <% if (!minimal) { %>
       <NxWelcome title="<%= projectName %>"/>
+     <% } else { %>
+      <h1>
+        <span> Hello there, </span>
+        Welcome <%= projectName %> 👋
+      </h1>
+     <% } %>
       <div />
     </>);
 <% if (classComponent) { %>
@@ -24,3 +33,5 @@ export function App() {
 <% } %>
 
 export default App;
+
+<% if (inSourceTests === true) { %> <%- inSourceVitestTests %> <% } %>

package/src/generators/application/files/{global-css → style-global-css}/src/app/__fileName__.tsx__tmpl__

@@ -2,7 +2,9 @@
 import { Component } from 'react';
 <% } %>
 import './<%= fileName %>.<%= style %>';
+<% if (!minimal) { %>
 import NxWelcome from "./nx-welcome";
+<% } %>
 
 <% if (classComponent) { %>
 export class App extends Component {
@@ -12,7 +14,14 @@ export function App() {
 <% } %>
   return (
   <>
+    <% if (!minimal) { %>
     <NxWelcome title="<%= projectName %>"/>
+     <% } else { %>
+      <h1>
+        <span> Hello there, </span>
+        Welcome <%= projectName %> 👋
+      </h1>
+     <% } %>
     <div />
   </>);
 <% if (classComponent) { %>
@@ -23,3 +32,5 @@ export function App() {
 <% } %>
 
 export default App;
+
+<% if (inSourceTests === true) { %> <%- inSourceVitestTests %> <% } %>

package/src/generators/application/files/{none → style-none}/src/app/__fileName__.tsx__tmpl__

@@ -1,7 +1,9 @@
 <% if (classComponent) { %>
 import  { Component } from 'react';
 <% } %>
+<% if (!minimal) { %>
 import NxWelcome from "./nx-welcome";
+<% } %>
 
 <% if (classComponent) { %>
 export class App extends Component {
@@ -11,7 +13,14 @@ export function App() {
 <% } %>
   return (
     <>
+      <% if (!minimal) { %>
       <NxWelcome title="<%= projectName %>"/>
+      <% } else { %>
+      <h1>
+        <span> Hello there, </span>
+        Welcome <%= projectName %> 👋
+      </h1>
+     <% } %>
       <div />
     </>);
 <% if (classComponent) { %>
@@ -22,3 +31,5 @@ export function App() {
 <% } %>
 
 export default App;
+
+<% if (inSourceTests === true) { %> <%- inSourceVitestTests %> <% } %>

package/src/generators/application/files/{styled-jsx → style-styled-jsx}/src/app/__fileName__.tsx__tmpl__

@@ -1,7 +1,9 @@
 <% if (classComponent) { %>
 import { Component } from 'react';
 <% } %>
+<% if (!minimal) { %>
 import NxWelcome from "./nx-welcome";
+<% } %>
 
 <% if (classComponent) { %>
 export class App extends Component {
@@ -12,7 +14,6 @@ export function App() {
   return (
     <>
       <style jsx>{`/** your style here **/`}</style>
-      <NxWelcome title="<%= projectName %>"/>
     </>
   );
 
@@ -24,3 +25,5 @@ export function App() {
 <% } %>
 
 export default App;
+
+<% if (inSourceTests === true) { %> <%- inSourceVitestTests %> <% } %>

package/src/generators/application/files/{styled-module → style-styled-module}/src/app/__fileName__.tsx__tmpl__

@@ -2,7 +2,9 @@
 import { Component } from 'react';
 <% } %>
 import styled from '<%= styledModule %>';
+<% if (!minimal) { %>
 import NxWelcome from "./nx-welcome";
+<% } %>
 
 const StyledApp = styled.div`
     // Your style here
@@ -16,7 +18,14 @@ export function App() {
 <% } %>
   return (
       <StyledApp>
+        <% if (!minimal) { %>
         <NxWelcome title="<%= projectName %>"/>
+        <% } else { %>
+          <h1>
+            <span> Hello there, </span>
+            Welcome <%= projectName %> 👋
+          </h1>
+        <% } %>
       </StyledApp>
   );
 <% if (classComponent) { %>
@@ -27,3 +36,5 @@ export function App() {
 <% } %>
 
 export default App;
+
+<% if (inSourceTests === true) { %> <%- inSourceVitestTests %> <% } %>

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

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

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

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addCypress = void 0;
 const tslib_1 = require("tslib");
-const cypress_1 = require("@nrwl/cypress");
+const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../../../utils/versions");
 function addCypress(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.e2eTestRunner !== 'cypress') {
             return () => { };
         }
-        return yield (0, cypress_1.cypressProjectGenerator)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-e2e`, directory: options.directory, project: options.projectName }));
+        const { cypressProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/cypress', versions_1.nxVersion);
+        return yield cypressProjectGenerator(host, Object.assign(Object.assign({}, options), { name: options.e2eProjectName, directory: options.directory, project: options.projectName, rootProject: options.rootProject, bundler: options.bundler }));
     });
 }
 exports.addCypress = addCypress;

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

@@ -1 +1 @@
-{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,2CAAwD;AAIxD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,MAAM,IAAA,iCAAuB,EAAC,IAAI,kCACpC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,IAC5B,CAAC;IACL,CAAC;CAAA;AAXD,gCAWC"}
+{"version":3,"file":"add-cypress.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-cypress.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AACnD,sDAAoD;AAGpD,SAAsB,UAAU,CAAC,IAAU,EAAE,OAAyB;;QACpE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAE9E,OAAO,MAAM,uBAAuB,CAAC,IAAI,kCACpC,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,cAAc,EAC5B,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,WAAW,EAAE,OAAO,CAAC,WAAW,EAChC,OAAO,EAAE,OAAO,CAAC,OAAO,IACxB,CAAC;IACL,CAAC;CAAA;AAfD,gCAeC"}

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

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

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

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = void 0;
 const tslib_1 = require("tslib");
-const jest_1 = require("@nrwl/jest");
+const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../../../utils/versions");
 function addJest(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { jestProjectGenerator } = (0, devkit_1.ensurePackage)('@nrwl/jest', versions_1.nxVersion);
         if (options.unitTestRunner !== 'jest') {
             return () => { };
         }
-        return yield (0, jest_1.jestProjectGenerator)(host, Object.assign(Object.assign({}, options), { project: options.projectName, supportTsx: true, skipSerializers: true, setupFile: 'none', compiler: options.compiler }));
+        return yield jestProjectGenerator(host, Object.assign(Object.assign({}, options), { project: options.projectName, supportTsx: true, skipSerializers: true, setupFile: 'none', compiler: options.compiler, rootProject: options.rootProject }));
     });
 }
 exports.addJest = addJest;

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

@@ -1 +1 @@
-{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":";;;;AACA,qCAAkD;AAGlD,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAyB;;QACjE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCACjC,OAAO,KACV,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,IAAI,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAC1B,CAAC;IACL,CAAC;CAAA;AAbD,0BAaC"}
+{"version":3,"file":"add-jest.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-jest.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AAEtE,sDAAoD;AAEpD,SAAsB,OAAO,CAC3B,IAAU,EACV,OAAyB;;QAEzB,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAA,sBAAa,EAAC,YAAY,EAAE,oBAAS,CAAC,CAAC;QAExE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACjB;QAED,OAAO,MAAM,oBAAoB,CAAC,IAAI,kCACjC,OAAO,KACV,OAAO,EAAE,OAAO,CAAC,WAAW,EAC5B,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,IAAI,EACrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,WAAW,EAAE,OAAO,CAAC,WAAW,IAChC,CAAC;IACL,CAAC;CAAA;AAnBD,0BAmBC"}

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

@@ -7,13 +7,16 @@ function addProject(host, options) {
         root: options.appProjectRoot,
         sourceRoot: `${options.appProjectRoot}/src`,
         projectType: 'application',
-        targets: {
-            build: createBuildTarget(options),
-            serve: createServeTarget(options),
-        },
+        targets: {},
         tags: options.parsedTags,
     };
-    (0, devkit_1.addProjectConfiguration)(host, options.projectName, Object.assign({}, project), options.standaloneConfig);
+    if (options.bundler === 'webpack') {
+        project.targets = {
+            build: createBuildTarget(options),
+            serve: createServeTarget(options),
+        };
+    }
+    (0, devkit_1.addProjectConfiguration)(host, options.projectName, Object.assign({}, project));
 }
 exports.addProject = addProject;
 function maybeJs(options, path) {
@@ -29,11 +32,12 @@ function createBuildTarget(options) {
         defaultConfiguration: 'production',
         options: {
             compiler: (_a = options.compiler) !== null && _a !== void 0 ? _a : 'babel',
-            outputPath: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot),
+            outputPath: (0, devkit_1.joinPathFragments)('dist', options.appProjectRoot != '.'
+                ? options.appProjectRoot
+                : options.projectName),
             index: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/index.html'),
             baseHref: '/',
             main: (0, devkit_1.joinPathFragments)(options.appProjectRoot, maybeJs(options, `src/main.tsx`)),
-            polyfills: (0, devkit_1.joinPathFragments)(options.appProjectRoot, maybeJs(options, 'src/polyfills.ts')),
             tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
             assets: [
                 (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/favicon.ico'),
@@ -45,7 +49,8 @@ function createBuildTarget(options) {
                     (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style}`),
                 ],
             scripts: [],
-            webpackConfig: '@nrwl/react/plugins/webpack',
+            isolatedConfig: true,
+            webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
         },
         configurations: {
             development: {

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

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

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

@@ -1,20 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRouting = void 0;
-const ts = require("typescript");
 const ast_utils_1 = require("../../../utils/ast-utils");
 const versions_1 = require("../../../utils/versions");
 const devkit_1 = require("@nrwl/devkit");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
 function addRouting(host, options) {
     if (!options.routing) {
         return () => { };
     }
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const appPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, maybeJs(options, `src/app/${options.fileName}.tsx`));
     const appFileContent = host.read(appPath, 'utf-8');
-    const appSource = ts.createSourceFile(appPath, appFileContent, ts.ScriptTarget.Latest, true);
+    const appSource = tsModule.createSourceFile(appPath, appFileContent, tsModule.ScriptTarget.Latest, true);
     const changes = (0, devkit_1.applyChangesToString)(appFileContent, (0, ast_utils_1.addInitialRoutes)(appPath, appSource));
     host.write(appPath, changes);
-    return (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, { '@types/react-router-dom': versions_1.typesReactRouterDomVersion });
+    if (!options.skipPackageJson) {
+        return (0, devkit_1.addDependenciesToPackageJson)(host, { 'react-router-dom': versions_1.reactRouterDomVersion }, { '@types/react-router-dom': versions_1.typesReactRouterDomVersion });
+    }
+    return () => { };
 }
 exports.addRouting = addRouting;
 function maybeJs(options, path) {

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

@@ -1 +1 @@
-{"version":3,"file":"add-routing.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-routing.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,wDAA4D;AAE5D,sDAGiC;AACjC,yCAKsB;AAEtB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAC/B,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,WAAW,OAAO,CAAC,QAAQ,MAAM,CAAC,CACpD,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,EAAE,CAAC,gBAAgB,CACnC,OAAO,EACP,cAAc,EACd,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,cAAc,EACd,IAAA,4BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC,CACrC,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE7B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,kBAAkB,EAAE,gCAAqB,EAAE,EAC7C,EAAE,yBAAyB,EAAE,qCAA0B,EAAE,CAC1D,CAAC;AACJ,CAAC;AA5BD,gCA4BC;AAED,SAAS,OAAO,CAAC,OAAyB,EAAE,IAAY;IACtD,OAAO,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC"}
+{"version":3,"file":"add-routing.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/add-routing.ts"],"names":[],"mappings":";;;AAAA,wDAA4D;AAE5D,sDAGiC;AACjC,yCAKsB;AACtB,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACjB;IAED,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,OAAO,GAAG,IAAA,0BAAiB,EAC/B,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,OAAO,EAAE,WAAW,OAAO,CAAC,QAAQ,MAAM,CAAC,CACpD,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,MAAM,SAAS,GAAG,QAAQ,CAAC,gBAAgB,CACzC,OAAO,EACP,cAAc,EACd,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAClC,cAAc,EACd,IAAA,4BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC,CACrC,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE7B,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;QAC5B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,kBAAkB,EAAE,gCAAqB,EAAE,EAC7C,EAAE,yBAAyB,EAAE,qCAA0B,EAAE,CAC1D,CAAC;KACH;IAED,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;AAClB,CAAC;AAnCD,gCAmCC;AAED,SAAS,OAAO,CAAC,OAAyB,EAAE,IAAY;IACtD,OAAO,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAClE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;QAChC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC"}

package/src/generators/application/lib/create-application-files.d.ts

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

package/src/generators/application/lib/create-application-files.js

@@ -2,43 +2,46 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApplicationFiles = void 0;
 const devkit_1 = require("@nrwl/devkit");
+const js_1 = require("@nrwl/js");
 const path_1 = require("path");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
-function updateTsConfig(host, options) {
-    (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
-        if (options.strict) {
-            json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { forceConsistentCasingInFileNames: true, strict: true, noImplicitOverride: true, noPropertyAccessFromIndexSignature: true, noImplicitReturns: true, noFallthroughCasesInSwitch: true });
-        }
-        return json;
-    });
-}
+const create_ts_config_1 = require("../../../utils/create-ts-config");
+const get_in_source_vitest_tests_template_1 = require("../../../utils/get-in-source-vitest-tests-template");
+const get_app_tests_1 = require("./get-app-tests");
 function createApplicationFiles(host, options) {
     let styleSolutionSpecificAppFiles;
     if (options.styledModule && options.style !== 'styled-jsx') {
-        styleSolutionSpecificAppFiles = '../files/styled-module';
+        styleSolutionSpecificAppFiles = '../files/style-styled-module';
     }
     else if (options.style === 'styled-jsx') {
-        styleSolutionSpecificAppFiles = '../files/styled-jsx';
+        styleSolutionSpecificAppFiles = '../files/style-styled-jsx';
     }
     else if (options.style === 'none') {
-        styleSolutionSpecificAppFiles = '../files/none';
+        styleSolutionSpecificAppFiles = '../files/style-none';
     }
     else if (options.globalCss) {
-        styleSolutionSpecificAppFiles = '../files/global-css';
+        styleSolutionSpecificAppFiles = '../files/style-global-css';
     }
     else {
-        styleSolutionSpecificAppFiles = '../files/css-module';
+        styleSolutionSpecificAppFiles = '../files/style-css-module';
     }
-    const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), rootTsConfigPath: (0, typescript_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot) });
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/common'), options.appProjectRoot, templateVariables);
-    if (options.unitTestRunner === 'none') {
+    const relativePathToRootTsConfig = (0, js_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot);
+    const appTests = (0, get_app_tests_1.getAppTests)(options);
+    const templateVariables = Object.assign(Object.assign(Object.assign({}, (0, devkit_1.names)(options.name)), options), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot), appTests, inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(appTests) });
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, options.bundler === 'vite'
+        ? '../files/base-vite'
+        : '../files/base-webpack'), options.appProjectRoot, templateVariables);
+    if (options.unitTestRunner === 'none' ||
+        (options.unitTestRunner === 'vitest' && options.inSourceTests == true)) {
         host.delete(`${options.appProjectRoot}/src/app/${options.fileName}.spec.tsx`);
     }
+    if (!options.minimal) {
+        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/nx-welcome'), options.appProjectRoot, templateVariables);
+    }
     (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, styleSolutionSpecificAppFiles), options.appProjectRoot, templateVariables);
     if (options.js) {
         (0, devkit_1.toJS)(host);
     }
-    updateTsConfig(host, options);
+    (0, create_ts_config_1.createTsConfig)(host, options.appProjectRoot, 'app', options, relativePathToRootTsConfig);
 }
 exports.createApplicationFiles = createApplicationFiles;
 //# sourceMappingURL=create-application-files.js.map

package/src/generators/application/lib/create-application-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AACA,yCAQsB;AACtB,+BAA4B;AAC5B,yEAAyF;AAEzF,SAAS,cAAc,CAAC,IAAU,EAAE,OAAyB;IAC3D,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,EAC1D,CAAC,IAAI,EAAE,EAAE;QACP,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,eAAe,mCACf,IAAI,CAAC,eAAe,KACvB,gCAAgC,EAAE,IAAI,EACtC,MAAM,EAAE,IAAI,EACZ,kBAAkB,EAAE,IAAI,EACxB,kCAAkC,EAAE,IAAI,EACxC,iBAAiB,EAAE,IAAI,EACvB,0BAA0B,EAAE,IAAI,GACjC,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CACF,CAAC;AACJ,CAAC;AAED,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,IAAI,6BAAqC,CAAC;IAC1C,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QAC1D,6BAA6B,GAAG,wBAAwB,CAAC;KAC1D;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QACzC,6BAA6B,GAAG,qBAAqB,CAAC;KACvD;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,EAAE;QACnC,6BAA6B,GAAG,eAAe,CAAC;KACjD;SAAM,IAAI,OAAO,CAAC,SAAS,EAAE;QAC5B,6BAA6B,GAAG,qBAAqB,CAAC;KACvD;SAAM;QACL,6BAA6B,GAAG,qBAAqB,CAAC;KACvD;IAED,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,EACtD,gBAAgB,EAAE,IAAA,0CAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB,GACF,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,iBAAiB,CAAC,EAClC,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CACT,GAAG,OAAO,CAAC,cAAc,YAAY,OAAO,CAAC,QAAQ,WAAW,CACjE,CAAC;KACH;IACD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC9C,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;IAED,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC;AAjDD,wDAiDC"}
+{"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;AAAA,yCAAgF;AAChF,iCAAyD;AACzD,+BAA4B;AAC5B,sEAAiE;AACjE,4GAAoG;AAEpG,mDAA8C;AAE9C,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,IAAI,6BAAqC,CAAC;IAC1C,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QAC1D,6BAA6B,GAAG,8BAA8B,CAAC;KAChE;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;QACzC,6BAA6B,GAAG,2BAA2B,CAAC;KAC7D;SAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,EAAE;QACnC,6BAA6B,GAAG,qBAAqB,CAAC;KACvD;SAAM,IAAI,OAAO,CAAC,SAAS,EAAE;QAC5B,6BAA6B,GAAG,2BAA2B,CAAC;KAC7D;SAAM;QACL,6BAA6B,GAAG,2BAA2B,CAAC;KAC7D;IAED,MAAM,0BAA0B,GAAG,IAAA,kCAA6B,EAC9D,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB,CAAC;IACF,MAAM,QAAQ,GAAG,IAAA,2BAAW,EAAC,OAAO,CAAC,CAAC;IACtC,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,cAAc,CAAC,EACtD,QAAQ,EACR,mBAAmB,EAAE,IAAA,oEAA8B,EAAC,QAAQ,CAAC,GAC9D,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EACF,SAAS,EACT,OAAO,CAAC,OAAO,KAAK,MAAM;QACxB,CAAC,CAAC,oBAAoB;QACtB,CAAC,CAAC,uBAAuB,CAC5B,EACD,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IACE,OAAO,CAAC,cAAc,KAAK,MAAM;QACjC,CAAC,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC,EACtE;QACA,IAAI,CAAC,MAAM,CACT,GAAG,OAAO,CAAC,cAAc,YAAY,OAAO,CAAC,QAAQ,WAAW,CACjE,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,qBAAqB,CAAC,EACtC,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;KACH;IAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC9C,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;KACZ;IAED,IAAA,iCAAc,EACZ,IAAI,EACJ,OAAO,CAAC,cAAc,EACtB,KAAK,EACL,OAAO,EACP,0BAA0B,CAC3B,CAAC;AACJ,CAAC;AA5ED,wDA4EC"}

package/src/generators/application/lib/get-app-tests.d.ts

@@ -0,0 +1,2 @@
+import { NormalizedSchema } from '../schema';
+export declare function getAppTests(options: NormalizedSchema): string;

package/src/generators/application/lib/get-app-tests.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAppTests = void 0;
+function getAppTests(options) {
+    return `
+it('should render successfully', () => {
+  ${options.routing
+        ? 'const { baseElement } = render(<BrowserRouter><App /></BrowserRouter>);'
+        : 'const { baseElement } = render(<App />);'}
+  expect(baseElement).toBeTruthy();
+});
+
+it('should have a greeting as the title', () => {
+  ${options.routing
+        ? 'const { getByText } = render(<BrowserRouter><App /></BrowserRouter>);'
+        : 'const { getByText } = render(<App />);'}
+  expect(getByText(/Welcome ${options.projectName}/gi)).toBeTruthy();
+});
+`;
+}
+exports.getAppTests = getAppTests;
+//# sourceMappingURL=get-app-tests.js.map

package/src/generators/application/lib/get-app-tests.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-app-tests.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/get-app-tests.ts"],"names":[],"mappings":";;;AAEA,SAAgB,WAAW,CAAC,OAAyB;IACnD,OAAO;;IAGL,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,yEAAyE;QAC3E,CAAC,CAAC,0CACN;;;;;IAME,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,uEAAuE;QACzE,CAAC,CAAC,wCACN;8BAC4B,OAAO,CAAC,WAAW;;CAEhD,CAAC;AACF,CAAC;AApBD,kCAoBC"}

package/src/generators/application/lib/install-common-dependencies.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+import { NormalizedSchema } from '../schema';
+export declare function installCommonDependencies(host: Tree, options: NormalizedSchema): import("@nrwl/devkit").GeneratorCallback;

package/src/generators/application/lib/install-common-dependencies.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installCommonDependencies = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../../../utils/versions");
+function installCommonDependencies(host, options) {
+    let devDependencies = null;
+    // Vite requires style preprocessors to be installed manually.
+    // `@nrwl/webpack` installs them automatically for now.
+    // TODO(jack): Once we clean up webpack we can remove this check
+    if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
+        switch (options.style) {
+            case 'scss':
+                devDependencies = { sass: versions_1.sassVersion };
+                break;
+            case 'less':
+                devDependencies = { less: versions_1.lessVersion };
+                break;
+            case 'styl':
+                devDependencies = { stylus: versions_1.stylusVersion };
+                break;
+        }
+    }
+    return devDependencies
+        ? (0, devkit_1.addDependenciesToPackageJson)(host, {}, devDependencies)
+        : function noop() { };
+}
+exports.installCommonDependencies = installCommonDependencies;
+//# sourceMappingURL=install-common-dependencies.js.map

package/src/generators/application/lib/install-common-dependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"install-common-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/application/lib/install-common-dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,sDAIiC;AAGjC,SAAgB,yBAAyB,CACvC,IAAU,EACV,OAAyB;IAEzB,IAAI,eAAe,GAAG,IAAI,CAAC;IAE3B,8DAA8D;IAC9D,uDAAuD;IACvD,gEAAgE;IAChE,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,CAAC,cAAc,KAAK,QAAQ,EAAE;QACrE,QAAQ,OAAO,CAAC,KAAK,EAAE;YACrB,KAAK,MAAM;gBACT,eAAe,GAAG,EAAE,IAAI,EAAE,sBAAW,EAAE,CAAC;gBACxC,MAAM;YACR,KAAK,MAAM;gBACT,eAAe,GAAG,EAAE,IAAI,EAAE,sBAAW,EAAE,CAAC;gBACxC,MAAM;YACR,KAAK,MAAM;gBACT,eAAe,GAAG,EAAE,MAAM,EAAE,wBAAa,EAAE,CAAC;gBAC5C,MAAM;SACT;KACF;IAED,OAAO,eAAe;QACpB,CAAC,CAAC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,eAAe,CAAC;QACzD,CAAC,CAAC,SAAS,IAAI,KAAI,CAAC,CAAC;AACzB,CAAC;AA1BD,8DA0BC"}

package/src/generators/application/lib/normalize-options.d.ts

@@ -2,4 +2,4 @@ import { NormalizedSchema, Schema } from '../schema';
 import { Tree } from '@nrwl/devkit';
 export declare function normalizeDirectory(options: Schema): string;
 export declare function normalizeProjectName(options: Schema): string;
-export declare function normalizeOptions(host: Tree, options: Schema): NormalizedSchema;
+export declare function normalizeOptions<T extends Schema = Schema>(host: Tree, options: Schema): NormalizedSchema<T>;