@salesforce/packaging 5.0.20 → 5.0.23

package/lib/package/packageProfileApi.js

@@ -22,7 +22,7 @@ exports.PackageProfileApi = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_fs_1 = __importDefault(require("node:fs"));
-const globby_1 = __importDefault(require("globby"));
+const tinyglobby_1 = require("tinyglobby");
 const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const profileRewriter_1 = require("./profileRewriter");
@@ -109,7 +109,11 @@ class PackageProfileApi extends kit_1.AsyncCreatable {
             .map((fullDir) => node_os_1.default.type() === 'Windows_NT'
             ? node_path_1.default.posix.join(...fullDir.split(node_path_1.default.sep), '**', '*.profile-meta.xml')
             : node_path_1.default.join(fullDir, '**', '*.profile-meta.xml'));
-        return globby_1.default.sync(patterns, { ignore });
+        // tinyglobby matches `ignore` relative to cwd, so use the filesystem root to match against full paths.
+        // Glob each package directory separately to keep results in package directory order.
+        const cwd = node_path_1.default.parse(this.project.getPath()).root;
+        const profiles = patterns.flatMap((pattern) => (0, tinyglobby_1.globSync)(pattern, { ignore, absolute: true, expandDirectories: false, cwd }));
+        return [...new Set(profiles)];
     }
     getProfilesWithNamesAndPaths(excludedDirectories) {
         return this.findAllProfiles(excludedDirectories)

package/lib/package/packageUninstall.js

@@ -30,7 +30,7 @@ core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'package_uninstall');
 const pkgMessages = core_1.Messages.loadMessages('@salesforce/packaging', 'package');
 async function getUninstallErrors(conn, id) {
-    const errorQueryResult = await conn.tooling.query(`"SELECT Message FROM PackageVersionUninstallRequestError WHERE ParentRequest.Id = '${id}' ORDER BY Message"`);
+    const errorQueryResult = await conn.tooling.query(`SELECT Message FROM PackageVersionUninstallRequestError WHERE ParentRequest.Id = '${id}' ORDER BY Message`);
     return errorQueryResult?.records ?? [];
 }
 async function pollUninstall(uninstallRequestId, conn, frequency, wait) {
@@ -50,7 +50,10 @@ async function pollUninstall(uninstallRequestId, conn, frequency, wait) {
                 return { completed: false, payload: uninstallRequest };
             }
             default: {
-                const err = pkgMessages.getMessage('defaultErrorMessage', [id, uninstallRequest.Id]);
+                const err = pkgMessages.getMessage('defaultErrorMessage', [
+                    uninstallRequest.SubscriberPackageVersionId,
+                    uninstallRequest.Id,
+                ]);
                 const errorMessages = await getUninstallErrors(conn, id);
                 const errors = errorMessages.map((error, index) => `(${index + 1}) ${error.Message}${node_os_1.default.EOL}`);
                 const combinedErrors = errors.length ? `\n=== Errors\n${errors.join(node_os_1.default.EOL)}` : '';

package/lib/package/subscriberPackageVersion.js

@@ -180,7 +180,7 @@ class SubscriberPackageVersion {
             const errorDetails = await (0, packageUninstall_1.getUninstallErrors)(connection, id);
             const errors = errorDetails.map((record, index) => `(${index + 1}) ${record.Message}`);
             const errHeader = errors.length > 0 ? `\n=== Errors\n${errors.join('\n')}` : '';
-            const err = pkgMessages.getMessage('defaultErrorMessage', [id, result.Id]);
+            const err = pkgMessages.getMessage('defaultErrorMessage', [result.SubscriberPackageVersionId, result.Id]);
             throw new core_1.SfError(`${err}${errHeader}`, 'UNINSTALL_ERROR', [pkgMessages.getMessage('action')]);
         }
         return result;

package/lib/utils/packageUtils.js

@@ -83,7 +83,7 @@ const core_1 = require("@salesforce/core");
 const project_1 = require("@salesforce/core/project");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
-const globby_1 = __importDefault(require("globby"));
+const tinyglobby_1 = require("tinyglobby");
 const jszip_1 = __importDefault(require("jszip"));
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/packaging', 'pkg_utils');
@@ -407,10 +407,10 @@ const pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
 async function zipDir(dir, zipfile) {
     const logger = core_1.Logger.childFromRoot('srcDevUtils#zipDir');
     const timer = process.hrtime();
-    const globbyResult = await (0, globby_1.default)('**/*', { expandDirectories: true, cwd: dir });
+    const globResult = await (0, tinyglobby_1.glob)('**/*', { cwd: dir, expandDirectories: false });
     const zip = new jszip_1.default();
     // add files tp zip
-    for (const file of globbyResult) {
+    for (const file of globResult) {
         zip.file(file, node_fs_1.default.readFileSync((0, node_path_1.join)(dir, file)));
     }
     // write zip to file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "5.0.20",
+  "version": "5.0.23",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -50,23 +50,24 @@
     "@salesforce/ts-types": "^3.2.0",
     "@salesforce/types": "^1.8.0",
     "fast-xml-parser": "^5.11.2",
-    "globby": "^11",
     "graphology": "^0.26.0",
     "graphology-traversal": "^0.3.1",
     "graphology-types": "^0.24.7",
     "jszip": "^3.10.1",
-    "object-treeify": "^2"
+    "object-treeify": "^2",
+    "tinyglobby": "^0.2.17"
   },
   "devDependencies": {
     "@salesforce/cli-plugins-testkit": "^5.3.66",
-    "@salesforce/dev-scripts": "^14.0.0",
+    "@salesforce/dev-scripts": "^15.0.0",
     "@types/chai": "^4.3.17",
     "@types/globby": "^9.1.0",
     "@types/jszip": "^3.4.1",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18",
+    "@types/picomatch": "^4.0.3",
     "@types/sinon": "^10.0.20",
-    "eslint": "^10.4.0",
+    "eslint": "^10.12.0",
     "eslint-config-salesforce-typescript": "^7.0.0",
     "eslint-plugin-sf-plugin": "^3.0.0",
     "ts-node": "^10.9.2",