Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/files/lint-project-structure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ for PROJECT in projects/*/*; do
echo "::error file=$PROJECT/package.json${LINE:-$LINE2}::Set \`.repository.type\` to \"git\", as the monorepo is a git repository."
fi
URL="$(jq -r '.url' <<<"$JSON")"
if [[ "$URL" != "https://github.com/Automattic/jetpack.git" && "$URL" != "https://github.com/Automattic/jetpack" ]]; then
if [[ "$URL" != "git+https://github.com/Automattic/jetpack.git" && "$URL" != "https://github.com/Automattic/jetpack" ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possibly the second one should also be changed?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or maybe remove it entirely, if we really want to match what npm pkg fix does.

Copy link
Contributor

@tbradsha tbradsha Jan 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was assuming .git suffix would mean git-consumable, whereas without it would be a normal user-friendly URL. But now that you quoted that line and showed that git clone doesn't work I'm even more confused.

I was trying to track down if/when this changed, but couldn't. I found the example in the documentation changed here:
npm/cli#7615

I did find there's a noGitPlus option on hosted-git-info, which seems to be what provides the normalized URL info:
https://github.com/npm/hosted-git-info/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to be something internal where git+https or git+ssh but, in either case, it knows it is a github link, so it doesn't look like it actually matters?

I could see where an enterprise version of GH or other self-hosted git might have more of a need for it.

I'm fine dropping this as not needed since npm is figuring it out just fine it seems like. It doesn't really seem to be adding value unless I'm missing something.

EXIT=1
LINE=$(jq --stream -r 'if length == 1 then .[0][:-1] else .[0] end | if . == ["repository","url"] then ",line=\( input_line_number )" else empty end' "$PROJECT/package.json")
echo "::error file=$PROJECT/package.json${LINE:-$LINE2}::Set \`.repository.url\` to point to the monorepo, i.e. \"https://github.com/Automattic/jetpack\"."
Expand Down Expand Up @@ -324,7 +324,7 @@ for PROJECT in projects/*/*; do
if jq -e '.extra["npmjs-autopublish"]' "$PROJECT/composer.json" >/dev/null; then
if ! jq -e '.repository' "$PROJECT/package.json" >/dev/null; then
EXIT=1
JSON="$(jq --tab --arg dir "$PROJECT" -n '{ type: "git", url: "https://github.com/Automattic/jetpack.git", directory: $dir }')"
JSON="$(jq --tab --arg dir "$PROJECT" -n '{ type: "git", url: "git+https://github.com/Automattic/jetpack.git", directory: $dir }')"
echo "---" # Bracket message containing newlines for better visibility in GH's logs.
echo "::error file=$PROJECT/package.json::Package $SLUG is published to npmjs but does not specify \`.repository\`.%0A\`\`\`%0A\"repository\": ${JSON//$'\n'/%0A},%0A\`\`\`"
echo "---"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git"
"url": "git+https://github.com/Automattic/jetpack.git"
},
"license": "GPL-2.0-or-later",
"author": "Automattic",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/ai-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/ai-client"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/analytics"
},
"author": "Automattic",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/api"
},
"author": "Automattic",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/babel-plugin-replace-textdomain"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/boost-score-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/boost-score-api"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/charts"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/components/#readme",
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/components"
},
"bugs": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/config"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/connection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/connection"
},
"author": "Automattic",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/critical-css-gen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/critical-css-gen"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/eslint-changed/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/eslint-changed"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/eslint-config-target-es/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/eslint-config-target-es"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/i18n-check-webpack-plugin"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/i18n-loader-webpack-plugin"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/image-guide/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/image-guide"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/jetpack-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/jetpack-cli"
},
"bugs": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo to match npm convention.


2 changes: 1 addition & 1 deletion projects/js-packages/partner-coupon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/partner-coupon"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo to match npm convention.


2 changes: 1 addition & 1 deletion projects/js-packages/publicize-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/publicize-components"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo to match npm convention.


2 changes: 1 addition & 1 deletion projects/js-packages/react-data-sync-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/react-data-sync-client"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/remove-asset-webpack-plugin"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/scan/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/scan"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/script-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/script-data"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/shared-extension-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/shared-extension-utils"
},
"license": "GPL-2.0-or-later",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo URL format to align with what NPM wants (npm pkg fix)


2 changes: 1 addition & 1 deletion projects/js-packages/social-logos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/Automattic/jetpack.git",
"url": "git+https://github.com/Automattic/jetpack.git",
"directory": "projects/js-packages/social-logos"
},
"license": "GPL-2.0+",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fixed
Comment: Updated package.json repo to match npm convention.


Loading
Loading