nx 20.5.0-rc.0 → 20.5.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.5.0-rc.0",
+  "version": "20.5.0-rc.2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "20.5.0-rc.0",
-    "@nx/nx-darwin-x64": "20.5.0-rc.0",
-    "@nx/nx-freebsd-x64": "20.5.0-rc.0",
-    "@nx/nx-linux-arm-gnueabihf": "20.5.0-rc.0",
-    "@nx/nx-linux-arm64-gnu": "20.5.0-rc.0",
-    "@nx/nx-linux-arm64-musl": "20.5.0-rc.0",
-    "@nx/nx-linux-x64-gnu": "20.5.0-rc.0",
-    "@nx/nx-linux-x64-musl": "20.5.0-rc.0",
-    "@nx/nx-win32-arm64-msvc": "20.5.0-rc.0",
-    "@nx/nx-win32-x64-msvc": "20.5.0-rc.0"
+    "@nx/nx-darwin-arm64": "20.5.0-rc.2",
+    "@nx/nx-darwin-x64": "20.5.0-rc.2",
+    "@nx/nx-freebsd-x64": "20.5.0-rc.2",
+    "@nx/nx-linux-arm-gnueabihf": "20.5.0-rc.2",
+    "@nx/nx-linux-arm64-gnu": "20.5.0-rc.2",
+    "@nx/nx-linux-arm64-musl": "20.5.0-rc.2",
+    "@nx/nx-linux-x64-gnu": "20.5.0-rc.2",
+    "@nx/nx-linux-x64-musl": "20.5.0-rc.2",
+    "@nx/nx-win32-arm64-msvc": "20.5.0-rc.2",
+    "@nx/nx-win32-x64-msvc": "20.5.0-rc.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/examples.js

@@ -143,10 +143,6 @@ exports.examples = {
             command: 'graph --focus=todos-feature-main',
             description: 'Show the graph where every node is either an ancestor or a descendant of todos-feature-main',
         },
-        {
-            command: 'graph --include=project-one,project-two',
-            description: 'Include project-one and project-two in the project graph',
-        },
         {
             command: 'graph --exclude=project-one,project-two',
             description: 'Exclude project-one and project-two from the project graph',

package/src/command-line/report/report.js

@@ -65,9 +65,27 @@ async function reportHandler() {
         bodyLines.push('');
         bodyLines.push(LINE_SEPARATOR);
         bodyLines.push(chalk.green('Nx Powerpack'));
+        const licenseExpiryDate = new Date((powerpackLicense.realExpiresAt ?? powerpackLicense.expiresAt) * 1000);
         bodyLines.push(`Licensed to ${powerpackLicense.organizationName} for ${powerpackLicense.seatCount} user${powerpackLicense.seatCount > 1 ? 's' : ''} in ${powerpackLicense.workspaceCount === 9999
             ? 'an unlimited number of'
-            : powerpackLicense.workspaceCount} workspace${powerpackLicense.workspaceCount > 1 ? 's' : ''} until ${new Date((powerpackLicense.realExpiresAt ?? powerpackLicense.expiresAt) * 1000).toLocaleDateString()}`);
+            : powerpackLicense.workspaceCount} workspace${powerpackLicense.workspaceCount > 1 ? 's' : ''}.`);
+        // license is not expired
+        if (licenseExpiryDate.getTime() >= Date.now()) {
+            if ('perpetualNxVersion' in powerpackLicense) {
+                bodyLines.push(`License expires on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${powerpackLicense.perpetualNxVersion} and below.`);
+            }
+            else {
+                bodyLines.push(`License expires on ${licenseExpiryDate.toLocaleDateString()}.`);
+            }
+        }
+        else {
+            if ('perpetualNxVersion' in powerpackLicense) {
+                bodyLines.push(`License expired on ${licenseExpiryDate.toLocaleDateString()}, but will continue to work with Nx ${powerpackLicense.perpetualNxVersion} and below.`);
+            }
+            else {
+                bodyLines.push(`License expired on ${licenseExpiryDate.toLocaleDateString()}.`);
+            }
+        }
         bodyLines.push('');
         padding =
             Math.max(...powerpackPlugins.map((powerpackPlugin) => powerpackPlugin.name.length)) + 1;

package/src/config/project-graph.d.ts

@@ -74,6 +74,7 @@ export interface ProjectGraphProjectNode {
         description?: string;
     };
 }
+export declare function isProjectGraphProjectNode(node: ProjectGraphProjectNode | ProjectGraphExternalNode): node is ProjectGraphProjectNode;
 /**
  * A node describing an external dependency
  * `name` has as form of:
@@ -85,14 +86,15 @@ export interface ProjectGraphProjectNode {
  *
  */
 export interface ProjectGraphExternalNode {
-    type: 'npm';
-    name: `npm:${string}`;
+    type: string;
+    name: string;
     data: {
         version: string;
         packageName: string;
         hash?: string;
     };
 }
+export declare function isProjectGraphExternalNode(node: ProjectGraphProjectNode | ProjectGraphExternalNode): node is ProjectGraphExternalNode;
 /**
  * A dependency between two projects
  */

package/src/config/project-graph.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DependencyType = void 0;
 exports.fileDataDepTarget = fileDataDepTarget;
 exports.fileDataDepType = fileDataDepType;
+exports.isProjectGraphProjectNode = isProjectGraphProjectNode;
+exports.isProjectGraphExternalNode = isProjectGraphExternalNode;
 function fileDataDepTarget(dep) {
     return typeof dep === 'string'
         ? dep
@@ -35,3 +37,9 @@ var DependencyType;
      */
     DependencyType["implicit"] = "implicit";
 })(DependencyType || (exports.DependencyType = DependencyType = {}));
+function isProjectGraphProjectNode(node) {
+    return node.type === 'app' || node.type === 'e2e' || node.type === 'lib';
+}
+function isProjectGraphExternalNode(node) {
+    return isProjectGraphProjectNode(node) === false;
+}