@nx/next 0.0.0-pr-29314-e664f92 → 0.0.0-pr-29314-bfd9d0c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "0.0.0-pr-29314-e664f92",
+  "version": "0.0.0-pr-29314-bfd9d0c",
   "private": false,
   "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Playwright, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,7 +35,7 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-29314-e664f92",
+    "@nx/devkit": "0.0.0-pr-29314-bfd9d0c",
     "@babel/plugin-proposal-decorators": "^7.22.7",
     "@svgr/webpack": "^8.0.1",
     "copy-webpack-plugin": "^10.2.4",
@@ -44,11 +44,11 @@
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
-    "@nx/js": "0.0.0-pr-29314-e664f92",
-    "@nx/eslint": "0.0.0-pr-29314-e664f92",
-    "@nx/react": "0.0.0-pr-29314-e664f92",
-    "@nx/web": "0.0.0-pr-29314-e664f92",
-    "@nx/webpack": "0.0.0-pr-29314-e664f92",
+    "@nx/js": "0.0.0-pr-29314-bfd9d0c",
+    "@nx/eslint": "0.0.0-pr-29314-bfd9d0c",
+    "@nx/react": "0.0.0-pr-29314-bfd9d0c",
+    "@nx/web": "0.0.0-pr-29314-bfd9d0c",
+    "@nx/webpack": "0.0.0-pr-29314-bfd9d0c",
     "@phenomnomnominal/tsquery": "~5.0.1"
   },
   "publishConfig": {

package/src/generators/application/application.js

@@ -90,6 +90,11 @@ async function applicationGeneratorInternal(host, schema) {
     }, options.linter === 'eslint'
         ? ['.next', 'eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : ['.next'], options.src ? 'src' : '.');
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.useTsSolution) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/files/common/tsconfig.json__tmpl__

@@ -5,6 +5,7 @@
     <% if (style === '@emotion/styled') { %>"jsxImportSource": "@emotion/react",<% } %>
     "strict": true,
     "noEmit": true,
+    "emitDeclarationOnly": false,
     "esModuleInterop": true,
     "module": "esnext",
     "moduleResolution": "bundler",

package/src/generators/component/schema.json

@@ -41,6 +41,10 @@
             "value": "less",
             "label": "LESS              [ https://lesscss.org            ]"
           },
+          {
+            "value": "tailwind",
+            "label": "tailwind          [ https://tailwindcss.com/       ]"
+          },
           {
             "value": "styled-components",
             "label": "styled-components [ https://styled-components.com ]"

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

@@ -3,5 +3,6 @@ import { Schema } from '../schema';
 export interface NormalizedSchema extends Schema {
     importPath: string;
     projectRoot: string;
+    isUsingTsSolutionConfig: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
     await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectRoot, importPath } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -19,5 +20,6 @@ async function normalizeOptions(host, options) {
         ...options,
         importPath,
         projectRoot,
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
 }

package/src/generators/library/library.js

@@ -60,7 +60,10 @@ async function libraryGeneratorInternal(host, rawOptions) {
         return <h1>Hello Server</h1>
       }
     `);
-    (0, js_1.addTsConfigPath)(host, `${options.importPath}/server`, [serverEntryPath]);
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    if (!options.skipTsConfig && !isTsSolutionSetup) {
+        (0, js_1.addTsConfigPath)(host, `${options.importPath}/server`, [serverEntryPath]);
+    }
     (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {
         if (options.style === '@emotion/styled') {
             json.compilerOptions.jsxImportSource = '@emotion/react';
@@ -90,6 +93,9 @@ async function libraryGeneratorInternal(host, rawOptions) {
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/library/schema.json

@@ -43,6 +43,10 @@
             "value": "less",
             "label": "LESS              [ https://lesscss.org            ]"
           },
+          {
+            "value": "tailwind",
+            "label": "tailwind          [ https://tailwindcss.com/       ]"
+          },
           {
             "value": "styled-components",
             "label": "styled-components [ https://styled-components.com ]"