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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/next",
-  "version": "16.8.0-beta.2",
+  "version": "16.8.0-beta.4",
   "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,13 +35,13 @@
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.22.7",
-    "@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",
+    "@nrwl/next": "16.8.0-beta.4",
+    "@nx/devkit": "16.8.0-beta.4",
+    "@nx/js": "16.8.0-beta.4",
+    "@nx/linter": "16.8.0-beta.4",
+    "@nx/react": "16.8.0-beta.4",
+    "@nx/web": "16.8.0-beta.4",
+    "@nx/workspace": "16.8.0-beta.4",
     "@svgr/webpack": "^8.0.1",
     "chalk": "^4.1.0",
     "copy-webpack-plugin": "^10.2.4",
@@ -56,5 +56,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "9bcc04742f9e1516d8c1ddbfb1907770c347876f"
+  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
 }

package/plugins/with-nx.js

@@ -2,6 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNx = exports.forNextVersion = exports.getAliasForProject = exports.getNextConfig = void 0;
 const tslib_1 = require("tslib");
+const baseNXEnvironmentVariables = [
+    'NX_BASE',
+    'NX_CACHE_DIRECTORY',
+    'NX_CACHE_PROJECT_GRAPH',
+    'NX_DAEMON',
+    'NX_DEFAULT_PROJECT',
+    'NX_HEAD',
+    'NX_PERF_LOGGING',
+    'NX_PROFILE',
+    'NX_PROJECT_GRAPH_CACHE_DIRECTORY',
+    'NX_PROJECT_GRAPH_MAX_WORKERS',
+    'NX_RUNNER',
+    'NX_SKIP_NX_CACHE',
+    'NX_TASKS_RUNNER',
+    'NX_TASKS_RUNNER_DYNAMIC_OUTPUT',
+    'NX_VERBOSE_LOGGING',
+    'NX_DRY_RUN',
+    'NX_INTERACTIVE',
+    'NX_GENERATE_QUIET',
+    'NX_PREFER_TS_NODE',
+    'NX_TASK_TARGET_PROJECT',
+    'NX_TASK_TARGET_TARGET',
+    'NX_TASK_TARGET_CONFIGURATION',
+    'NX_CLI_SET',
+    'NX_LOAD_DOT_ENV_FILES',
+    'NX_WORKSPACE_ROOT',
+    'NX_TASK_HASH',
+    'NX_NEXT_DIR',
+];
 function regexEqual(x, y) {
     return (x instanceof RegExp &&
         y instanceof RegExp &&
@@ -244,6 +273,9 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
         } });
 }
 exports.getNextConfig = getNextConfig;
+function getNonBaseVariables(oldEnv) {
+    return Object.keys(oldEnv).filter((env) => !baseNXEnvironmentVariables.includes(env));
+}
 function getNxEnvironmentVariables() {
     return Object.keys(process.env)
         .filter((env) => /^NX_/i.test(env))
@@ -252,6 +284,10 @@ function getNxEnvironmentVariables() {
         return env;
     }, {});
 }
+/**
+ * TODO(v18)
+ * @deprecated Use Next.js 9.4+ built-in support for environment variables. Reference https://nextjs.org/docs/pages/api-reference/next-config-js/env
+ */
 function addNxEnvVariables(config) {
     var _a;
     const maybeDefinePlugin = (_a = config.plugins) === null || _a === void 0 ? void 0 : _a.find((plugin) => {
@@ -264,6 +300,10 @@ function addNxEnvVariables(config) {
             .map(([name, value]) => [`process.env.${name}`, `"${value}"`])
             .filter(([name]) => !maybeDefinePlugin.definitions[name])
             .forEach(([name, value]) => (maybeDefinePlugin.definitions[name] = value));
+        const vars = getNonBaseVariables(env);
+        if (vars.length > 0) {
+            console.warn(`Warning, in Nx 18 environment variables starting with NX_ will not be available in the browser, and currently will not work with @nx/next:server executor.\nPlease rename the following environment variables: ${vars.join(', ')} using Next.js' built-in support for environment variables. Reference https://nextjs.org/docs/pages/api-reference/next-config-js/env`);
+        }
     }
 }
 function getAliasForProject(node, paths) {

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

@@ -62,8 +62,9 @@ function buildExecutor(options, context) {
         (0, update_package_json_1.updatePackageJson)(builtPackageJson, context);
         (0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, builtPackageJson);
         if (options.generateLockfile) {
-            const lockFile = (0, js_1.createLockFile)(builtPackageJson);
-            (0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, js_1.getLockFileName)()}`, lockFile, {
+            const packageManager = (0, devkit_1.detectPackageManager)(context.root);
+            const lockFile = (0, js_1.createLockFile)(builtPackageJson, context.projectGraph, packageManager);
+            (0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, js_1.getLockFileName)(packageManager)}`, lockFile, {
                 encoding: 'utf-8',
             });
         }

package/src/generators/custom-server/custom-server.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.customServerSchematic = exports.customServerGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
 function customServerGenerator(host, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -26,7 +27,7 @@ function customServerGenerator(host, options) {
             devkit_1.logger.warn(`Project ${options.project} has custom server targets already: build-custom-server, serve-custom-server. Remove these targets from project and try again.`);
             return;
         }
-        (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files'), project.root, Object.assign(Object.assign({}, options), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(project.root), projectRoot: project.root, tmpl: '' }));
+        (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files'), project.root, Object.assign(Object.assign({}, options), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(project.root), projectRoot: project.root, tmpl: '' }));
         project.targets.build.dependsOn = ['build-custom-server'];
         project.targets.serve.options.customServerTarget = `${options.project}:serve-custom-server`;
         project.targets.serve.configurations.development.customServerTarget = `${options.project}:serve-custom-server:development`;