@salesforce/packaging 1.4.2 → 1.4.4

package/lib/package/packageVersionCreate.js

@@ -178,6 +178,7 @@ class PackageVersionCreate {
             SourceOrg: this.options.sourceorg,
             CalculateCodeCoverage: this.options.codecoverage || false,
             SkipValidation: this.options.skipvalidation || false,
+            // note: the createRequest's Language corresponds to the AllPackageVersion's language
             Language: this.options.language,
         };
         // Ensure we only include the Language property for a connection api version
@@ -232,6 +233,7 @@ class PackageVersionCreate {
         await fs.promises.mkdir(packageVersBlobDirectory, { recursive: true });
         const settingsGenerator = new scratchOrgSettingsGenerator_1.default({ asDirectory: true });
         const packageDescriptorJson = (0, kit_1.cloneJson)(this.packageObject);
+        const apvLanguage = packageDescriptorJson.language;
         // Copy all the metadata from the workspace to a tmp folder
         const componentSet = await this.metadataResolver.generateMDFolderForArtifact(mdOptions);
         this.verifyHasSource(componentSet);
@@ -239,6 +241,11 @@ class PackageVersionCreate {
             delete packageDescriptorJson.package;
             packageDescriptorJson.id = this.packageId;
         }
+        if (packageDescriptorJson.language) {
+            // the cloneJson() call above added the packageDir's language to the descriptor;
+            // remove that from the descriptor here; it will be set correctly from the definitionFile values below
+            delete packageDescriptorJson.language;
+        }
         const definitionFile = this.options.definitionfile
             ? this.options.definitionfile
             : packageDescriptorJson.definitionFile;
@@ -257,7 +264,8 @@ class PackageVersionCreate {
                 // this is not allowed, exit with an error
                 throw messages.createError('signupDuplicateSettingsSpecified');
             }
-            ['country', 'edition', 'features', 'orgPreferences', 'snapshot', 'release', 'sourceOrg'].forEach((prop) => {
+            // these scratch org definition file values will be applied to the build org
+            ['country', 'language', 'edition', 'features', 'orgPreferences', 'snapshot', 'release', 'sourceOrg'].forEach((prop) => {
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 const propValue = definitionFileJson[prop];
                 if (propValue) {
@@ -270,9 +278,9 @@ class PackageVersionCreate {
         // All dependencies for the packaging dir should be resolved to an 04t id to be passed to the server.
         // (see _retrieveSubscriberPackageVersionId for details)
         const dependencies = packageDescriptorJson.dependencies;
-        // branch and language can be set via options or descriptor; option takes precedence
+        // branch and APV language can be set via options or packageDirectory; option takes precedence
         this.options.branch = this.options.branch ?? packageDescriptorJson.branch;
-        this.options.language = this.options.language ?? packageDescriptorJson.language;
+        this.options.language = this.options.language ?? apvLanguage;
         const resultValues = await Promise.all(!dependencies ? [] : dependencies.map((dependency) => this.retrieveSubscriberPackageVersionId(dependency)));
         const ancestorId = await this.getAncestorId(packageDescriptorJson, this.options.project, this.options.versionnumber ?? packageDescriptorJson.versionNumber, this.options.skipancestorcheck);
         // If dependencies exist, the resultValues array will contain the dependencies populated with a resolved

package/package.json

@@ -1,28 +1,28 @@
 {
   "name": "@salesforce/packaging",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
   "license": "BSD-3-Clause",
   "repository": "forcedotcom/packaging",
   "scripts": {
-    "build": "sf-build",
+    "build": "wireit",
     "ci-docs": "yarn sf-ci-docs",
     "clean": "sf-clean",
     "clean-all": "sf-clean all",
-    "compile": "sf-compile",
+    "compile": "wireit",
     "docs": "sf-docs",
-    "format": "sf-format",
-    "lint": "sf-lint",
+    "format": "wireit",
+    "lint": "wireit",
     "lint-fix": "yarn sf-lint --fix",
     "postcompile": "tsc -p test",
     "prepack": "sf-prepack",
     "prepare": "sf-install",
-    "pretest": "sf-compile-test",
     "repl": "node --inspect ./scripts/repl.js",
-    "test": "sf-test",
-    "test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 1800000 --parallel"
+    "test": "wireit",
+    "test:nuts": "nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 1800000 --parallel",
+    "test:only": "wireit"
   },
   "keywords": [
     "force",
@@ -38,9 +38,9 @@
     "!lib/**/*.map"
   ],
   "dependencies": {
-    "@oclif/core": "^1.26.1",
+    "@oclif/core": "^1.26.2",
     "@salesforce/core": "^3.32.11",
-    "@salesforce/kit": "^1.8.4",
+    "@salesforce/kit": "^1.9.2",
     "@salesforce/schemas": "^1.5.0",
     "@salesforce/source-deploy-retrieve": "^7.7.5",
     "@salesforce/ts-types": "^1.7.1",
@@ -58,9 +58,9 @@
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
-    "@salesforce/cli-plugins-testkit": "^3.2.20",
+    "@salesforce/cli-plugins-testkit": "^3.2.24",
     "@salesforce/dev-config": "^3.1.0",
-    "@salesforce/dev-scripts": "^3.1.1",
+    "@salesforce/dev-scripts": "^4.1.2",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.4.6",
     "@types/debug": "4.1.7",
@@ -87,9 +87,83 @@
     "shelljs": "0.8.5",
     "sinon": "14.0.2",
     "ts-node": "^10.9.1",
-    "typescript": "4.9.5"
+    "typescript": "4.9.5",
+    "wireit": "^0.9.5"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "wireit": {
+    "build": {
+      "dependencies": [
+        "compile",
+        "lint"
+      ]
+    },
+    "compile": {
+      "command": "tsc -p . --pretty --incremental",
+      "files": [
+        "src/**/*.ts",
+        "tsconfig.json",
+        "messages/**"
+      ],
+      "output": [
+        "lib/**",
+        "*.tsbuildinfo"
+      ],
+      "clean": "if-file-deleted"
+    },
+    "format": {
+      "command": "prettier --write \"+(src|test|schemas)/**/*.+(ts|js|json)|command-snapshot.json\"",
+      "files": [
+        "src/**/*.ts",
+        "test/**/*.ts",
+        "schemas/**/*.json",
+        "command-snapshot.json",
+        ".prettier*"
+      ],
+      "output": []
+    },
+    "lint": {
+      "command": "eslint src test --color --cache --cache-location .eslintcache",
+      "files": [
+        "src/**/*.ts",
+        "test/**/*.ts",
+        "messages/**",
+        ".eslint*"
+      ],
+      "output": []
+    },
+    "test:compile": {
+      "command": "tsc -p \"./test\" --pretty",
+      "files": [
+        "test/**/*.ts",
+        "tsconfig.json",
+        "test/tsconfig.json"
+      ],
+      "output": []
+    },
+    "test": {
+      "dependencies": [
+        "test:only",
+        "test:compile"
+      ]
+    },
+    "test:only": {
+      "command": "nyc mocha \"test/**/*.test.ts\"",
+      "env": {
+        "FORCE_COLOR": "2"
+      },
+      "files": [
+        "test/**/*.ts",
+        "src/**/*.ts",
+        "tsconfig.json",
+        ".mocha*",
+        "test/tsconfig.json",
+        "!*.nut.ts",
+        ".nycrc"
+      ],
+      "output": []
+    }
   }
 }