Skip to content

Commit f6b9e23

Browse files
lelialelia
committed
Fix merge conflict, rebuild dist files
Signed-off-by: lelia <[email protected]>
1 parent 5675aee commit f6b9e23

File tree

3 files changed

+113
-69
lines changed

3 files changed

+113
-69
lines changed

‎dist/index.js

+107-67
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
/******/ (() => { // webpackBootstrap
22
/******/ var __webpack_modules__ = ({
33

4-
<<<<<<< HEAD
5-
/***/ 613:
6-
=======
74
/***/ 7351:
85
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
96

@@ -47167,12 +47164,15 @@ function wrappy (fn, cb) {
4716747164
/***/ }),
4716847165

4716947166
/***/ 4351:
47167+
<<<<<<< HEAD
4717047168
>>>>>>> 37cbd35 (:seedling: Add step to validate the dist folder content (#84))
47169+
=======
47170+
>>>>>>> e282306 (Rebuild dist files)
4717147171
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
4717247172

47173-
const core = __nccwpck_require__(481)
47174-
const { getProjectScore, generateIssueContent, generateReportContent, getScore, saveScore } = __nccwpck_require__(629)
47175-
const { chunkArray } = __nccwpck_require__(462)
47173+
const core = __nccwpck_require__(2186)
47174+
const { getProjectScore, generateIssueContent, generateReportContent, getScore, saveScore } = __nccwpck_require__(1608)
47175+
const { chunkArray } = __nccwpck_require__(4478)
4717647176

4717747177
const generateScope = async ({ octokit, orgs, scope, maxRequestInParallel }) => {
4717847178
const platform = 'github.com'
@@ -47347,20 +47347,20 @@ module.exports = {
4734747347

4734847348
/***/ }),
4734947349

47350-
/***/ 629:
47350+
/***/ 1608:
4735147351
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
4735247352

47353-
const got = __nccwpck_require__(931)
47354-
const core = __nccwpck_require__(481)
47355-
const ejs = __nccwpck_require__(451)
47356-
const { readFile } = (__nccwpck_require__(147).promises)
47357-
const { join } = __nccwpck_require__(17)
47358-
const { softAssign } = __nccwpck_require__(595)
47359-
const databaseSchema = __nccwpck_require__(324)
47360-
const scopeSchema = __nccwpck_require__(746)
47361-
47362-
const Ajv = __nccwpck_require__(467)
47363-
const addFormats = (__nccwpck_require__(867)["default"])
47353+
const got = __nccwpck_require__(3061)
47354+
const core = __nccwpck_require__(2186)
47355+
const ejs = __nccwpck_require__(8431)
47356+
const { readFile } = (__nccwpck_require__(7147).promises)
47357+
const { join } = __nccwpck_require__(1017)
47358+
const { softAssign } = __nccwpck_require__(7348)
47359+
const databaseSchema = __nccwpck_require__(5324)
47360+
const scopeSchema = __nccwpck_require__(1746)
47361+
47362+
const Ajv = __nccwpck_require__(2426)
47363+
const addFormats = (__nccwpck_require__(567)["default"])
4736447364
const ajv = new Ajv()
4736547365
addFormats(ajv)
4736647366

@@ -47435,121 +47435,158 @@ module.exports = {
4743547435

4743647436
/***/ }),
4743747437

47438-
/***/ 481:
47438+
/***/ 9491:
4743947439
/***/ ((module) => {
4744047440

47441-
module.exports = eval("require")("@actions/core");
47442-
47441+
"use strict";
47442+
module.exports = require("assert");
4744347443

4744447444
/***/ }),
4744547445

47446-
/***/ 474:
47446+
/***/ 852:
4744747447
/***/ ((module) => {
4744847448

47449-
module.exports = eval("require")("@actions/exec");
47450-
47449+
"use strict";
47450+
module.exports = require("async_hooks");
4745147451

4745247452
/***/ }),
4745347453

47454-
/***/ 29:
47454+
/***/ 4300:
4745547455
/***/ ((module) => {
4745647456

47457-
module.exports = eval("require")("@actions/github");
47458-
47457+
"use strict";
47458+
module.exports = require("buffer");
4745947459

4746047460
/***/ }),
4746147461

47462-
/***/ 462:
47462+
/***/ 2081:
4746347463
/***/ ((module) => {
4746447464

47465-
module.exports = eval("require")("@ulisesgascon/array-to-chunks");
47466-
47465+
"use strict";
47466+
module.exports = require("child_process");
4746747467

4746847468
/***/ }),
4746947469

47470-
/***/ 577:
47470+
/***/ 6206:
4747147471
/***/ ((module) => {
4747247472

47473-
module.exports = eval("require")("@ulisesgascon/is-different");
47474-
47473+
"use strict";
47474+
module.exports = require("console");
4747547475

4747647476
/***/ }),
4747747477

47478-
/***/ 435:
47478+
/***/ 6113:
4747947479
/***/ ((module) => {
4748047480

47481-
module.exports = eval("require")("@ulisesgascon/normalize-boolean");
47482-
47481+
"use strict";
47482+
module.exports = require("crypto");
4748347483

4748447484
/***/ }),
4748547485

47486-
/***/ 595:
47486+
/***/ 7643:
4748747487
/***/ ((module) => {
4748847488

47489-
module.exports = eval("require")("@ulisesgascon/soft-assign-deep-property");
47490-
47489+
"use strict";
47490+
module.exports = require("diagnostics_channel");
4749147491

4749247492
/***/ }),
4749347493

47494-
/***/ 92:
47494+
/***/ 9523:
4749547495
/***/ ((module) => {
4749647496

47497-
module.exports = eval("require")("@ulisesgascon/text-tags-manager");
47497+
"use strict";
47498+
module.exports = require("dns");
4749847499

47500+
/***/ }),
47501+
47502+
/***/ 2361:
47503+
/***/ ((module) => {
47504+
47505+
"use strict";
47506+
module.exports = require("events");
4749947507

4750047508
/***/ }),
4750147509

47502-
/***/ 467:
47510+
/***/ 7147:
4750347511
/***/ ((module) => {
4750447512

47505-
module.exports = eval("require")("ajv");
47513+
"use strict";
47514+
module.exports = require("fs");
47515+
47516+
/***/ }),
47517+
47518+
/***/ 3685:
47519+
/***/ ((module) => {
4750647520

47521+
"use strict";
47522+
module.exports = require("http");
4750747523

4750847524
/***/ }),
4750947525

47510-
/***/ 867:
47526+
/***/ 5158:
4751147527
/***/ ((module) => {
4751247528

47513-
module.exports = eval("require")("ajv-formats");
47529+
"use strict";
47530+
module.exports = require("http2");
47531+
47532+
/***/ }),
47533+
47534+
/***/ 5687:
47535+
/***/ ((module) => {
4751447536

47537+
"use strict";
47538+
module.exports = require("https");
4751547539

4751647540
/***/ }),
4751747541

47518-
/***/ 451:
47542+
/***/ 1808:
4751947543
/***/ ((module) => {
4752047544

47521-
module.exports = eval("require")("ejs");
47545+
"use strict";
47546+
module.exports = require("net");
4752247547

47548+
/***/ }),
47549+
47550+
/***/ 5673:
47551+
/***/ ((module) => {
47552+
47553+
"use strict";
47554+
module.exports = require("node:events");
4752347555

4752447556
/***/ }),
4752547557

47526-
/***/ 931:
47558+
/***/ 4492:
4752747559
/***/ ((module) => {
4752847560

47529-
module.exports = eval("require")("got");
47561+
"use strict";
47562+
module.exports = require("node:stream");
4753047563

47564+
/***/ }),
47565+
47566+
/***/ 7261:
47567+
/***/ ((module) => {
47568+
47569+
"use strict";
47570+
module.exports = require("node:util");
4753147571

4753247572
/***/ }),
4753347573

47534-
/***/ 147:
47574+
/***/ 2037:
4753547575
/***/ ((module) => {
4753647576

4753747577
"use strict";
47538-
module.exports = require("fs");
47578+
module.exports = require("os");
4753947579

4754047580
/***/ }),
4754147581

47542-
/***/ 17:
47582+
/***/ 1017:
4754347583
/***/ ((module) => {
4754447584

4754547585
"use strict";
4754647586
module.exports = require("path");
4754747587

4754847588
/***/ }),
4754947589

47550-
<<<<<<< HEAD
47551-
/***/ 324:
47552-
=======
4755347590
/***/ 4074:
4755447591
/***/ ((module) => {
4755547592

@@ -49290,15 +49327,18 @@ module.exports = {"i8":"3.1.10"};
4929049327
/***/ }),
4929149328

4929249329
/***/ 5324:
49330+
<<<<<<< HEAD
4929349331
>>>>>>> 37cbd35 (:seedling: Add step to validate the dist folder content (#84))
49332+
=======
49333+
>>>>>>> e282306 (Rebuild dist files)
4929449334
/***/ ((module) => {
4929549335

4929649336
"use strict";
4929749337
module.exports = JSON.parse('{"type":"object","properties":{"github.com":{"type":"object","patternProperties":{"^[a-zA-Z0-9-_.]+/[a-zA-Z0-9-_.]+$":{"type":"object","patternProperties":{"^[a-zA-Z0-9-_.]+/[a-zA-Z0-9-_.]+$":{"type":"object","properties":{"previous":{"type":"array","items":{"type":"object","properties":{"score":{"type":"number","minimum":0,"maximum":10},"date":{"type":"string","format":"date-time"},"commit":{"type":"string","pattern":"^[a-f0-9]{40}$"}},"additionalProperties":false,"required":["score","date","commit"]},"minItems":0,"default":[]},"current":{"type":"object","properties":{"score":{"type":"number","minimum":0,"maximum":10},"date":{"type":"string","format":"date-time"},"commit":{"type":"string","pattern":"^[a-f0-9]{40}$"}},"additionalProperties":false,"required":["score","date","commit"]}},"additionalProperties":false,"required":["previous","current"]}}}}}},"additionalProperties":false,"required":["github.com"]}');
4929849338

4929949339
/***/ }),
4930049340

49301-
/***/ 746:
49341+
/***/ 1746:
4930249342
/***/ ((module) => {
4930349343

4930449344
"use strict";
@@ -49328,7 +49368,7 @@ module.exports = JSON.parse('{"type":"object","properties":{"github.com":{"type"
4932849368
/******/ // Execute the module function
4932949369
/******/ var threw = true;
4933049370
/******/ try {
49331-
/******/ __webpack_modules__[moduleId](module, module.exports, __nccwpck_require__);
49371+
/******/ __webpack_modules__[moduleId].call(module.exports, module, module.exports, __nccwpck_require__);
4933249372
/******/ threw = false;
4933349373
/******/ } finally {
4933449374
/******/ if(threw) delete __webpack_module_cache__[moduleId];
@@ -49347,16 +49387,16 @@ module.exports = JSON.parse('{"type":"object","properties":{"github.com":{"type"
4934749387
var __webpack_exports__ = {};
4934849388
// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
4934949389
(() => {
49350-
const core = __nccwpck_require__(481)
49351-
const github = __nccwpck_require__(29)
49352-
const exec = __nccwpck_require__(474)
49353-
const { normalizeBoolean } = __nccwpck_require__(435)
49354-
const { existsSync } = __nccwpck_require__(147)
49355-
const { readFile, writeFile, stat } = (__nccwpck_require__(147).promises)
49356-
const { isDifferent } = __nccwpck_require__(577)
49357-
const { updateOrCreateSegment } = __nccwpck_require__(92)
49358-
const { generateScores, generateScope } = __nccwpck_require__(613)
49359-
const { validateDatabaseIntegrity, validateScopeIntegrity } = __nccwpck_require__(629)
49390+
const core = __nccwpck_require__(2186)
49391+
const github = __nccwpck_require__(5438)
49392+
const exec = __nccwpck_require__(1514)
49393+
const { normalizeBoolean } = __nccwpck_require__(9214)
49394+
const { existsSync } = __nccwpck_require__(7147)
49395+
const { readFile, writeFile, stat } = (__nccwpck_require__(7147).promises)
49396+
const { isDifferent } = __nccwpck_require__(9497)
49397+
const { updateOrCreateSegment } = __nccwpck_require__(7794)
49398+
const { generateScores, generateScope } = __nccwpck_require__(4351)
49399+
const { validateDatabaseIntegrity, validateScopeIntegrity } = __nccwpck_require__(1608)
4936049400

4936149401
async function run () {
4936249402
let octokit

‎dist/issue.ejs

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ There are changes in the following repositories:
1616
| [<%= score.org %>/<%= score.repo %>](https://<%= score.platform %>/<%= score.org %>/<%= score.repo %>) | [<%= score.commit.slice(0, 7) %>](https://<%= score.platform %>/<%= score.org %>/<%= score.repo %>/commit/<%= score.commit %>) | <% if (!renderBadge) { -%><%= score.score %> <%_ } -%> <%_ if (renderBadge) { -%> [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/<%= score.org %>/<%= score.repo %>/badge)](https://api.securityscorecards.dev/projects/github.com/<%= score.org %>/<%= score.repo %>) <%_ } -%> | <%= score.currentDiff || 0 %><%_ if (score.prevCommit) { -%> / [Details](<%= getReportUrl(score.org, score.repo, score.commit, score.prevCommit) %>)<%_ } -%> | [View](<%= getReportUrl(score.org, score.repo, score.commit) %>) | [Fix it](https://app.stepsecurity.io/securerepo?repo=<%= score.org %>/<%= score.repo %>) |
1717
<%_ }); -%>
1818
19-
<<<<<<< HEAD
2019
_Report generated by [OpenSSF Scorecard Monitor](https://github.com/ossf/scorecard-monitor)._
20+
<<<<<<< HEAD
2121
=======
2222
_Report generated by [ossf/scorecard-monitor.com/ossf/scorecard-mossf/scorecard-monitor
2323
>>>>>>> 37cbd35 (:seedling: Add step to validate the dist folder content (#84))
24+
=======
25+
>>>>>>> e282306 (Rebuild dist files)

‎dist/report.ejs

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
| [<%= score.org %>/<%= score.repo %>](https://<%= score.platform %>/<%= score.org %>/<%= score.repo %>) | [<%= score.commit.slice(0, 7) %>](https://<%= score.platform %>/<%= score.org %>/<%= score.repo %>/commit/<%= score.commit %>) | <% if (!renderBadge) { -%><%= score.score %> <%_ } -%><% if (renderBadge) { -%> [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/<%= score.org %>/<%= score.repo %>/badge)](https://api.securityscorecards.dev/projects/github.com/<%= score.org %>/<%= score.repo %>) <%_ } -%> | <%= score.date %> | <%= score.currentDiff || 0 %> <%_ if (score.prevCommit) { -%> / [Details](<%= getReportUrl(score.org, score.repo, score.commit, score.prevCommit) %>)<%_ } -%> | [View](<%= getReportUrl(score.org, score.repo, score.commit) %>) | [Fix it](https://app.stepsecurity.io/securerepo?repo=<%= score.org %>/<%= score.repo %>) |
1313
<%_ }); -%>
1414
15-
<<<<<<< HEAD
1615
_Report generated by [OpenSSF Scorecard Monitor](https://github.com/ossf/scorecard-monitor)._
16+
<<<<<<< HEAD
1717
=======
1818
_Report generated by [ossf/scorecard-monitor](https://github.com/ossf/scorecard-monitor)._
1919
>>>>>>> 37cbd35 (:seedling: Add step to validate the dist folder content (#84))
20+
=======
21+
>>>>>>> e282306 (Rebuild dist files)

0 commit comments

Comments
 (0)