Skip to content

Commit c5617c1

Browse files
tehcrashxortehcrashxor
authored
Merge branch 'main' into dependabot/npm_and_yarn/chai-and-types/chai-4.3.8
2 parents e185429 + f91ea97 commit c5617c1

File tree

38 files changed

+1294
-1138
lines changed

38 files changed

+1294
-1138
lines changed

‎dist/actions/actions-install/index.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -3268,7 +3268,7 @@ var require_pacPackageInfo = __commonJS({
32683268
PacPackageName: "Microsoft.PowerApps.CLI",
32693269
LegacyLinuxPackage: "Microsoft.PowerApps.CLI.Core.linux-x64",
32703270
DotnetToolName: "Microsoft.PowerApps.CLI.Tool",
3271-
PacPackageVersion: "1.26.5"
3271+
PacPackageVersion: "1.30.6"
32723272
};
32733273
}
32743274
});
@@ -3327,7 +3327,7 @@ var require_package = __commonJS({
33273327
"@types/fancy-log": "^2.0.0",
33283328
"@types/fs-extra": "^11.0.1",
33293329
"@types/glob": "^8.1.0",
3330-
"@types/js-yaml": "^4.0.3",
3330+
"@types/js-yaml": "^4.0.7",
33313331
"@types/mocha": "^10.0.1",
33323332
"@types/node": "^20.4.8",
33333333
"@types/sinon": "^10.0.15",
@@ -3340,19 +3340,19 @@ var require_package = __commonJS({
33403340
async: "^3.2.4",
33413341
chai: "^4.3.7",
33423342
dotenv: "^16.3.1",
3343-
esbuild: "^0.18.11",
3344-
eslint: "^8.44.0",
3343+
esbuild: "^0.19.3",
3344+
eslint: "^8.49.0",
33453345
"fancy-log": "^2.0.0",
3346-
glob: "^10.3.1",
3346+
glob: "^10.3.4",
33473347
"glob-parent": "^6.0.2",
33483348
gulp: "^4.0.2",
33493349
"gulp-eslint-new": "^1.8.3",
33503350
"gulp-mocha": "^8.0.0",
33513351
"gulp-sourcemaps": "^3.0.0",
33523352
"gulp-typescript": "^6.0.0-alpha.1",
33533353
mocha: "^10.2.0",
3354-
"node-fetch": "^3.3.1",
3355-
postcss: "^8.4.28",
3354+
"node-fetch": "^3.3.2",
3355+
postcss: "^8.4.31",
33563356
"ps-list": "^8.1.1",
33573357
rewiremock: "^3.14.5",
33583358
sinon: "^15.2.0",
@@ -3369,7 +3369,7 @@ var require_package = __commonJS({
33693369
"@actions/core": "^1.10.0",
33703370
"@actions/exec": "^1.1.1",
33713371
"@actions/io": "^1.1.3",
3372-
"@microsoft/powerplatform-cli-wrapper": "^0.1.116",
3372+
"@microsoft/powerplatform-cli-wrapper": "^0.1.118",
33733373
"date-fns": "^2.30.0",
33743374
"fs-extra": "^11.1.1",
33753375
"js-yaml": "^4.1",

‎dist/actions/add-solution-component/index.js

+41-36
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ var require_importSolution = __commonJS({
503503
var createPacRunner_1 = require_createPacRunner();
504504
var path = require("path");
505505
function importSolution(parameters, runnerParameters, host) {
506-
var _a;
506+
var _a, _b, _c;
507507
return __awaiter2(this, void 0, void 0, function* () {
508508
function resolveFolder(folder) {
509509
if (!folder || typeof folder !== "string")
@@ -519,15 +519,20 @@ var require_importSolution = __commonJS({
519519
const validator = new InputValidator_1.InputValidator(host);
520520
validator.pushInput(pacArgs, "--path", parameters.path, resolveFolder);
521521
validator.pushInput(pacArgs, "--async", parameters.async);
522-
validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding);
523522
validator.pushInput(pacArgs, "--force-overwrite", parameters.forceOverwrite);
524523
validator.pushInput(pacArgs, "--publish-changes", parameters.publishChanges);
525524
validator.pushInput(pacArgs, "--skip-dependency-check", parameters.skipDependencyCheck);
526525
validator.pushInput(pacArgs, "--convert-to-managed", parameters.convertToManaged);
527526
validator.pushInput(pacArgs, "--max-async-wait-time", parameters.maxAsyncWaitTimeInMin);
528527
validator.pushInput(pacArgs, "--activate-plugins", parameters.activatePlugins);
529528
validator.pushInput(pacArgs, "--skip-lower-version", parameters.skipLowerVersion);
530-
if (((_a = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") {
529+
if (((_a = validator.getInput(parameters.importAsHolding)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "true") {
530+
validator.pushInput(pacArgs, "--import-as-holding", parameters.importAsHolding);
531+
}
532+
if (((_b = validator.getInput(parameters.stageAndUpgrade)) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "true") {
533+
validator.pushInput(pacArgs, "--stage-and-upgrade", parameters.stageAndUpgrade);
534+
}
535+
if (((_c = validator.getInput(parameters.useDeploymentSettingsFile)) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "true") {
531536
validator.pushInput(pacArgs, "--settings-file", parameters.deploymentSettingsFile);
532537
}
533538
validator.pushCommon(pacArgs, parameters);
@@ -6246,9 +6251,9 @@ var require_cjs4 = __commonJS({
62466251
}
62476252
});
62486253

6249-
// node_modules/glob/dist/cjs/src/pattern.js
6254+
// node_modules/glob/dist/commonjs/pattern.js
62506255
var require_pattern = __commonJS({
6251-
"node_modules/glob/dist/cjs/src/pattern.js"(exports2) {
6256+
"node_modules/glob/dist/commonjs/pattern.js"(exports2) {
62526257
"use strict";
62536258
Object.defineProperty(exports2, "__esModule", { value: true });
62546259
exports2.Pattern = void 0;
@@ -6420,9 +6425,9 @@ var require_pattern = __commonJS({
64206425
}
64216426
});
64226427

6423-
// node_modules/glob/dist/cjs/src/ignore.js
6428+
// node_modules/glob/dist/commonjs/ignore.js
64246429
var require_ignore = __commonJS({
6425-
"node_modules/glob/dist/cjs/src/ignore.js"(exports2) {
6430+
"node_modules/glob/dist/commonjs/ignore.js"(exports2) {
64266431
"use strict";
64276432
Object.defineProperty(exports2, "__esModule", { value: true });
64286433
exports2.Ignore = void 0;
@@ -6455,6 +6460,9 @@ var require_ignore = __commonJS({
64556460
for (let i = 0; i < mm.set.length; i++) {
64566461
const parsed = mm.set[i];
64576462
const globParts = mm.globParts[i];
6463+
if (!parsed || !globParts) {
6464+
throw new Error("invalid pattern object");
6465+
}
64586466
const p = new pattern_js_1.Pattern(parsed, globParts, 0, platform);
64596467
const m = new minimatch_1.Minimatch(p.globString(), mmopts);
64606468
const children = globParts[globParts.length - 1] === "**";
@@ -6496,7 +6504,7 @@ var require_ignore = __commonJS({
64966504
}
64976505
for (const m of this.absoluteChildren) {
64986506
if (m.match(fullpath))
6499-
true;
6507+
return true;
65006508
}
65016509
return false;
65026510
}
@@ -6505,9 +6513,9 @@ var require_ignore = __commonJS({
65056513
}
65066514
});
65076515

6508-
// node_modules/glob/dist/cjs/src/processor.js
6516+
// node_modules/glob/dist/commonjs/processor.js
65096517
var require_processor = __commonJS({
6510-
"node_modules/glob/dist/cjs/src/processor.js"(exports2) {
6518+
"node_modules/glob/dist/commonjs/processor.js"(exports2) {
65116519
"use strict";
65126520
Object.defineProperty(exports2, "__esModule", { value: true });
65136521
exports2.Processor = exports2.SubWalks = exports2.MatchRecord = exports2.HasWalkedCache = void 0;
@@ -6617,8 +6625,6 @@ var require_processor = __commonJS({
66176625
let changed = false;
66186626
while (typeof (p = pattern.pattern()) === "string" && (rest = pattern.rest())) {
66196627
const c = t.resolve(p);
6620-
if (c.isUnknown() && p !== "..")
6621-
break;
66226628
t = c;
66236629
pattern = rest;
66246630
changed = true;
@@ -6631,12 +6637,8 @@ var require_processor = __commonJS({
66316637
this.hasWalkedCache.storeWalked(t, pattern);
66326638
}
66336639
if (typeof p === "string") {
6634-
if (!rest) {
6635-
const ifDir = p === ".." || p === "" || p === ".";
6636-
this.matches.add(t.resolve(p), absolute, ifDir);
6637-
} else {
6638-
this.subwalks.add(t, pattern);
6639-
}
6640+
const ifDir = p === ".." || p === "" || p === ".";
6641+
this.matches.add(t.resolve(p), absolute, ifDir);
66406642
continue;
66416643
} else if (p === minimatch_1.GLOBSTAR) {
66426644
if (!t.isSymbolicLink() || this.follow || pattern.checkFollowGlobstar()) {
@@ -6744,9 +6746,9 @@ var require_processor = __commonJS({
67446746
}
67456747
});
67466748

6747-
// node_modules/glob/dist/cjs/src/walker.js
6749+
// node_modules/glob/dist/commonjs/walker.js
67486750
var require_walker = __commonJS({
6749-
"node_modules/glob/dist/cjs/src/walker.js"(exports2) {
6751+
"node_modules/glob/dist/commonjs/walker.js"(exports2) {
67506752
"use strict";
67516753
Object.defineProperty(exports2, "__esModule", { value: true });
67526754
exports2.GlobStream = exports2.GlobWalker = exports2.GlobUtil = void 0;
@@ -7061,9 +7063,9 @@ var require_walker = __commonJS({
70617063
}
70627064
});
70637065

7064-
// node_modules/glob/dist/cjs/src/glob.js
7066+
// node_modules/glob/dist/commonjs/glob.js
70657067
var require_glob = __commonJS({
7066-
"node_modules/glob/dist/cjs/src/glob.js"(exports2) {
7068+
"node_modules/glob/dist/commonjs/glob.js"(exports2) {
70677069
"use strict";
70687070
Object.defineProperty(exports2, "__esModule", { value: true });
70697071
exports2.Glob = void 0;
@@ -7201,7 +7203,10 @@ var require_glob = __commonJS({
72017203
return set;
72027204
}, [[], []]);
72037205
this.patterns = matchSet.map((set, i) => {
7204-
return new pattern_js_1.Pattern(set, globParts[i], 0, this.platform);
7206+
const g = globParts[i];
7207+
if (!g)
7208+
throw new Error("invalid pattern object");
7209+
return new pattern_js_1.Pattern(set, g, 0, this.platform);
72057210
});
72067211
}
72077212
async walk() {
@@ -7265,9 +7270,9 @@ var require_glob = __commonJS({
72657270
}
72667271
});
72677272

7268-
// node_modules/glob/dist/cjs/src/has-magic.js
7273+
// node_modules/glob/dist/commonjs/has-magic.js
72697274
var require_has_magic = __commonJS({
7270-
"node_modules/glob/dist/cjs/src/has-magic.js"(exports2) {
7275+
"node_modules/glob/dist/commonjs/has-magic.js"(exports2) {
72717276
"use strict";
72727277
Object.defineProperty(exports2, "__esModule", { value: true });
72737278
exports2.hasMagic = void 0;
@@ -7286,9 +7291,9 @@ var require_has_magic = __commonJS({
72867291
}
72877292
});
72887293

7289-
// node_modules/glob/dist/cjs/src/index.js
7290-
var require_src = __commonJS({
7291-
"node_modules/glob/dist/cjs/src/index.js"(exports2) {
7294+
// node_modules/glob/dist/commonjs/index.js
7295+
var require_commonjs = __commonJS({
7296+
"node_modules/glob/dist/commonjs/index.js"(exports2) {
72927297
"use strict";
72937298
Object.defineProperty(exports2, "__esModule", { value: true });
72947299
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;
@@ -9780,7 +9785,7 @@ var require_checkSolution = __commonJS({
97809785
};
97819786
Object.defineProperty(exports2, "__esModule", { value: true });
97829787
exports2.checkSolution = void 0;
9783-
var glob = require_src();
9788+
var glob = require_commonjs();
97849789
var os = require("os");
97859790
var path = require("path");
97869791
var InputValidator_1 = require_InputValidator();
@@ -24198,7 +24203,7 @@ var require_package = __commonJS({
2419824203
"@types/fancy-log": "^2.0.0",
2419924204
"@types/fs-extra": "^11.0.1",
2420024205
"@types/glob": "^8.1.0",
24201-
"@types/js-yaml": "^4.0.3",
24206+
"@types/js-yaml": "^4.0.7",
2420224207
"@types/mocha": "^10.0.1",
2420324208
"@types/node": "^20.4.8",
2420424209
"@types/sinon": "^10.0.15",
@@ -24211,19 +24216,19 @@ var require_package = __commonJS({
2421124216
async: "^3.2.4",
2421224217
chai: "^4.3.7",
2421324218
dotenv: "^16.3.1",
24214-
esbuild: "^0.18.11",
24215-
eslint: "^8.44.0",
24219+
esbuild: "^0.19.3",
24220+
eslint: "^8.49.0",
2421624221
"fancy-log": "^2.0.0",
24217-
glob: "^10.3.1",
24222+
glob: "^10.3.4",
2421824223
"glob-parent": "^6.0.2",
2421924224
gulp: "^4.0.2",
2422024225
"gulp-eslint-new": "^1.8.3",
2422124226
"gulp-mocha": "^8.0.0",
2422224227
"gulp-sourcemaps": "^3.0.0",
2422324228
"gulp-typescript": "^6.0.0-alpha.1",
2422424229
mocha: "^10.2.0",
24225-
"node-fetch": "^3.3.1",
24226-
postcss: "^8.4.28",
24230+
"node-fetch": "^3.3.2",
24231+
postcss: "^8.4.31",
2422724232
"ps-list": "^8.1.1",
2422824233
rewiremock: "^3.14.5",
2422924234
sinon: "^15.2.0",
@@ -24240,7 +24245,7 @@ var require_package = __commonJS({
2424024245
"@actions/core": "^1.10.0",
2424124246
"@actions/exec": "^1.1.1",
2424224247
"@actions/io": "^1.1.3",
24243-
"@microsoft/powerplatform-cli-wrapper": "^0.1.116",
24248+
"@microsoft/powerplatform-cli-wrapper": "^0.1.118",
2424424249
"date-fns": "^2.30.0",
2424524250
"fs-extra": "^11.1.1",
2424624251
"js-yaml": "^4.1",

0 commit comments

Comments
 (0)