wip

push-based · Sep 16, 2024 · c3a30cc · c3a30cc
1 parent 854b72c
commit c3a30cc
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 13 deletions.
diff --git a/e2e/cli-e2e/project.json b/e2e/cli-e2e/project.json
@@ -10,6 +10,7 @@
     "e2e": {
       "dependsOn": [
         {
+          "projects": "self",
           "target": "setup-env",
           "params": "forward"
         }

diff --git a/e2e/cli-static-e2e/project.json b/e2e/cli-static-e2e/project.json
@@ -10,6 +10,7 @@
     "e2e": {
       "dependsOn": [
         {
+          "projects": "self",
           "target": "setup-env",
           "params": "forward"
         }

diff --git a/e2e/core-e2e/project.json b/e2e/core-e2e/project.json
@@ -10,6 +10,7 @@
     "e2e": {
       "dependsOn": [
         {
+          "projects": "self",
           "target": "setup-env",
           "params": "forward"
         }

diff --git a/e2e/models-e2e/project.json b/e2e/models-e2e/project.json
@@ -10,6 +10,7 @@
     "e2e": {
       "dependsOn": [
         {
+          "projects": "self",
           "target": "setup-env",
           "params": "forward"
         }

diff --git a/e2e/playground-e2e/project.json b/e2e/playground-e2e/project.json
@@ -10,6 +10,7 @@
     "e2e": {
       "dependsOn": [
         {
+          "projects": "self",
           "target": "setup-env",
           "params": "forward"
         }

diff --git a/e2e/utils-e2e/project.json b/e2e/utils-e2e/project.json
@@ -10,6 +10,7 @@
     "e2e": {
       "dependsOn": [
         {
+          "projects": "self",
           "target": "setup-env",
           "params": "forward"
         }

diff --git a/nx.json b/nx.json
@@ -18,7 +18,6 @@
     ],
     "sharedGlobals": []
   },
-  "nxCloudAccessToken": "YTA1MzQyZjktN2U2ZS00MmI1LThlZmMtYjE1NzFjNzYyMzZhfHJlYWQtd3JpdGU=",
   "targetDefaults": {
     "@nx/esbuild:esbuild": {
       "cache": true,

diff --git a/static-environments/user-lists/project.json b/static-environments/user-lists/project.json
@@ -4,6 +4,5 @@
   "sourceRoot": "projects/user-lists/src",
   "projectType": "library",
   "tags": [],
-  "// targets": "to see all targets run: nx show project user-lists --web",
   "targets": {}
 }
diff --git a/testing/test-setup/project.json b/testing/test-setup/project.json
@@ -3,7 +3,6 @@
   "$schema": "../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "testing/test-setup/src",
   "projectType": "library",
-  "tags": ["scope:shared", "type:testing"],
   "targets": {
     "lint": {
       "executor": "@nx/linter:eslint",
@@ -12,5 +11,6 @@
         "lintFilePatterns": ["testing/test-setup/**/*.ts"]
       }
     }
-  }
+  },
+  "tags": ["scope:shared", "type:testing"]
 }
diff --git a/tooling/build-env/project.json b/tooling/build-env/project.json
@@ -3,7 +3,6 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "tooling/build-env/src",
   "projectType": "library",
-  "tags": ["scope:shared", "type:tooling"],
   "implicitDependencies": [],
   "targets": {
     "build": {
@@ -48,5 +47,6 @@
         "configFile": "tooling/build-env/vite.config.ts"
       }
     }
-  }
+  },
+  "tags": ["scope:shared", "type:tooling"]
 }
diff --git a/tooling/build-env/src/plugin/plugin.ts b/tooling/build-env/src/plugin/plugin.ts
@@ -51,8 +51,7 @@ export const createNodes: CreateNodes = [
             ...(isNpmEnv(tags) && envTargets({ environmentRoot, projectName })),
             // === dependency project
             // npm-publish, npm-install
-            ...(isPublishable(tags) &&
-              npmTargets(projectName, environmentRoot)),
+            ...(isPublishable(tags) && npmTargets(projectName)),
           },
         },
       },
@@ -111,29 +110,32 @@ function envTargets({
     },
     // runs bootstrap-env, install-env and stop-verdaccio
     'setup-env': {
-      outputs: ['{options.environmentRoot}'],
+      // outputs: ['{options.environmentRoot}'],
       executor: '@org/build-env:setup',
       options: { environmentRoot },
     },
   };
 }
 
 function npmTargets(
-  environmentProject: string,
-  environmentRoot: string
+  environmentProject: string
 ): Record<string, TargetConfiguration> {
   return {
     'npm-publish': {
+      dependsOn: [
+        { projects: 'self', target: 'build', params: 'forward' },
+        { projects: 'dependencies', target: 'npm-publish', params: 'forward' },
+      ],
       executor: '@org/build-env:npm-publish',
-      options: { environmentProject, environmentRoot },
+      options: { environmentProject },
     },
     'npm-install': {
       dependsOn: [
         { projects: 'self', target: 'npm-publish', params: 'forward' },
         { projects: 'dependencies', target: 'npm-install', params: 'forward' },
       ],
       executor: '@org/build-env:npm-install',
-      options: { environmentProject, environmentRoot },
+      options: { environmentProject },
     },
   };
 }