Skip to content

Commit 329cc5f

Browse files
committed
Merge branch 'pr-1901' into claude/review-pr-1901-docs-011CUq9pFay2PBNMK5XBr8Ed
2 parents 847edcd + e050df6 commit 329cc5f

File tree

2 files changed

+13
-27
lines changed

2 files changed

+13
-27
lines changed

rakelib/release.rake

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ This will update and release:
2929
PUBLIC (npmjs.org + rubygems.org):
3030
- react-on-rails NPM package
3131
- react-on-rails-pro NPM package
32-
- react_on_rails RubyGem
33-
PRIVATE (GitHub Packages):
3432
- @shakacode-tools/react-on-rails-pro-node-renderer NPM package
33+
- react_on_rails RubyGem
3534
- react_on_rails_pro RubyGem
3635
3736
1st argument: Version (patch/minor/major OR explicit version like 16.2.0)
@@ -208,24 +207,15 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
208207
sh_in_dir(gem_root,
209208
"yarn workspace react-on-rails-pro publish --new-version #{actual_npm_version} #{npm_publish_args}")
210209

211-
# Publish node-renderer NPM package (to Verdaccio or GitHub Packages depending on mode)
210+
# Publish node-renderer NPM package (PUBLIC on npmjs.org)
212211
puts "\n#{'=' * 80}"
213-
if use_verdaccio
214-
puts "Publishing node-renderer to Verdaccio (local)..."
215-
else
216-
puts "Publishing PRIVATE node-renderer to GitHub Packages..."
217-
end
212+
puts "Publishing PUBLIC node-renderer to #{use_verdaccio ? 'Verdaccio (local)' : 'npmjs.org'}..."
218213
puts "=" * 80
219214

220215
# Publish react-on-rails-pro-node-renderer NPM package
221-
node_renderer_registry = if use_verdaccio
222-
"Verdaccio (http://localhost:4873/)"
223-
else
224-
"GitHub Packages"
225-
end
226216
node_renderer_name = "@shakacode-tools/react-on-rails-pro-node-renderer"
227-
puts "\nPublishing #{node_renderer_name}@#{actual_npm_version} to #{node_renderer_registry}..."
228-
puts "Ensure you're authenticated with GitHub Packages (see ~/.npmrc)" unless use_verdaccio
217+
puts "\nPublishing #{node_renderer_name}@#{actual_npm_version}..."
218+
puts "Carefully add your OTP for NPM when prompted." unless use_verdaccio
229219
sh_in_dir(pro_gem_root,
230220
"yarn publish --new-version #{actual_npm_version} --no-git-tag-version #{npm_publish_args}")
231221

@@ -241,14 +231,13 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
241231
sh_in_dir(gem_root, "gem release")
242232

243233
puts "\n#{'=' * 80}"
244-
puts "Publishing PRIVATE Ruby gem to GitHub Packages..."
234+
puts "Publishing PUBLIC Pro Ruby gem to RubyGems.org..."
245235
puts "=" * 80
246236

247-
# Publish react_on_rails_pro Ruby gem to GitHub Packages
248-
puts "\nPublishing react_on_rails_pro gem to GitHub Packages..."
249-
puts "Ensure you have GitHub token in ~/.gem/credentials"
250-
sh_in_dir(pro_gem_root,
251-
"gem release --key github --host https://rubygems.pkg.github.com/shakacode-tools")
237+
# Publish react_on_rails_pro Ruby gem to RubyGems.org
238+
puts "\nPublishing react_on_rails_pro gem to RubyGems.org..."
239+
puts "Carefully add your OTP for Rubygems when prompted."
240+
sh_in_dir(pro_gem_root, "gem release")
252241
end
253242
end
254243

@@ -290,9 +279,9 @@ task :release, %i[version dry_run registry skip_push] do |_t, args|
290279
MSG
291280

292281
unless use_verdaccio
293-
msg += "\n Ruby Gems:\n"
294-
msg += " - react_on_rails #{actual_gem_version} (RubyGems.org)\n"
295-
msg += " - react_on_rails_pro #{actual_gem_version} (GitHub Packages)\n"
282+
msg += "\n Ruby Gems (RubyGems.org):\n"
283+
msg += " - react_on_rails #{actual_gem_version}\n"
284+
msg += " - react_on_rails_pro #{actual_gem_version}\n"
296285
end
297286

298287
if skip_push

react_on_rails_pro/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
"bin": {
1818
"react-on-rails-pro-node-renderer": "packages/node-renderer/dist/default-node-renderer.js"
1919
},
20-
"publishConfig": {
21-
"registry": "https://npm.pkg.github.com"
22-
},
2320
"directories": {
2421
"doc": "docs"
2522
},

0 commit comments

Comments
 (0)