From 36ac29fde3de1686b64ea62d914414fb840fc65f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 06:57:10 +0800 Subject: [PATCH 1/6] Bump pug from 3.0.2 to 3.0.3 in /frontend (#2226) Bumps [pug](https://github.com/pugjs/pug) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/pugjs/pug/releases) - [Commits](https://github.com/pugjs/pug/compare/pug@3.0.2...pug@3.0.3) --- updated-dependencies: - dependency-name: pug dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 52 +++++++++++++++++++++++--------------- frontend/package.json | 2 +- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 5e77947b09..9322c21617 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -51,7 +51,7 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-vue": "^9.0.0", "postcss-html": "^1.6.0", - "pug": "^3.0.2", + "pug": "^3.0.3", "pug-plain-loader": "^1.1.0", "sass": "^1.71.0", "sass-loader": "^14.0.0", @@ -4404,8 +4404,9 @@ }, "node_modules/assert-never": { "version": "1.2.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz", + "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==", + "dev": true }, "node_modules/astral-regex": { "version": "2.0.0", @@ -4588,8 +4589,9 @@ }, "node_modules/babel-walk": { "version": "3.0.0-canary-5", + "resolved": "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz", + "integrity": "sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.9.6" }, @@ -5977,8 +5979,9 @@ }, "node_modules/doctypes": { "version": "1.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", + "integrity": "sha512-LLBi6pEqS6Do3EKQ3J0NqHWV5hhb78Pi8vvESYwyOy2c31ZEZVdtitdzsQsKb7878PEERhzUk0ftqGhG6Mz+pQ==", + "dev": true }, "node_modules/dom-converter": { "version": "0.2.0", @@ -10962,11 +10965,12 @@ "license": "ISC" }, "node_modules/pug": { - "version": "3.0.2", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pug/-/pug-3.0.3.tgz", + "integrity": "sha512-uBi6kmc9f3SZ3PXxqcHiUZLmIXgfgWooKWXcwSGwQd2Zi5Rb0bT14+8CJjJgI8AB+nndLaNgHGrcc6bPIB665g==", "dev": true, - "license": "MIT", "dependencies": { - "pug-code-gen": "^3.0.2", + "pug-code-gen": "^3.0.3", "pug-filters": "^4.0.0", "pug-lexer": "^5.0.1", "pug-linker": "^4.0.0", @@ -10978,8 +10982,9 @@ }, "node_modules/pug-attrs": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz", + "integrity": "sha512-azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA==", "dev": true, - "license": "MIT", "dependencies": { "constantinople": "^4.0.1", "js-stringify": "^1.0.2", @@ -10987,24 +10992,26 @@ } }, "node_modules/pug-code-gen": { - "version": "3.0.2", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.3.tgz", + "integrity": "sha512-cYQg0JW0w32Ux+XTeZnBEeuWrAY7/HNE6TWnhiHGnnRYlCgyAUPoyh9KzCMa9WhcJlJ1AtQqpEYHc+vbCzA+Aw==", "dev": true, - "license": "MIT", "dependencies": { "constantinople": "^4.0.1", "doctypes": "^1.1.0", "js-stringify": "^1.0.2", "pug-attrs": "^3.0.0", - "pug-error": "^2.0.0", - "pug-runtime": "^3.0.0", + "pug-error": "^2.1.0", + "pug-runtime": "^3.0.1", "void-elements": "^3.1.0", "with": "^7.0.0" } }, "node_modules/pug-error": { - "version": "2.0.0", - "dev": true, - "license": "MIT" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.1.0.tgz", + "integrity": "sha512-lv7sU9e5Jk8IeUheHata6/UThZ7RK2jnaaNztxfPYUY+VxZyk/ePVaNZ/vwmH8WqGvDz3LrNYt/+gA55NDg6Pg==", + "dev": true }, "node_modules/pug-filters": { "version": "4.0.0", @@ -11341,8 +11348,9 @@ }, "node_modules/pug-runtime": { "version": "3.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz", + "integrity": "sha512-L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg==", + "dev": true }, "node_modules/pug-strip-comments": { "version": "2.0.0", @@ -13980,8 +13988,9 @@ }, "node_modules/void-elements": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", + "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -14770,8 +14779,9 @@ }, "node_modules/with": { "version": "7.0.2", + "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz", + "integrity": "sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==", "dev": true, - "license": "MIT", "dependencies": { "@babel/parser": "^7.9.6", "@babel/types": "^7.9.6", diff --git a/frontend/package.json b/frontend/package.json index 2e23678c4b..51bc95e00e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -56,7 +56,7 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-vue": "^9.0.0", "postcss-html": "^1.6.0", - "pug": "^3.0.2", + "pug": "^3.0.3", "pug-plain-loader": "^1.1.0", "sass": "^1.71.0", "sass-loader": "^14.0.0", From 9a4b5e7087e2f6cb42ac8d7ef3720e4e5b0652e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 09:36:54 +0800 Subject: [PATCH 2/6] Bump braces from 3.0.2 to 3.0.3 in /frontend (#2228) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 9322c21617..d2cdd66bfe 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -4764,11 +4764,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, - "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -7210,9 +7211,10 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, - "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -7554,6 +7556,20 @@ "version": "1.0.0", "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.2", "license": "MIT", @@ -8402,8 +8418,9 @@ }, "node_modules/is-number": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -13465,8 +13482,9 @@ }, "node_modules/to-regex-range": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, From 2bd45d281edf1b15f54f688c4f0d192b42a23b91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 09:52:33 +0800 Subject: [PATCH 3/6] Bump postcss from 7.0.39 to 8.4.39 in /frontend (#2237) Bumps [postcss](https://github.com/postcss/postcss) from 7.0.39 to 8.4.39. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/7.0.39...8.4.39) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- frontend/package-lock.json | 14 ++++++++------ frontend/package.json | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d2cdd66bfe..32f66cf1d3 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -24,7 +24,7 @@ "minimatch": "^9.0.0", "muicss": "^0.10.3", "normalize.css": "^8.0.1", - "postcss": "^8.4.38", + "postcss": "^8.4.39", "pug-lint-vue": "^0.4.0", "seedrandom": "^3.0.5", "vue": "~3.4.0", @@ -10150,8 +10150,9 @@ } }, "node_modules/picocolors": { - "version": "1.0.0", - "license": "ISC" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" }, "node_modules/picomatch": { "version": "2.3.1", @@ -10264,7 +10265,9 @@ } }, "node_modules/postcss": { - "version": "8.4.38", + "version": "8.4.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", + "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", "funding": [ { "type": "opencollective", @@ -10279,10 +10282,9 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", + "picocolors": "^1.0.1", "source-map-js": "^1.2.0" }, "engines": { diff --git a/frontend/package.json b/frontend/package.json index 51bc95e00e..c605edcb00 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -29,7 +29,7 @@ "minimatch": "^9.0.0", "muicss": "^0.10.3", "normalize.css": "^8.0.1", - "postcss": "^8.4.38", + "postcss": "^8.4.39", "pug-lint-vue": "^0.4.0", "seedrandom": "^3.0.5", "vue": "~3.4.0", From bf162ca05db3e6c230ddefe7bbe15e2ca70535f5 Mon Sep 17 00:00:00 2001 From: jedkohjk <110604064+jedkohjk@users.noreply.github.com> Date: Sat, 3 Aug 2024 22:35:34 +0800 Subject: [PATCH 4/6] [#2240] Format datetime (#2242) Format datetime as "day date month year time timezone" Before, it was "day month date time year timezone". "day date month year time timezone" puts the year with the rest of the date, and puts the time with the timezone, which is more intuitive. Using "date month year" instead of putting the month before the date keeps the date format consistent with the since and until dates, and is also the norm in most of Singapore. --- src/main/java/reposense/RepoSense.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/reposense/RepoSense.java b/src/main/java/reposense/RepoSense.java index 36daa4d751..330d823538 100644 --- a/src/main/java/reposense/RepoSense.java +++ b/src/main/java/reposense/RepoSense.java @@ -32,7 +32,7 @@ public class RepoSense { private static final Logger logger = LogsManager.getLogger(RepoSense.class); private static final int SERVER_PORT_NUMBER = 9000; - private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("E MMM d HH:mm:ss yyyy z"); + private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("E, d MMM yyyy HH:mm:ss z"); private static final String VERSION_UNSPECIFIED = "unspecified"; /** From 3b54a9c18a6053709b274ae685e6fd465028901b Mon Sep 17 00:00:00 2001 From: jedkohjk <110604064+jedkohjk@users.noreply.github.com> Date: Tue, 6 Aug 2024 03:01:36 +0800 Subject: [PATCH 5/6] [#2209] Skip blank lines in blurb file url (#2239) Ignore blank lines after delimiter in the blurbs file Let's use a loop to skip blank lines when searching for the relevant URL. --- .../reposense/parser/BlurbMarkdownParser.java | 16 ++++++++++++++-- .../resources/ConfigSystemTest/blurbs.md | 1 + .../BlurbMarkdownParserTest/multiple_blurbs.md | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/reposense/parser/BlurbMarkdownParser.java b/src/main/java/reposense/parser/BlurbMarkdownParser.java index 8c3e5a0f67..a67c0a77cf 100644 --- a/src/main/java/reposense/parser/BlurbMarkdownParser.java +++ b/src/main/java/reposense/parser/BlurbMarkdownParser.java @@ -93,6 +93,10 @@ public BlurbMap parse() throws IOException, InvalidMarkdownException { // extract the url record first // this is guaranteed to be in the first line or else we fail UrlRecord urlRecord = this.getUrlRecord(mdLines, counter); + // if delimiter is the last non-blank line, null is returned + if (urlRecord == null) { + break; + } url = urlRecord.getUrl(); counter = urlRecord.getNextPosition(); @@ -120,9 +124,17 @@ private UrlRecord getUrlRecord(List lines, int position) throws InvalidM // checks if url is valid // adapted from https://www.baeldung.com/java-validate-url try { - String url = lines.get(position).strip(); + String url = ""; + // skips blank lines + while (url.length() == 0) { + // checks if delimiter is the last non-blank line + if (position >= lines.size()) { + return null; + } + url = lines.get(position++).strip(); + } new URL(url).toURI(); - return new UrlRecord(lines.get(position), position + 1); + return new UrlRecord(url, position); } catch (MalformedURLException | URISyntaxException ex) { throw new InvalidMarkdownException("URL provided is not valid!"); } diff --git a/src/systemtest/resources/ConfigSystemTest/blurbs.md b/src/systemtest/resources/ConfigSystemTest/blurbs.md index e8a130cc46..65c08242a9 100644 --- a/src/systemtest/resources/ConfigSystemTest/blurbs.md +++ b/src/systemtest/resources/ConfigSystemTest/blurbs.md @@ -8,6 +8,7 @@ https://www.github.com/user/repo/branch2 this is what i have done for my cs2103t project + https://www.github.com/user/repo/branch3 *third blurb* diff --git a/src/test/resources/BlurbMarkdownParserTest/multiple_blurbs.md b/src/test/resources/BlurbMarkdownParserTest/multiple_blurbs.md index b49af3b1e7..2585e02296 100644 --- a/src/test/resources/BlurbMarkdownParserTest/multiple_blurbs.md +++ b/src/test/resources/BlurbMarkdownParserTest/multiple_blurbs.md @@ -7,6 +7,8 @@ Master branch of testrepo-Beta https://github.com/reposense/testrepo-Gamma/tree/master Master branch of testrepo-Gamma + https://github.com/reposense/testrepo-Sigma/tree/master Master branch of testrepo-Sigma + From 03dd38d625bd360741fe316930da3185899cf79b Mon Sep 17 00:00:00 2001 From: jedkohjk <110604064+jedkohjk@users.noreply.github.com> Date: Tue, 13 Aug 2024 20:23:44 +0800 Subject: [PATCH 6/6] [#2208] Update User Guide to describe --latest tag in publish-RepoSense (#2244) The user guide section for `run.sh` requires updating after the PR to publish-RepoSense: https://github.com/reposense/publish-RepoSense/pull/12 Let's update the User Guide to describe `--latest` tag in the `run.sh` section. --- docs/ug/runSh.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/ug/runSh.md b/docs/ug/runSh.md index bdbde85492..618f45f931 100644 --- a/docs/ug/runSh.md +++ b/docs/ug/runSh.md @@ -28,4 +28,5 @@ Depending on which version you wish to use for report generation, add one of the * `--release`: Use the latest release (Stable) * `--master`: Use the latest version of the master branch * `--tag TAG` (e.g. `--tag v1.6.1`): Use the version identified by the Git tag given +* `--latest TAG_PREFIX`: Use the latest version with the given tag prefix (e.g. `--latest v1.6` can use `v1.6.1`) * `--commit COMMIT` (e.g. `--commit abc123`): Use the version identified by the Git commit SHA given