Skip to content

Add single quote support in importmap.rb #198

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

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Add single quote support in importmap.rb #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b6aef6
Add failing tests
vietqhoang Sep 18, 2023
f599242
Update the regex
vietqhoang Sep 18, 2023
5ca80cf
Fix regex
vietqhoang Sep 18, 2023
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 lib/importmap/npm.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ def packages_with_versions
# We cannot use the name after "pin" because some dependencies are loaded from inside packages
# Eg. pin "buffer", to: "https://ga.jspm.io/npm:@jspm/[email protected]/nodelibs/browser/buffer.js"

importmap.scan(/^pin .*(?<=npm:|npm\/|skypack\.dev\/|unpkg\.com\/)(.*)(?=@\d+\.\d+\.\d+)@(\d+\.\d+\.\d+(?:[^\/\s"]*)).*$/) |
importmap.scan(/^pin "([^"]*)".* #.*@(\d+\.\d+\.\d+(?:[^\s]*)).*$/)
importmap.scan(/^pin .*(?<=npm:|npm\/|skypack\.dev\/|unpkg\.com\/)(.*)(?=@\d+\.\d+\.\d+)@(\d+\.\d+\.\d+(?:[^\/\s["']]*)).*$/) |
importmap.scan(/^pin ["']([^["']]*)["'].* #.*@(\d+\.\d+\.\d+(?:[^\s]*)).*$/)
end

private
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/files/single_quote_outdated_import_map.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pin 'md5', to: 'https://cdn.skypack.dev/[email protected]', preload: true
1 change: 1 addition & 0 deletions test/fixtures/files/single_quote_outdated_import_map_without_cdn.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pin 'md5', preload: true #@2.2.0
28 changes: 28 additions & 0 deletions test/npm_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,34 @@ class Importmap::NpmTest < ActiveSupport::TestCase
end
end

test "successful outdated packages using single-quotes with mock" do
npm = Importmap::Npm.new(file_fixture("single_quote_outdated_import_map.rb"))
response = { "dist-tags" => { "latest" => '2.3.0' } }.to_json

npm.stub(:get_json, response) do
outdated_packages = npm.outdated_packages

assert_equal(1, outdated_packages.size)
assert_equal('md5', outdated_packages[0].name)
assert_equal('2.2.0', outdated_packages[0].current_version)
assert_equal('2.3.0', outdated_packages[0].latest_version)
end
end

test "successful outdated packages using single-quotes and without CDN with mock" do
npm = Importmap::Npm.new(file_fixture("single_quote_outdated_import_map_without_cdn.rb"))
response = { "dist-tags" => { "latest" => '2.3.0' } }.to_json

npm.stub(:get_json, response) do
outdated_packages = npm.outdated_packages

assert_equal(1, outdated_packages.size)
assert_equal('md5', outdated_packages[0].name)
assert_equal('2.2.0', outdated_packages[0].current_version)
assert_equal('2.3.0', outdated_packages[0].latest_version)
end
end

test "missing outdated packages with mock" do
response = { "error" => "Not found" }.to_json

Expand Down