@nx/next 16.8.0-beta.1 → 16.8.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.8.0-beta.1",
+  "version": "16.8.0-beta.2",
   "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, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
   "repository": {
@@ -35,17 +35,16 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.22.7",
-    "@nrwl/next": "16.8.0-beta.1",
-    "@nx/devkit": "16.8.0-beta.1",
-    "@nx/js": "16.8.0-beta.1",
-    "@nx/linter": "16.8.0-beta.1",
-    "@nx/react": "16.8.0-beta.1",
-    "@nx/web": "16.8.0-beta.1",
-    "@nx/workspace": "16.8.0-beta.1",
+    "@nrwl/next": "16.8.0-beta.2",
+    "@nx/devkit": "16.8.0-beta.2",
+    "@nx/js": "16.8.0-beta.2",
+    "@nx/linter": "16.8.0-beta.2",
+    "@nx/react": "16.8.0-beta.2",
+    "@nx/web": "16.8.0-beta.2",
+    "@nx/workspace": "16.8.0-beta.2",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
-    "dotenv": "~16.3.1",
     "fs-extra": "^11.1.0",
     "ignore": "^5.0.4",
     "semver": "7.5.3",
@@ -57,5 +56,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "231a998e004c13e559c171ba6c164a9127886153"
+  "gitHead": "9bcc04742f9e1516d8c1ddbfb1907770c347876f"
 }

