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

Versions comparaison: rc is also a suffix (as pre). #650

Merged
merged 1 commit into from
Mar 27, 2023
Merged

Versions comparaison: rc is also a suffix (as pre). #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 javascript/process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import { XPathToElement } from './utils'
export const received = data => {
if (!data.cableReady) return

if (data.version.replace('.pre', '-pre') !== CableReady.version) {
if (data.version.replace('.pre', '-pre').replace(".rc", "-rc") !== CableReady.version) {
if (Debug.enabled)
console.error(
`Reflex failed due to cable_ready gem/NPM package version mismatch. Package versions must match exactly.\nNote that if you are using pre-release builds, gems use the "x.y.z.preN" version format, while NPM packages use "x.y.z-preN".\n\ncable_ready gem: ${data.version}\ncable_ready NPM: ${CableReady.version}`
`Reflex failed due to cable_ready gem/NPM package version mismatch. Package versions must match exactly.\nNote that if you are using pre-release builds, gems use the "x.y.z.rcN" version format, while NPM packages use "x.y.z-rcN".\n\ncable_ready gem: ${data.version}\ncable_ready NPM: ${CableReady.version}`
)
return
}
Expand Down
4 changes: 2 additions & 2 deletions lib/stimulus_reflex/installer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ def gemfile_hash
### memoized values

def sr_npm_version
@sr_npm_version ||= StimulusReflex::VERSION.gsub(".pre", "-pre")
@sr_npm_version ||= StimulusReflex::VERSION.gsub(".pre", "-pre").gsub(".rc", "-rc")
end

def cr_npm_version
@cr_npm_version ||= CableReady::VERSION.gsub(".pre", "-pre")
@cr_npm_version ||= CableReady::VERSION.gsub(".pre", "-pre").gsub(".rc", "-rc")
end

def package_json
Expand Down
2 changes: 1 addition & 1 deletion lib/stimulus_reflex/reflex_data.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def npm_version
end

def version
data["version"].to_s.gsub("-pre", ".pre")
data["version"].to_s.gsub("-pre", ".pre").gsub("-rc", ".rc")
end

private
Expand Down