@ohos-ports/nx 19.8.4-beta.2 → 19.8.14-beta.0

package/.eslintrc.json

@@ -0,0 +1,140 @@
+{
+  "extends": "../../.eslintrc",
+  "rules": {},
+  "ignorePatterns": ["!**/*", "**/__fixtures__/**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "fs-extra",
+                "message": "Please use equivalent utilities from `node:fs` instead."
+              }
+            ],
+            "patterns": [
+              {
+                "group": ["**/devkit-exports"],
+                "message": "Do not import from devkit-exports from the nx package"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.ts"],
+      "excludedFiles": ["*.spec.ts"],
+      "rules": {
+        "@typescript-eslint/no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "typescript",
+                "message": "TypeScript is an optional dependency for Nx. If you need to use it, make sure its installed first with ensureTypescript.",
+                "allowTypeImports": true
+              }
+            ],
+            "patterns": [
+              {
+                "group": ["nx/*"],
+                "message": "Circular import in 'nx' found. Use relative path."
+              },
+              {
+                "group": ["**/native-bindings", "**/native-bindings.js"],
+                "message": "Direct imports from native-bindings.js are not allowed. Import from index.js instead."
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["./package.json", "./executors.json", "./migrations.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/nx-plugin-checks": [
+          "error",
+          {
+            "allowedVersionStrings": ["latest"]
+          }
+        ]
+      }
+    },
+    {
+      "files": ["nxw.ts"],
+      "rules": {
+        "@typescript-eslint/no-restricted-imports": [
+          "error",
+          {
+            "patterns": [
+              {
+                "group": ["*", "!fs"],
+                "message": "The Nx wrapper is ran before packages are installed. It should only import node builtins.",
+                "allowTypeImports": true
+              }
+            ]
+          }
+        ],
+        "no-restricted-modules": [
+          "error",
+          {
+            "patterns": ["*", "!fs", "!path", "!child_process", "!node:*"]
+          }
+        ],
+        "no-restricted-imports": "off"
+      }
+    },
+    {
+      "files": ["./package.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": [
+          "error",
+          {
+            "buildTargets": ["build-base"],
+            "ignoredDependencies": [
+              "typescript",
+              "@nrwl/angular",
+              "@angular-devkit/build-angular",
+              "@angular-devkit/core",
+              "@angular-devkit/architect",
+              "@swc/core", //Optional, used in JS analysis if available
+              "@swc/node-register", //Optional, used in JS analysis if available
+              "rxjs",
+              "@angular-devkit/schematics",
+              "@pnpm/lockfile-types",
+              "@nestjs/cli", // nx init nest makes use of nestjs cli (which should be available in NestJS CLI app) to parse the nest-cli.json file
+              "ts-node", // We *may* fall back on ts-node, but we want to encourage the use of @swc-node instead so we don't explicitly list ts-node as an optional dep
+              "memfs", // used in mock for handling .node files in tests
+              "events", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "process", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "prettier", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "util", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              // The native modules are optional and only one of them will ever be installed on a given machine
+              "@nx/nx-darwin-x64",
+              "@nx/nx-darwin-arm64",
+              "@nx/nx-linux-x64-gnu",
+              "@nx/nx-linux-x64-musl",
+              "@nx/nx-win32-x64-msvc",
+              "@nx/nx-linux-arm64-gnu",
+              "@nx/nx-linux-arm64-musl",
+              "@nx/nx-linux-arm-gnueabihf",
+              "@nx/nx-win32-arm64-msvc",
+              "@nx/nx-freebsd-x64",
+              "@nx/powerpack-license"
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}

package/bin/nx.js

@@ -16,6 +16,7 @@ const assert_supported_platform_1 = require("../src/native/assert-supported-plat
 const perf_hooks_1 = require("perf_hooks");
 const workspace_context_1 = require("../src/utils/workspace-context");
 const client_1 = require("../src/daemon/client/client");
+const db_connection_1 = require("../src/utils/db-connection");
 function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
@@ -223,4 +224,11 @@ const getLatestVersionOfNx = ((fn) => {
     let cache = null;
     return () => cache || (cache = fn());
 })(_getLatestVersionOfNx);
+function nxCleanup() {
+    (0, db_connection_1.removeDbConnections)();
+}
+process.on('exit', nxCleanup);
+process.on('SIGINT', nxCleanup);
+process.on('SIGTERM', nxCleanup);
+process.on('SIGHUP', nxCleanup);
 main();

package/bin/post-install.js

@@ -10,18 +10,20 @@ const update_manager_1 = require("../src/nx-cloud/update-manager");
 const get_cloud_options_1 = require("../src/nx-cloud/utilities/get-cloud-options");
 const nx_cloud_utils_1 = require("../src/utils/nx-cloud-utils");
 const nx_json_1 = require("../src/config/nx-json");
-const workspace_context_1 = require("../src/utils/workspace-context");
 const logger_1 = require("../src/utils/logger");
+const workspace_context_1 = require("../src/utils/workspace-context");
 (async () => {
     const start = new Date();
     try {
-        (0, workspace_context_1.setupWorkspaceContext)(workspace_root_1.workspaceRoot);
         if (isMainNxPackage() && (0, fileutils_1.fileExists)((0, path_1.join)(workspace_root_1.workspaceRoot, 'nx.json'))) {
             (0, assert_supported_platform_1.assertSupportedPlatform)();
-            try {
-                await client_1.daemonClient.stop();
+            (0, workspace_context_1.setupWorkspaceContext)(workspace_root_1.workspaceRoot);
+            if (client_1.daemonClient.enabled()) {
+                try {
+                    await client_1.daemonClient.stop();
+                }
+                catch (e) { }
             }
-            catch (e) { }
             const tasks = [
                 (0, project_graph_1.buildProjectGraphAndSourceMapsWithoutDaemon)(),
             ];

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@ohos-ports/nx",
-  "version": "19.8.4-beta.2",
+  "version": "19.8.14-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
     "type": "git",
     "url": "https://github.com/ohos-ports/ohos-ports.git",
-    "directory": "ports/nx/19.8.4"
+    "directory": "ports/nx/19.8.14"
   },
   "keywords": [
     "Monorepo",
@@ -65,9 +65,9 @@
     "tslib": "^2.3.0",
     "yargs": "^17.6.2",
     "yargs-parser": "21.1.1",
-    "node-machine-id": "1.1.12",
+    "node-machine-id": "npm:@ohos-ports/node-machine-id@^1.1.12-beta.0",
     "ora": "5.3.0",
-    "@nrwl/tao": "npm:@ohos-ports/nrwl-tao@19.8.4-beta.1"
+    "@nrwl/tao": "npm:@ohos-ports/nrwl-tao@^19.8.4-beta.1"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -82,16 +82,17 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.8.4",
-    "@nx/nx-darwin-arm64": "19.8.4",
-    "@nx/nx-linux-x64-gnu": "19.8.4",
-    "@nx/nx-linux-x64-musl": "19.8.4",
-    "@nx/nx-win32-x64-msvc": "19.8.4",
-    "@nx/nx-linux-arm64-gnu": "19.8.4",
-    "@nx/nx-linux-arm64-musl": "19.8.4",
-    "@nx/nx-linux-arm-gnueabihf": "19.8.4",
-    "@nx/nx-win32-arm64-msvc": "19.8.4",
-    "@nx/nx-freebsd-x64": "19.8.4"
+    "@nx/nx-darwin-x64": "19.8.14",
+    "@nx/nx-darwin-arm64": "19.8.14",
+    "@nx/nx-linux-x64-gnu": "19.8.14",
+    "@nx/nx-linux-x64-musl": "19.8.14",
+    "@nx/nx-win32-x64-msvc": "19.8.14",
+    "@nx/nx-linux-arm64-gnu": "19.8.14",
+    "@nx/nx-linux-arm64-musl": "19.8.14",
+    "@nx/nx-linux-arm-gnueabihf": "19.8.14",
+    "@nx/nx-win32-arm64-msvc": "19.8.14",
+    "@nx/nx-freebsd-x64": "19.8.14",
+    "@nx/nx-openharmony-arm64": "npm:@ohos-ports/nx-nx-openharmony-arm64@19.8.14-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -191,20 +192,5 @@
   "types": "./bin/nx.d.ts",
   "scripts": {
     "postinstall": "node ./bin/post-install"
-  },
-  "files": [
-    "bin/",
-    "init/",
-    "presets/",
-    "src/",
-    "plugins/",
-    "executors.json",
-    "generators.json",
-    "migrations.json",
-    "index.js",
-    "index.d.ts",
-    "package.json",
-    "README.md",
-    "LICENSE"
-  ]
+  }
 }

package/plugins/package-json.d.ts

@@ -1 +1,5 @@
-export {};
+import { ProjectConfiguration } from '../src/config/workspace-json-project-json';
+export type PackageJsonConfigurationCache = {
+    [hash: string]: ProjectConfiguration;
+};
+export declare function readPackageJsonConfigurationCache(): PackageJsonConfigurationCache;

package/plugins/package-json.js

@@ -1,12 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.readPackageJsonConfigurationCache = readPackageJsonConfigurationCache;
+const plugins_1 = require("../src/project-graph/plugins");
 const workspace_root_1 = require("../src/utils/workspace-root");
 const package_json_1 = require("../src/plugins/package-json");
+const cache_directory_1 = require("../src/utils/cache-directory");
+const path_1 = require("path");
+const fileutils_1 = require("../src/utils/fileutils");
+const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'package-json.hash');
+function readPackageJsonConfigurationCache() {
+    try {
+        return (0, fileutils_1.readJsonFile)(cachePath);
+    }
+    catch (e) {
+        return {};
+    }
+}
+function writeCache(cache) {
+    (0, fileutils_1.writeJsonFile)(cachePath, cache);
+}
 const plugin = {
     name: 'nx-all-package-jsons-plugin',
-    createNodes: [
+    createNodesV2: [
         '*/**/package.json',
-        (f) => (0, package_json_1.createNodeFromPackageJson)(f, workspace_root_1.workspaceRoot),
+        (configFiles, options, context) => {
+            const cache = readPackageJsonConfigurationCache();
+            const result = (0, plugins_1.createNodesFromFiles)((f) => (0, package_json_1.createNodeFromPackageJson)(f, workspace_root_1.workspaceRoot, cache), configFiles, options, context);
+            writeCache(cache);
+            return result;
+        },
     ],
 };
 module.exports = plugin;
+module.exports.readPackageJsonConfigurationCache =
+    readPackageJsonConfigurationCache;

package/release/changelog-renderer/index.d.ts

@@ -0,0 +1,80 @@
+import { ChangelogChange } from '../../src/command-line/release/changelog';
+import { NxReleaseConfig } from '../../src/command-line/release/config/config';
+import { GitCommit } from '../../src/command-line/release/utils/git';
+import { GithubRepoData, RepoSlug } from '../../src/command-line/release/utils/github';
+import type { ProjectGraph } from '../../src/config/project-graph';
+/**
+ * The ChangelogRenderOptions are specific to each ChangelogRenderer implementation, and are taken
+ * from the user's nx.json configuration and passed as is into the ChangelogRenderer function.
+ */
+export type ChangelogRenderOptions = Record<string, unknown>;
+/**
+ * When versioning projects independently and enabling `"updateDependents": "always"`, there could
+ * be additional dependency bump information that is not captured in the commit data, but that nevertheless
+ * should be included in the rendered changelog.
+ */
+export type DependencyBump = {
+    dependencyName: string;
+    newVersion: string;
+};
+/**
+ * A ChangelogRenderer function takes in the extracted commits and other relevant metadata
+ * and returns a string, or a Promise of a string of changelog contents (usually markdown).
+ *
+ * @param {Object} config The configuration object for the ChangelogRenderer
+ * @param {ProjectGraph} config.projectGraph The project graph for the workspace
+ * @param {GitCommit[]} config.commits DEPRECATED [Use 'config.changes' instead] - The collection of extracted commits to generate a changelog for
+ * @param {ChangelogChange[]} config.changes The collection of changes to show in the changelog
+ * @param {string} config.releaseVersion The version that is being released
+ * @param {string | null} config.project The name of specific project to generate a changelog for, or `null` if the overall workspace changelog
+ * @param {string | false} config.entryWhenNoChanges The (already interpolated) string to use as the changelog entry when there are no changes, or `false` if no entry should be generated
+ * @param {ChangelogRenderOptions} config.changelogRenderOptions The options specific to the ChangelogRenderer implementation
+ * @param {DependencyBump[]} config.dependencyBumps Optional list of additional dependency bumps that occurred as part of the release, outside of the commit data
+ * @param {GithubRepoData} config.repoData Resolved data for the current GitHub repository
+ */
+export type ChangelogRenderer = (config: {
+    projectGraph: ProjectGraph;
+    commits?: GitCommit[];
+    changes?: ChangelogChange[];
+    releaseVersion: string;
+    project: string | null;
+    entryWhenNoChanges: string | false;
+    changelogRenderOptions: DefaultChangelogRenderOptions;
+    dependencyBumps?: DependencyBump[];
+    repoSlug?: RepoSlug;
+    repoData?: GithubRepoData;
+    conventionalCommitsConfig: NxReleaseConfig['conventionalCommits'] | null;
+}) => Promise<string> | string;
+/**
+ * The specific options available to the default implementation of the ChangelogRenderer that nx exports
+ * for the common case.
+ */
+export interface DefaultChangelogRenderOptions extends ChangelogRenderOptions {
+    /**
+     * Whether or not the commit authors should be added to the bottom of the changelog in a "Thank You"
+     * section. Defaults to true.
+     */
+    authors?: boolean;
+    /**
+     * If authors is enabled, controls whether or not to try to map the authors to their GitHub usernames
+     * using https://ungh.cc (from https://github.com/unjs/ungh) and the email addresses found in the commits.
+     * Defaults to true.
+     */
+    mapAuthorsToGitHubUsernames?: boolean;
+    /**
+     * Whether or not the commit references (such as commit and/or PR links) should be included in the changelog.
+     * Defaults to true.
+     */
+    commitReferences?: boolean;
+    /**
+     * Whether or not to include the date in the version title. It can be set to false to disable it, or true to enable
+     * with the default of (YYYY-MM-DD). Defaults to true.
+     */
+    versionTitleDate?: boolean;
+}
+/**
+ * The default ChangelogRenderer implementation that nx exports for the common case of generating markdown
+ * from the given commits and other metadata.
+ */
+declare const defaultChangelogRenderer: ChangelogRenderer;
+export default defaultChangelogRenderer;