package/src/executors/build/build.impl.d.ts

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { ExecutorContext } from '@nx/devkit';
 import { NextBuildBuilderOptions } from '../../utils/types';
 export default function buildExecutor(options: NextBuildBuilderOptions, context: ExecutorContext): Promise<{

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-require("dotenv/config");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const path_1 = require("path");

package/src/executors/export/export.impl.d.ts

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { ExecutorContext } from '@nx/devkit';
 import { NextExportBuilderOptions } from '../../utils/types';
 /**

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-require("dotenv/config");
 const devkit_1 = require("@nx/devkit");
 const export_1 = require("next/dist/export");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");

package/src/executors/server/custom-server.impl.d.ts

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { ExecutorContext } from '@nx/devkit';
 import { NextServeBuilderOptions } from '../../utils/types';
 export default function serveExecutor(options: NextServeBuilderOptions, context: ExecutorContext): AsyncGenerator<{

package/src/executors/server/custom-server.impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-require("dotenv/config");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 function serveExecutor(options, context) {

package/src/executors/server/server.impl.d.ts

@@ -1,4 +1,3 @@
-import 'dotenv/config';
 import { ExecutorContext } from '@nx/devkit';
 import { NextServeBuilderOptions } from '../../utils/types';
 export default function serveExecutor(options: NextServeBuilderOptions, context: ExecutorContext): AsyncGenerator<{

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-require("dotenv/config");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");

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

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const linter_1 = require("@nx/linter");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("@nx/react/src/utils/lint");
+const eslint_file_1 = require("@nx/linter/src/generators/utils/eslint-file");
 function addLinting(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const lintTask = yield (0, linter_1.lintProjectGenerator)(host, {
@@ -18,46 +19,38 @@ function addLinting(host, options) {
             skipFormat: true,
             rootProject: options.rootProject,
         });
-        if (options.linter === linter_1.Linter.EsLint) {
-            (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, '.eslintrc.json'), (json) => {
-                var _a, _b, _c;
-                json = (0, lint_1.extendReactEslintJson)(json);
-                // Turn off @next/next/no-html-link-for-pages since there is an issue with nextjs throwing linting errors
-                // TODO(nicholas): remove after Vercel updates nextjs linter to only lint ["*.ts", "*.tsx", "*.js", "*.jsx"]
-                json.ignorePatterns = [...json.ignorePatterns, '.next/**/*'];
-                json.rules = Object.assign({ '@next/next/no-html-link-for-pages': 'off' }, json.rules);
-                // Find the override that handles both TS and JS files.
-                const commonOverride = (_a = json.overrides) === null || _a === void 0 ? void 0 : _a.find((o) => ['*.ts', '*.tsx', '*.js', '*.jsx'].every((ext) => o.files.includes(ext)));
-                if (commonOverride) {
-                    // Only set parserOptions.project if it already exists (defined by options.setParserOptionsProject)
-                    if ((_b = commonOverride.parserOptions) === null || _b === void 0 ? void 0 : _b.project) {
-                        commonOverride.parserOptions.project = [
-                            `${options.appProjectRoot}/tsconfig(.*)?.json`,
-                        ];
-                    }
-                    // Configure custom pages directory for next rule
-                    if (commonOverride.rules) {
-                        commonOverride.rules = Object.assign(Object.assign({}, commonOverride.rules), { '@next/next/no-html-link-for-pages': [
-                                'error',
-                                `${options.appProjectRoot}/pages`,
-                            ] });
-                    }
-                }
-                (_c = json.extends) !== null && _c !== void 0 ? _c : (json.extends = []);
-                if (typeof json.extends === 'string') {
-                    json.extends = [json.extends];
-                }
-                // add next.js configuration
-                json.extends.unshift(...['next', 'next/core-web-vitals']);
-                // remove nx/react plugin, as it conflicts with the next.js one
-                json.extends = json.extends.filter((name) => name !== 'plugin:@nx/react' && name !== 'plugin:@nrwl/nx/react');
-                json.extends.unshift('plugin:@nx/react-typescript');
-                if (!json.env) {
-                    json.env = {};
-                }
-                json.env.jest = true;
-                return json;
-            });
+        if (options.linter === linter_1.Linter.EsLint && (0, eslint_file_1.isEslintConfigSupported)(host)) {
+            (0, eslint_file_1.addExtendsToLintConfig)(host, options.appProjectRoot, [
+                'plugin:@nx/react-typescript',
+                'next',
+                'next/core-web-vitals',
+            ]);
+            // Turn off @next/next/no-html-link-for-pages since there is an issue with nextjs throwing linting errors
+            // TODO(nicholas): remove after Vercel updates nextjs linter to only lint ["*.ts", "*.tsx", "*.js", "*.jsx"]
+            (0, eslint_file_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
+                files: ['*.*'],
+                rules: {
+                    '@next/next/no-html-link-for-pages': 'off',
+                },
+            }, { insertAtTheEnd: false });
+            (0, eslint_file_1.updateOverrideInLintConfig)(host, options.appProjectRoot, (o) => Array.isArray(o.files) &&
+                o.files.some((f) => f.match(/\*\.ts$/)) &&
+                o.files.some((f) => f.match(/\*\.tsx$/)) &&
+                o.files.some((f) => f.match(/\*\.js$/)) &&
+                o.files.some((f) => f.match(/\*\.jsx$/)), (o) => (Object.assign(Object.assign({}, o), { rules: Object.assign(Object.assign({}, o.rules), { '@next/next/no-html-link-for-pages': [
+                        'error',
+                        `${options.appProjectRoot}/pages`,
+                    ] }) })));
+            // add jest specific config
+            if (options.unitTestRunner === 'jest') {
+                (0, eslint_file_1.addOverrideToLintConfig)(host, options.appProjectRoot, {
+                    files: ['*.spec.ts', '*.spec.tsx', '*.spec.js', '*.spec.jsx'],
+                    env: {
+                        jest: true,
+                    },
+                });
+            }
+            (0, eslint_file_1.addIgnoresToLintConfig)(host, options.appProjectRoot, ['.next/**/*']);
         }
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
         return (0, devkit_1.runTasksInSerial)(lintTask, installTask);

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

@@ -19,20 +19,8 @@ function normalizeOptions(host, options) {
         });
         options.rootProject = appProjectRoot === '.';
         options.projectNameAndRootFormat = projectNameAndRootFormat;
-        let e2eProjectName = 'e2e';
-        let e2eProjectRoot = 'e2e';
-        if (!options.rootProject) {
-            const projectNameAndRoot = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
-                name: `${options.name}-e2e`,
-                projectType: 'application',
-                directory: options.directory,
-                projectNameAndRootFormat: options.projectNameAndRootFormat,
-                rootProject: options.rootProject,
-                callingGenerator: '@nx/next:application',
-            });
-            e2eProjectName = projectNameAndRoot.projectName;
-            e2eProjectRoot = projectNameAndRoot.projectRoot;
-        }
+        const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
+        const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
         const name = (0, devkit_1.names)(options.name).fileName;
         const outputPath = (0, devkit_1.joinPathFragments)('dist', appProjectRoot, ...(options.rootProject ? [name] : []));
         const parsedTags = options.tags