fix(misc): remove remaining usages of @nrwl/workspace:run-commands ex…

…ecutor (#12299)
nrwl · Sep 28, 2022 · 9d06b3c · 9d06b3c · vercel · Sep 28, 2022
1 parent 5372b4b
commit 9d06b3c
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 26 deletions.
diff --git a/e2e/nx-misc/src/extras.test.ts b/e2e/nx-misc/src/extras.test.ts
@@ -139,7 +139,7 @@ describe('Extra Nx Misc Tests', () => {
     it('should pass options', async () => {
       updateProjectConfig(mylib, (config) => {
         config.targets.echo = {
-          executor: '@nrwl/workspace:run-commands',
+          executor: 'nx:run-commands',
           options: {
             command: 'echo --var1={args.var1}',
             var1: 'a',
@@ -156,7 +156,7 @@ describe('Extra Nx Misc Tests', () => {
       const echoTarget = uniq('echo');
       updateProjectConfig(mylib, (config) => {
         config.targets[echoTarget] = {
-          executor: '@nrwl/workspace:run-commands',
+          executor: 'nx:run-commands',
           options: {
             commands: [
               'echo "Arguments:"',
@@ -191,7 +191,7 @@ describe('Extra Nx Misc Tests', () => {
     it('ttt should fail when a process exits non-zero', async () => {
       updateProjectConfig(mylib, (config) => {
         config.targets.error = {
-          executor: '@nrwl/workspace:run-commands',
+          executor: 'nx:run-commands',
           options: {
             command: `exit 1`,
           },

diff --git a/e2e/nx-plugin/src/nx-plugin.test.ts b/e2e/nx-plugin/src/nx-plugin.test.ts
@@ -295,7 +295,7 @@ describe('Nx Plugin', () => {
     if (basename(f) === 'my-project-file') {
       return {
         build: {
-          executor: "@nrwl/workspace:run-commands",
+          executor: "nx:run-commands",
           options: {
             command: "echo 'custom registered target'"
           }

diff --git a/e2e/nx-run/src/cache.test.ts b/e2e/nx-run/src/cache.test.ts
@@ -107,7 +107,7 @@ describe('cache', () => {
     // updateFile('workspace.json', (c) => {
     //   const workspaceJson = JSON.parse(c);
     //   workspaceJson.projects[myapp1].targets.lint = {
-    //     executor: '@nrwl/workspace:run-commands',
+    //     executor: 'nx:run-commands',
     //     options: {
     //       command: 'echo hi && exit 1',
     //     },

diff --git a/e2e/nx-run/src/run.test.ts b/e2e/nx-run/src/run.test.ts
@@ -164,7 +164,7 @@ describe('Nx Running Tests', () => {
   projectFilePatterns: ['inferred-project.nxproject'],
   registerProjectTargets: () => ({
     "echo": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "echo inferred-target"
       }

diff --git a/packages/cra-to-nx/src/lib/setup-e2e-project.ts b/packages/cra-to-nx/src/lib/setup-e2e-project.ts
@@ -5,7 +5,7 @@ export function setupE2eProject(appName: string) {
   const data = fs.readFileSync(`apps/${appName}-e2e/project.json`);
   const json = JSON.parse(data.toString());
   json.targets.e2e = {
-    executor: '@nrwl/workspace:run-commands',
+    executor: 'nx:run-commands',
     options: {
       commands: [`nx e2e-serve ${appName}-e2e`, `nx e2e-run ${appName}-e2e`],
     },
@@ -19,7 +19,7 @@ export function setupE2eProject(appName: string) {
     },
   };
   json.targets['e2e-serve'] = {
-    executor: '@nrwl/workspace:run-commands',
+    executor: 'nx:run-commands',
     options: {
       commands: [`nx serve ${appName}`],
       readyWhen: 'can now view',

diff --git a/packages/expo/project.json b/packages/expo/project.json
@@ -77,16 +77,6 @@
       "options": {
         "command": "node ./scripts/copy-readme.js expo"
       }
-    },
-    "publish": {
-      "executor": "@nrwl/workspace:run-commands",
-      "options": {
-        "parallel": false,
-        "commands": [
-          "nx build expo",
-          "node tools/scripts/publish.mjs expo {args.ver} {args.tag}"
-        ]
-      }
     }
   },
   "tags": []

diff --git a/packages/expo/src/generators/application/lib/add-project.ts b/packages/expo/src/generators/application/lib/add-project.ts
@@ -52,7 +52,7 @@ function getTargets(options: NormalizedSchema) {
   };
 
   architect.serve = {
-    executor: '@nrwl/workspace:run-commands',
+    executor: 'nx:run-commands',
     options: {
       command: `nx start ${options.name}`,
     },

diff --git a/packages/js/src/generators/library/library.spec.ts b/packages/js/src/generators/library/library.spec.ts
@@ -842,7 +842,7 @@ describe('lib', () => {
 
         const config = readProjectConfiguration(tree, 'my-lib');
         expect(config.targets.publish).toEqual({
-          executor: '@nrwl/workspace:run-commands',
+          executor: 'nx:run-commands',
           options: {
             command:
               'node tools/scripts/publish.mjs my-lib {args.ver} {args.tag}',

diff --git a/packages/js/src/generators/library/library.ts b/packages/js/src/generators/library/library.ts
@@ -132,7 +132,7 @@ function addProject(
       const publishScriptPath = addMinimalPublishScript(tree);
 
       projectConfiguration.targets.publish = {
-        executor: '@nrwl/workspace:run-commands',
+        executor: 'nx:run-commands',
         options: {
           command: `node ${publishScriptPath} ${options.name} {args.ver} {args.tag}`,
         },

diff --git a/packages/nx/src/utils/project-graph-utils.spec.ts b/packages/nx/src/utils/project-graph-utils.spec.ts
@@ -165,7 +165,7 @@ describe('project graph utils', () => {
     it('should prefer project.json targets', () => {
       const projectJsonTargets = {
         build: {
-          executor: '@nrwl/workspace:run-commands',
+          executor: 'nx:run-commands',
           options: {
             command: 'echo 2',
           },
@@ -182,7 +182,7 @@ describe('project graph utils', () => {
     it('should provide targets from project.json and package.json', () => {
       const projectJsonTargets = {
         clean: {
-          executor: '@nrwl/workspace:run-commands',
+          executor: 'nx:run-commands',
           options: {
             command: 'echo 2',
           },
@@ -243,14 +243,14 @@ describe('project graph utils', () => {
 
       const result = mergeNpmScriptsWithTargets('', {
         build: {
-          executor: '@nrwl/workspace:run-commands',
+          executor: 'nx:run-commands',
           options: { command: 'echo hi' },
         },
       });
 
       expect(result).toEqual({
         build: {
-          executor: '@nrwl/workspace:run-commands',
+          executor: 'nx:run-commands',
           options: { command: 'echo hi' },
         },
         test: {

diff --git a/packages/react-native/src/generators/application/lib/add-project.ts b/packages/react-native/src/generators/application/lib/add-project.ts
@@ -41,7 +41,7 @@ function getTargets(options: NormalizedSchema) {
   };
 
   architect.serve = {
-    executor: '@nrwl/workspace:run-commands',
+    executor: 'nx:run-commands',
     options: {
       command: `nx start ${options.name}`,
     },