Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Align nuget and npm package versions #1265

Merged
merged 5 commits into from
Feb 22, 2024
Merged

Align nuget and npm package versions #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
844e866
Rebuild pack before publish
rajsite May 22, 2023
b17be9a
Change files
rajsite May 22, 2023
bc0c921
Merge branch 'main' into fix-nuget-versions
rajsite Feb 21, 2024
73cc05e
Remove old nupkg before re-pack for publish
rajsite Feb 21, 2024
477a27c
Merge branch 'main' into fix-nuget-versions
rajsite Feb 22, 2024
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
7 changes: 7 additions & 0 deletions change/@ni-nimble-blazor-e430298e-743b-4b5a-9177-7468daa3c88a.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Align nuget and npm package versions",
"packageName": "@ni/nimble-blazor",
"email": "rajsite@users.noreply.github.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@ni-nimble-tokens-05e59782-d4a2-44a9-92d1-169bf9057a5a.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Align nuget and npm package versions",
"packageName": "@ni/nimble-tokens",
"email": "rajsite@users.noreply.github.com",
"dependentChangeType": "patch"
}
130 changes: 130 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions packages/nimble-blazor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"format:js": "eslint . --fix",
"test": "dotnet test -c Release",
"pack": "cross-env-shell dotnet pack NimbleBlazor -c Release -p:PackageVersion=$npm_package_version --output dist",
"invoke-publish": "npm run invoke-publish:nuget && npm run invoke-publish:npm -- ",
"invoke-publish": "npm run invoke-publish:clean-nuget && npm run pack && npm run invoke-publish:nuget && npm run invoke-publish:npm -- ",
"invoke-publish:clean-nuget": "rimraf --glob \"dist/*.nupkg\"",
"invoke-publish:nuget": "cross-env-shell dotnet nuget push \"dist/*.nupkg\" -k $NUGET_SECRET_TOKEN -s \"https://api.nuget.org/v3/index.json\"",
"invoke-publish:npm": "echo \"noop command to swallow npm args\"",
"copy-resources": "node build/copyNimbleResources.js"
Expand All @@ -44,10 +45,11 @@
"@ni/eslint-config-javascript": "^4.2.0",
"@ni/nimble-components": "*",
"@ni/nimble-tokens": "*",
"playwright": "1.40.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"cross-env": "^7.0.3",
"glob": "^8.1.0",
"playwright": "1.40.0",
"rimraf": "^5.0.5",
"rollup": "^3.10.1"
}
}
4 changes: 3 additions & 1 deletion packages/nimble-tokens/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"pack": "npm run pack:npm && npm run pack:nuget",
"pack:npm": "npm pack",
"pack:nuget": "cross-env-shell dotnet pack ./NimbleTokens --configuration Release -p:PackageVersion=$npm_package_version",
"invoke-publish": "npm run invoke-publish:nuget && npm run invoke-publish:npm -- ",
"invoke-publish": "npm run invoke-publish:clean-nuget && npm run pack && npm run invoke-publish:nuget && npm run invoke-publish:npm -- ",
"invoke-publish:clean-nuget": "rimraf --glob \"NimbleTokens/bin/Release/*.nupkg\"",
"invoke-publish:nuget": "cross-env-shell dotnet nuget push \"NimbleTokens/bin/Release/*.nupkg\" -k $NUGET_SECRET_TOKEN -s \"https://api.nuget.org/v3/index.json\"",
rajsite marked this conversation as resolved.
Show resolved Hide resolved
"invoke-publish:npm": "npm publish"
},
Expand All @@ -40,6 +41,7 @@
"cross-env": "^7.0.3",
"glob": "^8.1.0",
"lodash": "^4.17.21",
"rimraf": "^5.0.5",
"sharp": "^0.32.1",
"style-dictionary": "3.7.2",
"svg-to-ts": "^10.1.0",
Expand Down
Loading