From 8cf99384b3b6696cbd70e799ddc9049e950f9362 Mon Sep 17 00:00:00 2001 From: Crash Collison <3751389+tehcrashxor@users.noreply.github.com> Date: Fri, 20 Oct 2023 13:30:24 -0700 Subject: [PATCH] October Release (#470) * Update Cli Wrapper * Update dist for NPM dependencies * upgrade-solution description made more explanatory * added --stage-and-upgrade to import-solution * Update PAC version --- dist/actions/actions-install/index.js | 8 +-- dist/actions/add-solution-component/index.js | 59 ++++++++++-------- dist/actions/assign-group/index.js | 59 ++++++++++-------- dist/actions/assign-user/index.js | 59 ++++++++++-------- dist/actions/backup-environment/index.js | 59 ++++++++++-------- dist/actions/branch-solution/index.js | 6 +- dist/actions/catalog-status/index.js | 59 ++++++++++-------- dist/actions/check-solution/index.js | 59 ++++++++++-------- dist/actions/clone-solution/index.js | 59 ++++++++++-------- dist/actions/copy-environment/index.js | 59 ++++++++++-------- dist/actions/create-environment/index.js | 59 ++++++++++-------- dist/actions/delete-environment/index.js | 59 ++++++++++-------- dist/actions/delete-solution/index.js | 59 ++++++++++-------- dist/actions/deploy-package/index.js | 59 ++++++++++-------- dist/actions/download-paportal/index.js | 59 ++++++++++-------- dist/actions/export-data/index.js | 59 ++++++++++-------- dist/actions/export-solution/index.js | 59 ++++++++++-------- dist/actions/import-data/index.js | 59 ++++++++++-------- dist/actions/import-solution/index.js | 60 +++++++++++-------- dist/actions/install-catalog/index.js | 59 ++++++++++-------- dist/actions/pack-solution/index.js | 59 ++++++++++-------- dist/actions/publish-solution/index.js | 59 ++++++++++-------- dist/actions/reset-environment/index.js | 59 ++++++++++-------- dist/actions/restore-environment/index.js | 59 ++++++++++-------- .../set-online-solution-version/index.js | 59 ++++++++++-------- dist/actions/submit-catalog/index.js | 59 ++++++++++-------- dist/actions/unpack-solution/index.js | 59 ++++++++++-------- dist/actions/update-solution-version/index.js | 59 ++++++++++-------- dist/actions/upgrade-solution/index.js | 59 ++++++++++-------- dist/actions/upload-paportal/index.js | 59 ++++++++++-------- dist/actions/who-am-i/index.js | 59 ++++++++++-------- import-solution/action.yml | 5 ++ package-lock.json | 60 +++++++++---------- package.json | 2 +- src/actions/import-solution/index.ts | 1 + src/pacPackageInfo.json | 2 +- src/test/importSolution.test.ts | 1 + upgrade-solution/action.yml | 2 +- 38 files changed, 1063 insertions(+), 736 deletions(-) diff --git a/dist/actions/actions-install/index.js b/dist/actions/actions-install/index.js index aa28a0f1..80d4fdde 100644 --- a/dist/actions/actions-install/index.js +++ b/dist/actions/actions-install/index.js @@ -3268,7 +3268,7 @@ var require_pacPackageInfo = __commonJS({ PacPackageName: "Microsoft.PowerApps.CLI", LegacyLinuxPackage: "Microsoft.PowerApps.CLI.Core.linux-x64", DotnetToolName: "Microsoft.PowerApps.CLI.Tool", - PacPackageVersion: "1.27.6" + PacPackageVersion: "1.28.3" }; } }); @@ -3327,7 +3327,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -3352,7 +3352,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -3369,7 +3369,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/add-solution-component/index.js b/dist/actions/add-solution-component/index.js index 83ebea6e..9adfa689 100644 --- a/dist/actions/add-solution-component/index.js +++ b/dist/actions/add-solution-component/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24192,7 +24203,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24217,7 +24228,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24234,7 +24245,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/assign-group/index.js b/dist/actions/assign-group/index.js index 63cf10e7..80a4b9b6 100644 --- a/dist/actions/assign-group/index.js +++ b/dist/actions/assign-group/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24192,7 +24203,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24217,7 +24228,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24234,7 +24245,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/assign-user/index.js b/dist/actions/assign-user/index.js index 718c7142..0e08260c 100644 --- a/dist/actions/assign-user/index.js +++ b/dist/actions/assign-user/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24192,7 +24203,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24217,7 +24228,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24234,7 +24245,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/backup-environment/index.js b/dist/actions/backup-environment/index.js index 8d93ede8..7f1d8e24 100644 --- a/dist/actions/backup-environment/index.js +++ b/dist/actions/backup-environment/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24192,7 +24203,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24217,7 +24228,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24234,7 +24245,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/branch-solution/index.js b/dist/actions/branch-solution/index.js index 3d93e8a4..a9f14696 100644 --- a/dist/actions/branch-solution/index.js +++ b/dist/actions/branch-solution/index.js @@ -2303,7 +2303,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -2328,7 +2328,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -2345,7 +2345,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/catalog-status/index.js b/dist/actions/catalog-status/index.js index f7904944..e5bfbf5d 100644 --- a/dist/actions/catalog-status/index.js +++ b/dist/actions/catalog-status/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/check-solution/index.js b/dist/actions/check-solution/index.js index 620df800..c26b6cb7 100644 --- a/dist/actions/check-solution/index.js +++ b/dist/actions/check-solution/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/clone-solution/index.js b/dist/actions/clone-solution/index.js index 55845bfa..8c22bf89 100644 --- a/dist/actions/clone-solution/index.js +++ b/dist/actions/clone-solution/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/copy-environment/index.js b/dist/actions/copy-environment/index.js index d27ef4f7..cde32f02 100644 --- a/dist/actions/copy-environment/index.js +++ b/dist/actions/copy-environment/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24192,7 +24203,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24217,7 +24228,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24234,7 +24245,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/create-environment/index.js b/dist/actions/create-environment/index.js index 91faa9e2..692859de 100644 --- a/dist/actions/create-environment/index.js +++ b/dist/actions/create-environment/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24192,7 +24203,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24217,7 +24228,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24234,7 +24245,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/delete-environment/index.js b/dist/actions/delete-environment/index.js index 35e777ac..86307eea 100644 --- a/dist/actions/delete-environment/index.js +++ b/dist/actions/delete-environment/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24192,7 +24203,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24217,7 +24228,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24234,7 +24245,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/delete-solution/index.js b/dist/actions/delete-solution/index.js index 072c7c0d..064dc693 100644 --- a/dist/actions/delete-solution/index.js +++ b/dist/actions/delete-solution/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/deploy-package/index.js b/dist/actions/deploy-package/index.js index db0be832..df911f5d 100644 --- a/dist/actions/deploy-package/index.js +++ b/dist/actions/deploy-package/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/download-paportal/index.js b/dist/actions/download-paportal/index.js index 678f2f13..85df8c0f 100644 --- a/dist/actions/download-paportal/index.js +++ b/dist/actions/download-paportal/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/export-data/index.js b/dist/actions/export-data/index.js index 7d7e1f9a..6d66ae3b 100644 --- a/dist/actions/export-data/index.js +++ b/dist/actions/export-data/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/export-solution/index.js b/dist/actions/export-solution/index.js index 13643d96..23c3f2fe 100644 --- a/dist/actions/export-solution/index.js +++ b/dist/actions/export-solution/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/import-data/index.js b/dist/actions/import-data/index.js index 0a12a230..48a05f55 100644 --- a/dist/actions/import-data/index.js +++ b/dist/actions/import-data/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/import-solution/index.js b/dist/actions/import-solution/index.js index bdd4f5b1..ed4a73aa 100644 --- a/dist/actions/import-solution/index.js +++ b/dist/actions/import-solution/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", @@ -24349,6 +24360,7 @@ var runnerParameters_1 = require_runnerParameters(); async: parameterMap["run-asynchronously"], maxAsyncWaitTimeInMin: parameterMap["max-async-wait-time"], importAsHolding: parameterMap["import-as-holding"], + stageAndUpgrade: parameterMap["stage-and-upgrade"], forceOverwrite: parameterMap["force-overwrite"], publishChanges: parameterMap["publish-changes"], skipDependencyCheck: parameterMap["skip-dependency-check"], diff --git a/dist/actions/install-catalog/index.js b/dist/actions/install-catalog/index.js index 31167bfd..f844fd49 100644 --- a/dist/actions/install-catalog/index.js +++ b/dist/actions/install-catalog/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/pack-solution/index.js b/dist/actions/pack-solution/index.js index 7827d78d..cedfe3a7 100644 --- a/dist/actions/pack-solution/index.js +++ b/dist/actions/pack-solution/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24144,7 +24155,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24169,7 +24180,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24186,7 +24197,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/publish-solution/index.js b/dist/actions/publish-solution/index.js index 4d44ce26..8540bece 100644 --- a/dist/actions/publish-solution/index.js +++ b/dist/actions/publish-solution/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/reset-environment/index.js b/dist/actions/reset-environment/index.js index 7bf92851..dac154ec 100644 --- a/dist/actions/reset-environment/index.js +++ b/dist/actions/reset-environment/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24192,7 +24203,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24217,7 +24228,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24234,7 +24245,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/restore-environment/index.js b/dist/actions/restore-environment/index.js index 8bb3185e..af52b489 100644 --- a/dist/actions/restore-environment/index.js +++ b/dist/actions/restore-environment/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24192,7 +24203,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24217,7 +24228,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24234,7 +24245,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/set-online-solution-version/index.js b/dist/actions/set-online-solution-version/index.js index f18f2371..1180c697 100644 --- a/dist/actions/set-online-solution-version/index.js +++ b/dist/actions/set-online-solution-version/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/submit-catalog/index.js b/dist/actions/submit-catalog/index.js index eec36143..c9e072a7 100644 --- a/dist/actions/submit-catalog/index.js +++ b/dist/actions/submit-catalog/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/unpack-solution/index.js b/dist/actions/unpack-solution/index.js index f099ec55..099f5064 100644 --- a/dist/actions/unpack-solution/index.js +++ b/dist/actions/unpack-solution/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24144,7 +24155,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24169,7 +24180,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24186,7 +24197,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/update-solution-version/index.js b/dist/actions/update-solution-version/index.js index f47266de..3a256408 100644 --- a/dist/actions/update-solution-version/index.js +++ b/dist/actions/update-solution-version/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24144,7 +24155,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24169,7 +24180,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24186,7 +24197,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/upgrade-solution/index.js b/dist/actions/upgrade-solution/index.js index c278a124..e1cd7f7a 100644 --- a/dist/actions/upgrade-solution/index.js +++ b/dist/actions/upgrade-solution/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/upload-paportal/index.js b/dist/actions/upload-paportal/index.js index 69bee626..5dcced36 100644 --- a/dist/actions/upload-paportal/index.js +++ b/dist/actions/upload-paportal/index.js @@ -2669,7 +2669,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -2685,7 +2685,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -2693,7 +2692,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -8412,9 +8417,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -8586,9 +8591,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -8621,6 +8626,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -8662,7 +8670,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -8671,9 +8679,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -8904,9 +8912,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -9221,9 +9229,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -9361,7 +9369,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -9425,9 +9436,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -9446,9 +9457,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -11940,7 +11951,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -24205,7 +24216,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -24230,7 +24241,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -24247,7 +24258,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/dist/actions/who-am-i/index.js b/dist/actions/who-am-i/index.js index 08133d9e..f1914c5c 100644 --- a/dist/actions/who-am-i/index.js +++ b/dist/actions/who-am-i/index.js @@ -503,7 +503,7 @@ var require_importSolution = __commonJS({ var createPacRunner_1 = require_createPacRunner(); var path = require("path"); function importSolution(parameters, runnerParameters, host) { - var _a; + var _a, _b, _c; return __awaiter2(this, void 0, void 0, function* () { function resolveFolder(folder) { if (!folder || typeof folder !== "string") @@ -519,7 +519,6 @@ var require_importSolution = __commonJS({ const validator = new InputValidator_1.InputValidator(host); validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder); validator.pushInput(pacArgs, "--async", parameters.async); - validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite); validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges); validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck); @@ -527,7 +526,13 @@ var require_importSolution = __commonJS({ validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin); validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins); validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion); - if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding); + } + if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") { + validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade); + } + if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") { validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile); } validator.pushCommon(pacArgs, parameters); @@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/pattern.js +// node_modules/glob/dist/commonjs/pattern.js var require_pattern = __commonJS({ - "node_modules/glob/dist/cjs/src/pattern.js"(exports2) { + "node_modules/glob/dist/commonjs/pattern.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Pattern = void 0; @@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/ignore.js +// node_modules/glob/dist/commonjs/ignore.js var require_ignore = __commonJS({ - "node_modules/glob/dist/cjs/src/ignore.js"(exports2) { + "node_modules/glob/dist/commonjs/ignore.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Ignore = void 0; @@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({ for (let i = 0; i < mm.set.length; i++) { const parsed = mm.set[i]; const globParts = mm.globParts[i]; + if (!parsed || !globParts) { + throw new Error("invalid pattern object"); + } const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform); const m = new minimatch_1.Minimatch(p.globString(), mmopts); const children = globParts[globParts.length - 1] === "**"; @@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({ } for (const m of this.absoluteChildren) { if (m.match(fullpath)) - true; + return true; } return false; } @@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/processor.js +// node_modules/glob/dist/commonjs/processor.js var require_processor = __commonJS({ - "node_modules/glob/dist/cjs/src/processor.js"(exports2) { + "node_modules/glob/dist/commonjs/processor.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0; @@ -6738,9 +6746,9 @@ var require_processor = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/walker.js +// node_modules/glob/dist/commonjs/walker.js var require_walker = __commonJS({ - "node_modules/glob/dist/cjs/src/walker.js"(exports2) { + "node_modules/glob/dist/commonjs/walker.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0; @@ -7055,9 +7063,9 @@ var require_walker = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/glob.js +// node_modules/glob/dist/commonjs/glob.js var require_glob = __commonJS({ - "node_modules/glob/dist/cjs/src/glob.js"(exports2) { + "node_modules/glob/dist/commonjs/glob.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.Glob = void 0; @@ -7195,7 +7203,10 @@ var require_glob = __commonJS({ return set; }, [[], []]); this.patterns = matchSet.map((set, i) => { - return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform); + const g = globParts[i]; + if (!g) + throw new Error("invalid pattern object"); + return new pattern_js_1.Pattern(set, g, 0, this.platform); }); } async walk() { @@ -7259,9 +7270,9 @@ var require_glob = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/has-magic.js +// node_modules/glob/dist/commonjs/has-magic.js var require_has_magic = __commonJS({ - "node_modules/glob/dist/cjs/src/has-magic.js"(exports2) { + "node_modules/glob/dist/commonjs/has-magic.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.hasMagic = void 0; @@ -7280,9 +7291,9 @@ var require_has_magic = __commonJS({ } }); -// node_modules/glob/dist/cjs/src/index.js -var require_src = __commonJS({ - "node_modules/glob/dist/cjs/src/index.js"(exports2) { +// node_modules/glob/dist/commonjs/index.js +var require_commonjs = __commonJS({ + "node_modules/glob/dist/commonjs/index.js"(exports2) { "use strict"; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.glob = exports2.hasMagic = exports2.Glob = exports2.unescape = exports2.escape = exports2.sync = exports2.iterate = exports2.iterateSync = exports2.stream = exports2.streamSync = exports2.globIterate = exports2.globIterateSync = exports2.globSync = exports2.globStream = exports2.globStreamSync = void 0; @@ -9774,7 +9785,7 @@ var require_checkSolution = __commonJS({ }; Object.defineProperty(exports2, "__esModule", { value: true }); exports2.checkSolution = void 0; - var glob = require_src(); + var glob = require_commonjs(); var os = require("os"); var path = require("path"); var InputValidator_1 = require_InputValidator(); @@ -14203,7 +14214,7 @@ var require_package = __commonJS({ "@types/fancy-log": "^2.0.0", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.1.0", - "@types/js-yaml": "^4.0.3", + "@types/js-yaml": "^4.0.7", "@types/mocha": "^10.0.1", "@types/node": "^20.4.8", "@types/sinon": "^10.0.15", @@ -14228,7 +14239,7 @@ var require_package = __commonJS({ "gulp-typescript": "^6.0.0-alpha.1", mocha: "^10.2.0", "node-fetch": "^3.3.2", - postcss: "^8.4.28", + postcss: "^8.4.31", "ps-list": "^8.1.1", rewiremock: "^3.14.5", sinon: "^15.2.0", @@ -14245,7 +14256,7 @@ var require_package = __commonJS({ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/import-solution/action.yml b/import-solution/action.yml index 3fd26a65..2ca0a957 100644 --- a/import-solution/action.yml +++ b/import-solution/action.yml @@ -56,6 +56,11 @@ inputs: required: false default: 'false' + stage-and-upgrade: + description: 'Import the managed solution and immediately apply it as an upgrade.' + required: false + default: 'false' + publish-changes: description: 'Publish your changes upon a successful import.' required: false diff --git a/package-lock.json b/package-lock.json index 7d17fa15..c8d408ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", @@ -778,9 +778,9 @@ } }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dependencies": { "ansi-regex": "^6.0.1" }, @@ -833,13 +833,13 @@ } }, "node_modules/@microsoft/powerplatform-cli-wrapper": { - "version": "0.1.116", - "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.116/663e3d3f08f7cb084121bde94440aed9c11b2e2e", - "integrity": "sha512-9LI+meWFk12FnpZbRsd+9/4FU+ViAp+DM8G6aEpbJrb4X9zfG4JlTcBKOEsw1MK01s8PZ6rOaHnSw3AEsQdKSA==", + "version": "0.1.118", + "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.118/3b2c514efb9c0a9a13248da1e3b07dbbdb77edc1", + "integrity": "sha512-FV/uRS5/1nAENHvdlssT/SyQF8LzsVrjjXklbZla5L+fHEtFk0ObLW7SUcsYRSU/SY5lm+tzlEemq6cWBwStZA==", "license": "MIT", "dependencies": { "fs-extra": "^11.1.1", - "glob": "^10.3.3" + "glob": "^10.3.10" }, "engines": { "node": ">=16.0.0" @@ -4259,18 +4259,18 @@ } }, "node_modules/glob": { - "version": "10.3.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz", - "integrity": "sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -5972,9 +5972,9 @@ } }, "node_modules/jackspeak": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.0.tgz", - "integrity": "sha512-r5XBrqIJfwRIjRt/Xr5fv9Wh09qyhHfKnYddDlpM+ibRR20qrYActpCAgU6U+d53EOEjzkvxPMVHSlgR7leXrQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -11056,9 +11056,9 @@ } }, "strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "requires": { "ansi-regex": "^6.0.1" } @@ -11098,12 +11098,12 @@ } }, "@microsoft/powerplatform-cli-wrapper": { - "version": "0.1.116", - "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.116/663e3d3f08f7cb084121bde94440aed9c11b2e2e", - "integrity": "sha512-9LI+meWFk12FnpZbRsd+9/4FU+ViAp+DM8G6aEpbJrb4X9zfG4JlTcBKOEsw1MK01s8PZ6rOaHnSw3AEsQdKSA==", + "version": "0.1.118", + "resolved": "https://npm.pkg.github.com/download/@microsoft/powerplatform-cli-wrapper/0.1.118/3b2c514efb9c0a9a13248da1e3b07dbbdb77edc1", + "integrity": "sha512-FV/uRS5/1nAENHvdlssT/SyQF8LzsVrjjXklbZla5L+fHEtFk0ObLW7SUcsYRSU/SY5lm+tzlEemq6cWBwStZA==", "requires": { "fs-extra": "^11.1.1", - "glob": "^10.3.3" + "glob": "^10.3.10" } }, "@nodelib/fs.scandir": { @@ -13844,12 +13844,12 @@ "dev": true }, "glob": { - "version": "10.3.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz", - "integrity": "sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "requires": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", "path-scurry": "^1.10.1" @@ -15149,9 +15149,9 @@ "dev": true }, "jackspeak": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.0.tgz", - "integrity": "sha512-r5XBrqIJfwRIjRt/Xr5fv9Wh09qyhHfKnYddDlpM+ibRR20qrYActpCAgU6U+d53EOEjzkvxPMVHSlgR7leXrQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", "requires": { "@isaacs/cliui": "^8.0.2", "@pkgjs/parseargs": "^0.11.0" diff --git a/package.json b/package.json index fc4572fa..5315a2c7 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@actions/core": "^1.10.0", "@actions/exec": "^1.1.1", "@actions/io": "^1.1.3", - "@microsoft/powerplatform-cli-wrapper": "^0.1.116", + "@microsoft/powerplatform-cli-wrapper": "^0.1.118", "date-fns": "^2.30.0", "fs-extra": "^11.1.1", "js-yaml": "^4.1", diff --git a/src/actions/import-solution/index.ts b/src/actions/import-solution/index.ts index 69577a2c..c845aaf9 100644 --- a/src/actions/import-solution/index.ts +++ b/src/actions/import-solution/index.ts @@ -28,6 +28,7 @@ import { runnerParameters } from '../../lib/runnerParameters'; async: parameterMap['run-asynchronously'], maxAsyncWaitTimeInMin: parameterMap['max-async-wait-time'], importAsHolding: parameterMap['import-as-holding'], + stageAndUpgrade: parameterMap['stage-and-upgrade'], forceOverwrite: parameterMap['force-overwrite'], publishChanges: parameterMap['publish-changes'], skipDependencyCheck: parameterMap['skip-dependency-check'], diff --git a/src/pacPackageInfo.json b/src/pacPackageInfo.json index dbf26ac7..6d65ef7d 100644 --- a/src/pacPackageInfo.json +++ b/src/pacPackageInfo.json @@ -2,5 +2,5 @@ "PacPackageName": "Microsoft.PowerApps.CLI", "LegacyLinuxPackage": "Microsoft.PowerApps.CLI.Core.linux-x64", "DotnetToolName": "Microsoft.PowerApps.CLI.Tool", - "PacPackageVersion": "1.27.6" + "PacPackageVersion": "1.28.3" } diff --git a/src/test/importSolution.test.ts b/src/test/importSolution.test.ts index 79ac31a9..5ea12a01 100644 --- a/src/test/importSolution.test.ts +++ b/src/test/importSolution.test.ts @@ -42,6 +42,7 @@ describe("import-solution tests", () => { async: { name: 'run-asynchronously', required: false, defaultValue: 'false' }, maxAsyncWaitTimeInMin: { name: 'max-async-wait-time', required: false, defaultValue: '60' }, importAsHolding: { name: 'import-as-holding', required: false, defaultValue: 'false' }, + stageAndUpgrade: { name: 'stage-and-upgrade', required: false, defaultValue: 'false' }, forceOverwrite: { name: 'force-overwrite', required: false, defaultValue: 'true' }, publishChanges: { name: 'publish-changes', required: false, defaultValue: 'false' }, skipDependencyCheck: { name: 'skip-dependency-check', required: false, defaultValue: 'false' }, diff --git a/upgrade-solution/action.yml b/upgrade-solution/action.yml index 91616903..e637fafb 100644 --- a/upgrade-solution/action.yml +++ b/upgrade-solution/action.yml @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. name: 'upgrade-solution' -description: 'Power Platform Upgrade Solution' +description: 'Power Platform Upgrade Solution - Apply a pending upgrade for solution imported as holding.' inputs: environment-url: description: 'URL of Power Platform environment to connect with; e.g. "https://test-env.crm.dynamics.com"'