feat(web): remove deprecated executors (#16416)

nrwl · Apr 20, 2023 · 8de17ab · 8de17ab · vercel · Apr 20, 2023
1 parent a7c14fc
commit 8de17ab
Show file tree

Hide file tree

Showing 43 changed files with 121 additions and 1,238 deletions.
diff --git a/docs/generated/manifests/menus.json b/docs/generated/manifests/menus.json
@@ -5219,14 +5219,6 @@
             "path": "/packages/node/executors",
             "name": "executors",
             "children": [
-              {
-                "id": "webpack",
-                "path": "/packages/node/executors/webpack",
-                "name": "webpack",
-                "children": [],
-                "isExternal": false,
-                "disableCollapsible": false
-              },
               {
                 "id": "node",
                 "path": "/packages/node/executors/node",
@@ -6425,30 +6417,6 @@
             "path": "/packages/web/executors",
             "name": "executors",
             "children": [
-              {
-                "id": "webpack",
-                "path": "/packages/web/executors/webpack",
-                "name": "webpack",
-                "children": [],
-                "isExternal": false,
-                "disableCollapsible": false
-              },
-              {
-                "id": "rollup",
-                "path": "/packages/web/executors/rollup",
-                "name": "rollup",
-                "children": [],
-                "isExternal": false,
-                "disableCollapsible": false
-              },
-              {
-                "id": "dev-server",
-                "path": "/packages/web/executors/dev-server",
-                "name": "dev-server",
-                "children": [],
-                "isExternal": false,
-                "disableCollapsible": false
-              },
               {
                 "id": "file-server",
                 "path": "/packages/web/executors/file-server",

diff --git a/docs/generated/manifests/packages.json b/docs/generated/manifests/packages.json
@@ -1405,15 +1405,6 @@
     "root": "/packages/node",
     "source": "/packages/node/src",
     "executors": {
-      "/packages/node/executors/webpack": {
-        "description": "Build a Node application using Webpack.",
-        "file": "generated/packages/node/executors/webpack.json",
-        "hidden": false,
-        "name": "webpack",
-        "originalFilePath": "/packages/node/src/executors/webpack/schema.json",
-        "path": "/packages/node/executors/webpack",
-        "type": "executor"
-      },
       "/packages/node/executors/node": {
         "description": "Execute a Node application.",
         "file": "generated/packages/node/executors/node.json",
@@ -2671,33 +2662,6 @@
     "root": "/packages/web",
     "source": "/packages/web/src",
     "executors": {
-      "/packages/web/executors/webpack": {
-        "description": "Build an application using Webpack.",
-        "file": "generated/packages/web/executors/webpack.json",
-        "hidden": false,
-        "name": "webpack",
-        "originalFilePath": "/packages/web/src/executors/webpack/schema.json",
-        "path": "/packages/web/executors/webpack",
-        "type": "executor"
-      },
-      "/packages/web/executors/rollup": {
-        "description": "Package a library using Rollup.",
-        "file": "generated/packages/web/executors/rollup.json",
-        "hidden": false,
-        "name": "rollup",
-        "originalFilePath": "/packages/web/src/executors/rollup/schema.json",
-        "path": "/packages/web/executors/rollup",
-        "type": "executor"
-      },
-      "/packages/web/executors/dev-server": {
-        "description": "Serve a web application.",
-        "file": "generated/packages/web/executors/dev-server.json",
-        "hidden": false,
-        "name": "dev-server",
-        "originalFilePath": "/packages/web/src/executors/dev-server/schema.json",
-        "path": "/packages/web/executors/dev-server",
-        "type": "executor"
-      },
       "/packages/web/executors/file-server": {
         "description": "Serve a web application from a folder.",
         "file": "generated/packages/web/executors/file-server.json",

diff --git a/docs/generated/packages-metadata.json b/docs/generated/packages-metadata.json
@@ -1385,15 +1385,6 @@
       }
     ],
     "executors": [
-      {
-        "description": "Build a Node application using Webpack.",
-        "file": "generated/packages/node/executors/webpack.json",
-        "hidden": false,
-        "name": "webpack",
-        "originalFilePath": "/packages/node/src/executors/webpack/schema.json",
-        "path": "node/executors/webpack",
-        "type": "executor"
-      },
       {
         "description": "Execute a Node application.",
         "file": "generated/packages/node/executors/node.json",
@@ -2642,33 +2633,6 @@
       }
     ],
     "executors": [
-      {
-        "description": "Build an application using Webpack.",
-        "file": "generated/packages/web/executors/webpack.json",
-        "hidden": false,
-        "name": "webpack",
-        "originalFilePath": "/packages/web/src/executors/webpack/schema.json",
-        "path": "web/executors/webpack",
-        "type": "executor"
-      },
-      {
-        "description": "Package a library using Rollup.",
-        "file": "generated/packages/web/executors/rollup.json",
-        "hidden": false,
-        "name": "rollup",
-        "originalFilePath": "/packages/web/src/executors/rollup/schema.json",
-        "path": "web/executors/rollup",
-        "type": "executor"
-      },
-      {
-        "description": "Serve a web application.",
-        "file": "generated/packages/web/executors/dev-server.json",
-        "hidden": false,
-        "name": "dev-server",
-        "originalFilePath": "/packages/web/src/executors/dev-server/schema.json",
-        "path": "web/executors/dev-server",
-        "type": "executor"
-      },
       {
         "description": "Serve a web application from a folder.",
         "file": "generated/packages/web/executors/file-server.json",

diff --git a/docs/shared/guides/module-federation/faster-builds.md b/docs/shared/guides/module-federation/faster-builds.md
@@ -115,7 +115,7 @@ To understand how Module Federation works with Nx, let's take a look at three fi
 
 ### `apps/host/project.json`
 
-The `build` target uses `@nrwl/web:webpack` for React, and `@nrwl/angular:webpack-browser` for Angular. This is the same as a normal SPA that uses custom webpack configuration (`webpackConfig`), but difference is in the webpack configuration file.
+The `build` target uses `@nrwl/webpack:webpack` for React, and `@nrwl/angular:webpack-browser` for Angular. This is the same as a normal SPA that uses custom webpack configuration (`webpackConfig`), but difference is in the webpack configuration file.
 
 If you use Module Federation to speed up your CI and improve your local development, and not to deploy different remotes independently, you need to create implicit dependencies from the host to all the remotes. Semantically, the host and the remotes comprise one application, so you cannot build the host without the remotes. Adding implicit dependencies also makes distributed builds possible ([see below](#production-build-and-deployment)). To create these dependencies, add the `implicitDependencies` configuration.
 

diff --git a/docs/shared/guides/use-environment-variables-in-react.md b/docs/shared/guides/use-environment-variables-in-react.md
@@ -17,7 +17,7 @@ You cannot interpolate environment variables into your `index.html` file for Rea
 
 ## For non-Vite React applications
 
-In React applications (e.g. those using `@nrwl/web:webpack` or `@nrwl/next:build` executors for `build` target), Nx
+In React applications (e.g. those using `@nrwl/webpack:webpack` or `@nrwl/next:build` executors for `build` target), Nx
 includes the following variables in the build process:
 
 - `NODE_ENV`

diff --git a/docs/shared/guides/using-tailwind-css-in-react.md b/docs/shared/guides/using-tailwind-css-in-react.md
@@ -126,7 +126,7 @@ Open up the `apps/{your app here}/project.json` file and add the following to th
   // ...
   "targets": {
     "build": {
-      "executor": "@nrwl/web:webpack",
+      "executor": "@nrwl/webpack:webpack",
       "options": {
         // ...
         "postcssConfig": "apps/{your app here}/postcss.config.js"

diff --git a/docs/shared/migration/migration-angularjs.md b/docs/shared/migration/migration-angularjs.md
@@ -407,7 +407,7 @@ To use webpack instead of gulp, go back to your `apps/realworld/project.json` fi
 ```jsonc {% fileName="apps/realworld/project.json" %}
 ...
 "build": {
-  "executor": "@nrwl/web:webpack",
+  "executor": "@nrwl/webpack:webpack",
   "options": {
     "outputPath": "dist/apps/realworld",
     "index": "apps/realworld/src/index.html",

diff --git a/docs/shared/plugin-features/use-task-executors.md b/docs/shared/plugin-features/use-task-executors.md
@@ -20,7 +20,7 @@ Executors are associated with specific targets in a project's `project.json` fil
   "generators": {},
   "targets": {
     "build": {
-      "executor": "@nrwl/web:webpack",
+      "executor": "@nrwl/webpack:webpack",
       "options": {
         "outputPath": "dist/apps/cart",
         ...

diff --git a/nx-dev/nx-dev-e2e/src/e2e/packages.cy.ts b/nx-dev/nx-dev-e2e/src/e2e/packages.cy.ts
@@ -259,7 +259,6 @@ describe('nx-dev: Packages Section', () => {
       path: '/packages/node/generators/application',
     },
     { title: '@nrwl/node:library', path: '/packages/node/generators/library' },
-    { title: '@nrwl/node:webpack', path: '/packages/node/executors/webpack' },
     { title: '@nrwl/node:node', path: '/packages/node/executors/node' },
     { title: 'nx', path: '/packages/nx' },
     { title: 'nx:noop', path: '/packages/nx/executors/noop' },
@@ -421,12 +420,6 @@ describe('nx-dev: Packages Section', () => {
       title: '@nrwl/web:application',
       path: '/packages/web/generators/application',
     },
-    { title: '@nrwl/web:webpack', path: '/packages/web/executors/webpack' },
-    { title: '@nrwl/web:rollup', path: '/packages/web/executors/rollup' },
-    {
-      title: '@nrwl/web:dev-server',
-      path: '/packages/web/executors/dev-server',
-    },
     {
       title: '@nrwl/web:file-server',
       path: '/packages/web/executors/file-server',

diff --git a/nx-dev/nx-dev/redirect-rules.config.js b/nx-dev/nx-dev/redirect-rules.config.js
@@ -531,6 +531,11 @@ const packagesDocuments = {
     '/packages/eslint-plugin/documents/enforce-module-boundaries',
   '/packages/eslint-plugin-nx/documents/overview':
     '/packages/eslint-plugin/documents/overview',
+  '/packages/node/executors/webpack': '/packages/webpack/executors/webpack',
+  '/packages/web/executors/webpack': '/packages/webpack/executors/webpack',
+  '/packages/web/executors/dev-server':
+    '/packages/webpack/executors/dev-server',
+  '/packages/web/executors/rollup': '/packages/rollup/executors/rollup',
 };
 
 /**

diff --git a/packages-legacy/web/executors.json b/packages-legacy/web/executors.json
@@ -1,42 +1,12 @@
 {
   "builders": {
-    "webpack": {
-      "implementation": "@nx/web/src/executors/webpack/compat",
-      "schema": "@nx/web/src/executors/webpack/schema.json",
-      "description": "Build an application using Webpack."
-    },
-    "rollup": {
-      "implementation": "@nx/web/src/executors/rollup/compat",
-      "schema": "@nx/web/src/executors/rollup/schema.json",
-      "description": "Package a library using Rollup."
-    },
-    "dev-server": {
-      "implementation": "@nx/web/src/executors/dev-server/compat",
-      "schema": "@nx/web/src/executors/dev-server/schema.json",
-      "description": "Serve a web application."
-    },
     "file-server": {
       "implementation": "@nx/web/src/executors/file-server/compat",
       "schema": "@nx/web/src/executors/file-server/schema.json",
       "description": "Serve a web application from a folder."
     }
   },
   "executors": {
-    "webpack": {
-      "implementation": "@nx/web/src/executors/webpack/webpack.impl",
-      "schema": "@nx/web/src/executors/webpack/schema.json",
-      "description": "Build an application using Webpack."
-    },
-    "rollup": {
-      "implementation": "@nx/web/src/executors/rollup/rollup.impl",
-      "schema": "@nx/web/src/executors/rollup/schema.json",
-      "description": "Package a library using Rollup."
-    },
-    "dev-server": {
-      "implementation": "@nx/web/src/executors/dev-server/dev-server.impl",
-      "schema": "@nx/web/src/executors/dev-server/schema.json",
-      "description": "Serve a web application."
-    },
     "file-server": {
       "implementation": "@nx/web/src/executors/file-server/file-server.impl",
       "schema": "@nx/web/src/executors/file-server/schema.json",

diff --git a/packages/cypress/src/generators/cypress-component-project/cypress-component-project.spec.ts b/packages/cypress/src/generators/cypress-component-project/cypress-component-project.spec.ts
@@ -18,7 +18,7 @@ let projectConfig: ProjectConfiguration = {
   root: 'libs/cool-lib',
   targets: {
     build: {
-      executor: '@nx/web:rollup',
+      executor: '@nx/rollup:rollup',
       options: {
         tsConfig: 'libs/cool-lib/tsconfig.lib.json',
       },

diff --git a/packages/expo/src/generators/library/library.spec.ts b/packages/expo/src/generators/library/library.spec.ts
@@ -232,7 +232,7 @@ describe('lib', () => {
       const projects = getProjects(appTree);
 
       expect(projects.get('my-lib').targets.build).toMatchObject({
-        executor: '@nx/web:rollup',
+        executor: '@nx/rollup:rollup',
         outputs: ['{options.outputPath}'],
         options: {
           external: ['react/jsx-runtime', 'react-native'],

diff --git a/packages/expo/src/generators/library/library.ts b/packages/expo/src/generators/library/library.ts
@@ -90,7 +90,7 @@ function addProject(host: Tree, options: NormalizedSchema) {
     const external = ['react/jsx-runtime', 'react-native'];
 
     targets.build = {
-      executor: '@nx/web:rollup',
+      executor: '@nx/rollup:rollup',
       outputs: ['{options.outputPath}'],
       options: {
         outputPath: `dist/${libsDir}/${options.projectDirectory}`,

diff --git a/packages/js/babel.ts b/packages/js/babel.ts
@@ -20,7 +20,7 @@ module.exports = function (api: any, options: NxWebBabelPresetOptions = {}) {
 
   const isModern = api.caller((caller) => caller?.isModern);
 
-  // This is set by `@nx/web:rollup` executor
+  // This is set by `@nx/rollup:rollup` executor
   const isNxPackage = api.caller((caller) => caller?.isNxPackage);
 
   const emitDecoratorMetadata = api.caller(

diff --git a/packages/node/executors.json b/packages/node/executors.json
@@ -1,22 +1,12 @@
 {
   "executors": {
-    "webpack": {
-      "implementation": "./src/executors/webpack/webpack.impl",
-      "schema": "./src/executors/webpack/schema.json",
-      "description": "Build a Node application using Webpack."
-    },
     "node": {
       "implementation": "./src/executors/node/node.impl",
       "schema": "./src/executors/node/schema.json",
       "description": "Execute a Node application."
     }
   },
   "builders": {
-    "webpack": {
-      "implementation": "./src/executors/webpack/compat",
-      "schema": "./src/executors/webpack/schema.json",
-      "description": "Build a Node application using Webpack."
-    },
     "node": {
       "implementation": "./src/executors/node/compat",
       "schema": "./src/executors/node/schema.json",

diff --git a/packages/node/migrations.json b/packages/node/migrations.json
@@ -35,6 +35,12 @@
       "version": "16.0.0-beta.1",
       "description": "Replace @nrwl/node with @nx/node",
       "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
+    },
+    "update-16-0-0-update-executor": {
+      "cli": "nx",
+      "version": "16.0.0-beta.5",
+      "description": "Replace @nrwl/node:webpack with @nx/node:webpack",
+      "implementation": "./src/migrations/update-16-0-0/update-webpack-executor"
     }
   },
   "packageJsonUpdates": {

diff --git a/packages/node/package.json b/packages/node/package.json
@@ -36,7 +36,6 @@
     "@nx/jest": "file:../jest",
     "@nx/js": "file:../js",
     "@nx/linter": "file:../linter",
-    "@nx/webpack": "file:../webpack",
     "@nx/workspace": "file:../workspace"
   },
   "publishConfig": {

diff --git a/packages/node/src/executors/webpack/compat.ts b/packages/node/src/executors/webpack/compat.ts