Merge branch 'main' into nickytonline/fix-for-1940-app-dir-null-data-route

Author: nickytonline

demos/nx-next-monorepo-demo/apps/demo-monorepo-e2e/project.json

@@ -1,4 +1,5 @@
 {
+  "name": "demo-monorepo-e2e",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/demo-monorepo-e2e/src",
   "projectType": "application",

demos/nx-next-monorepo-demo/apps/demo-monorepo/project.json

@@ -1,4 +1,5 @@
 {
+  "name": "demo-monorepo",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/demo-monorepo",
   "projectType": "application",

demos/nx-next-monorepo-demo/package-lock.json

@@ -10,7 +10,7 @@
   "private": true,
   "dependencies": {
     "@netlify/plugin-nextjs": "file:plugin-wrapper",
-    "@nrwl/next": "15.0.11",
+    "@nrwl/next": "15.9.2",
     "core-js": "^3.6.5",
     "next": "^13.0.6",
     "react": "^18.2.0",
@@ -19,14 +19,14 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@nrwl/cli": "14.7.11",
-    "@nrwl/cypress": "14.7.11",
-    "@nrwl/eslint-plugin-nx": "14.7.11",
-    "@nrwl/jest": "14.7.11",
-    "@nrwl/linter": "14.7.11",
-    "@nrwl/react": "15.0.11",
-    "@nrwl/web": "15.0.11",
-    "@nrwl/workspace": "14.7.11",
+    "@nrwl/cli": "15.9.2",
+    "@nrwl/cypress": "15.9.2",
+    "@nrwl/eslint-plugin-nx": "15.9.2",
+    "@nrwl/jest": "15.9.2",
+    "@nrwl/linter": "15.9.2",
+    "@nrwl/react": "15.9.2",
+    "@nrwl/web": "15.9.2",
+    "@nrwl/workspace": "15.9.2",
     "@testing-library/react": "13.4.0",
     "@types/jest": "28.1.8",
     "@types/node": "16.11.7",
@@ -46,7 +46,7 @@
     "eslint-plugin-react-hooks": "4.6.0",
     "jest": "28.1.3",
     "jest-environment-jsdom": "28.1.3",
-    "nx": "14.7.11",
+    "nx": "15.9.2",
     "prettier": "^2.6.2",
     "react-test-renderer": "18.2.0",
     "ts-jest": "28.0.8",

demos/nx-next-monorepo-demo/package.json

@@ -52,7 +52,7 @@
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.8.0",
+    "@netlify/build": "^29.9.0",
     "@netlify/eslint-config-node": "^7.0.1",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",

demos/nx-next-monorepo-demo/workspace.json

@@ -37,7 +37,7 @@
   },
   "devDependencies": {
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.8.0",
+    "@netlify/build": "^29.9.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.4.1",
     "@types/merge-stream": "^1.1.2",