Merge branch 'master' into implement-not-depend-on-libs-with-tags

nrwl · Jan 29, 2022 · d952e11 · d952e11
2 parents c0722c5 + 5e3f1d4
commit d952e11
Show file tree

Hide file tree

Showing 232 changed files with 4,927 additions and 6,643 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -184,12 +184,12 @@ jobs:
           command: |
             pids=()
 
-            # npx nx affected --target=lint --base=$NX_BASE --head=$NX_HEAD --parallel --max-parallel=3
+            # npx nx affected --target=lint --base=$NX_BASE --head=$NX_HEAD --parallel=3
             (yarn nx workspace-lint; echo "Linting is temporarily disabled until ESLint v8 support is published") &
             pids+=($!)
-            yarn nx affected --target=test --base=$NX_BASE --head=$NX_HEAD --parallel --max-parallel=3 &
+            yarn nx affected --target=test --base=$NX_BASE --head=$NX_HEAD --parallel=1 &
             pids+=($!)
-            yarn nx affected --target=build --base=$NX_BASE --head=$NX_HEAD --parallel --max-parallel=3 &
+            yarn nx affected --target=build --base=$NX_BASE --head=$NX_HEAD --parallel=3 &
             pids+=($!)
             for pid in "${pids[@]}"; do
               wait "$pid"

diff --git a/.github/ISSUE_TEMPLATE/3-documentation.md b/.github/ISSUE_TEMPLATE/3-documentation.md
@@ -0,0 +1,26 @@
+---
+name: "📖 Documentation issue"
+about:  Help improve our docs.
+labels: "type: docs"
+---
+### Documentation issue
+
+<!-- (Update "[ ]" to "[x]" to check a box) -->
+
+- [ ] Reporting a typo
+- [ ] Reporting a documentation bug
+- [ ] Documentation improvement
+- [ ] Documentation feedback
+
+<!--
+  If your issue is not regarding the documentation, please choose an issue type:
+  https://github.com/nrwl/nx/issues/new/choose
+-->
+
+### Is there a specific documentation page you are reporting?
+
+Enter the URL or documentation section here.
+
+### Additional context or description
+
+Provide any additional details here as needed.
diff --git a/dep-graph/client/src/app/machines/dep-graph.spec.ts b/dep-graph/client/src/app/machines/dep-graph.spec.ts
@@ -1,9 +1,5 @@
 // nx-ignore-next-line
-import {
-  DependencyType,
-  ProjectGraphDependency,
-  ProjectGraphNode,
-} from '@nrwl/devkit';
+import type { ProjectGraphDependency, ProjectGraphNode } from '@nrwl/devkit';
 import { depGraphMachine } from './dep-graph.machine';
 import { interpret } from 'xstate';
 
@@ -55,38 +51,38 @@ export const mockProjects: ProjectGraphNode[] = [
 export const mockDependencies: Record<string, ProjectGraphDependency[]> = {
   app1: [
     {
-      type: DependencyType.static,
+      type: 'static',
       source: 'app1',
       target: 'auth-lib',
     },
     {
-      type: DependencyType.static,
+      type: 'static',
       source: 'app1',
       target: 'feature-lib1',
     },
   ],
   app2: [
     {
-      type: DependencyType.static,
+      type: 'static',
       source: 'app2',
       target: 'auth-lib',
     },
     {
-      type: DependencyType.static,
+      type: 'static',
       source: 'app2',
       target: 'feature-lib2',
     },
   ],
   'feature-lib1': [
     {
-      type: DependencyType.static,
+      type: 'static',
       source: 'feature-lib1',
       target: 'ui-lib',
     },
   ],
   'feature-lib2': [
     {
-      type: DependencyType.static,
+      type: 'static',
       source: 'feature-lib2',
       target: 'ui-lib',
     },

diff --git a/dep-graph/client/src/app/mock-project-graph-service.ts b/dep-graph/client/src/app/mock-project-graph-service.ts
@@ -33,7 +33,7 @@ export class MockProjectGraphService implements ProjectGraphService {
         {
           source: 'existing-app-1',
           target: 'existing-lib-1',
-          type: 'static' as any,
+          type: 'statis',
         },
       ],
       'existing-lib-1': [],
@@ -82,7 +82,7 @@ export class MockProjectGraphService implements ProjectGraphService {
       {
         source: newProject.name,
         target: targetDependency.name,
-        type: 'static' as any,
+        type: 'static',
       },
     ];
 

diff --git a/dep-graph/client/src/app/styles-graph/edges.ts b/dep-graph/client/src/app/styles-graph/edges.ts
@@ -41,22 +41,9 @@ const dynamicEdges: Stylesheet = {
   },
 };
 
-const typeOnlyEdges: Stylesheet = {
-  selector: 'edge.typeOnly',
-  style: {
-    label: 'type only',
-    'font-size': '16px',
-    'edge-text-rotation': 'autorotate',
-    'curve-style': 'unbundled-bezier',
-    'line-dash-pattern': [5, 5],
-    'line-style': 'dashed',
-  },
-};
-
 export const edgeStyles: Stylesheet[] = [
   allEdges,
   affectedEdges,
   implicitEdges,
   dynamicEdges,
-  typeOnlyEdges,
 ];
diff --git a/dep-graph/client/src/assets/graphs/nx-examples.json b/dep-graph/client/src/assets/graphs/nx-examples.json
@@ -185,7 +185,7 @@
       {
         "source": "shared-product-data",
         "target": "shared-product-types",
-        "type": "typeOnly"
+        "type": "static"
       }
     ],
     "products-home-page": [

diff --git a/docs/generated/api-cypress/executors/cypress.md b/docs/generated/api-cypress/executors/cypress.md
@@ -31,7 +31,7 @@ The browser to run tests in.
 
 ### ciBuildId
 
-Type: `string`
+Type: `string | number `
 
 A unique identifier for a run to enable grouping or parallelization.