Merge pull request #4 from privatenumber/develop

Author: privatenumber

README.md

@@ -1,6 +1,6 @@
 # systemjs-unpkg [![Latest version](https://badgen.net/npm/v/systemjs-unpkg)](https://npm.im/systemjs-unpkg) [![Monthly downloads](https://badgen.net/npm/dm/systemjs-unpkg)](https://npm.im/systemjs-unpkg) [![Install size](https://packagephobia.now.sh/badge?p=systemjs-unpkg)](https://packagephobia.now.sh/result?p=systemjs-unpkg) [![Bundle size](https://badgen.net/bundlephobia/minzip/systemjs-unpkg)](https://bundlephobia.com/result?p=systemjs-unpkg)
 
-Auto-resolve bare specifiers in [SystemJS](https://github.com/systemjs/systemjs) using [UNPKG](https://unpkg.com)
+Auto-resolve bare specifiers in [SystemJS](https://github.com/systemjs/systemjs) using [UNPKG](https://unpkg.com).
 
 **Before**
 
@@ -16,7 +16,7 @@ Auto-resolve bare specifiers in [SystemJS](https://github.com/systemjs/systemjs)
 ```
 
 ```js
-// Won't work unless the import map above is defined
+// Won't work unless the import map above is declared
 const _ = await System.import('lodash');
 ```
 
@@ -27,10 +27,24 @@ const _ = await System.import('lodash');
 const _ = await System.import('lodash');
 ```
 
+**You can also specify npm semver ranges and tags**
+
+```js
+const $ = await System.import('jquery@2.2.4');
+
+const $ = await System.import('jquery@^2.2.4');
+
+const d3 = await System.import('d3@next');
+```
+
+Here's a [starter CodePen template](https://codepen.io/privatenumber/pen/pobGZmR?editors=0010) to get you started!
+
+<sub>If you like this project, please star it & [follow me](https://github.com/privatenumber) to see what other cool projects I'm working on! ❤️</sub>
+
 ## 🙋‍♂️ Why?
-- **⚡️ Simplify SystemJS setup** Zero config setup to seamlessly resolve arbitrary bare specifiers!
+- **⚡️ Simplify SystemJS setup** Zero config setup to seamlessly resolve arbitrary bare specifiers with versions!
 - **🔥 Import map fallback** Only resolves specifiers that aren't defined in your [import map](https://github.com/systemjs/systemjs/blob/master/docs/import-maps.md)!
-- **🐥 Tiny** Only `255B`!
+- **🐥 Tiny** Only `338B`!
 
 ## 🚀 Install
 ```sh

src/systemjs-unpkg.js

@@ -7,7 +7,7 @@
 		try {
 			return resolve.apply(this, arguments);
 		} catch (error) {
-			id = '//unpkg.com/' + id;
+			id = 'https://unpkg.com/' + id;
 			try {
 				return resolve.call(this, id, parentUrl);
 			} catch (_) {

test/index.spec.js

@@ -1,32 +1,105 @@
-const {System, applyImportMap} = require('systemjs');
-require('systemjs/dist/extras/amd'); // eslint-disable-line import/no-unassigned-import
-require('../src/systemjs-unpkg'); // eslint-disable-line import/no-unassigned-import
-
-const nonExistentPkg = 'pkg-not-on-npm-' + Math.random();
-applyImportMap(System, {
-	imports: {
-		[nonExistentPkg]: 'https://unpkg.com/lodash',
-		underscore: 'https://unpkg.com/lodash',
-	},
+beforeEach(() => {
+	jest.resetModules();
 });
 
 test('should resolve module on UNPKG', async () => {
-	const _ = await System.import('lodash');
-	expect(_).toBeTruthy();
-});
+	const {System} = require('systemjs');
+	const spy = jest.spyOn(System.constructor.prototype, 'resolve');
+	require('../src/systemjs-unpkg'); // eslint-disable-line import/no-unassigned-import
+
+	await System.import('lodash');
+	expect(spy).toHaveBeenNthCalledWith(2, 'https://unpkg.com/lodash', undefined);
+
+	spy.mockRestore();
+}, 10000);
+
+test('should resolve versioned module on UNPKG', async () => {
+	const {System} = require('systemjs');
+	require('systemjs/dist/extras/amd'); // eslint-disable-line import/no-unassigned-import
+	const spy = jest.spyOn(System.constructor.prototype, 'resolve');
+	require('../src/systemjs-unpkg'); // eslint-disable-line import/no-unassigned-import
+
+	const _ = await System.import('lodash@4.17.0');
+	expect(spy).toHaveBeenNthCalledWith(2, 'https://unpkg.com/lodash@4.17.0', undefined);
+	expect(_.VERSION).toBe('4.17.0');
+	spy.mockRestore();
+}, 10000);
 
 test('should fail when resolving non-existing module', async () => {
+	const {System} = require('systemjs');
+	const spy = jest.spyOn(System.constructor.prototype, 'resolve');
+	require('../src/systemjs-unpkg'); // eslint-disable-line import/no-unassigned-import
+
+	const nonExistentPkg = 'non-existent-package-for-testing-purposes-' + Math.random();
 	await expect(() =>
-		System.import('non-existent-package-for-testing-purposes-' + Math.random()),
+		System.import(nonExistentPkg),
 	).rejects.toThrow('404 Not Found');
-});
+
+	expect(spy).toHaveBeenNthCalledWith(2, 'https://unpkg.com/' + nonExistentPkg, undefined);
+
+	spy.mockRestore();
+}, 10000);
+
+test('should not try to resolve relative paths', async () => {
+	const {System} = require('systemjs');
+	const spy = jest.spyOn(System.constructor.prototype, 'resolve');
+	require('../src/systemjs-unpkg'); // eslint-disable-line import/no-unassigned-import
+
+	await expect(() =>
+		System.import('./index.js'),
+	).rejects.toThrow('ECONNREFUSED');
+
+	expect(spy).toHaveBeenCalledTimes(1);
+
+	spy.mockRestore();
+}, 10000);
+
+test('should not try to resolve absolute paths', async () => {
+	const {System} = require('systemjs');
+	const spy = jest.spyOn(System.constructor.prototype, 'resolve');
+	require('../src/systemjs-unpkg'); // eslint-disable-line import/no-unassigned-import
+
+	await expect(() =>
+		System.import('/index.js'),
+	).rejects.toThrow('ECONNREFUSED');
+
+	expect(spy).toHaveBeenCalledTimes(1);
+
+	spy.mockRestore();
+}, 10000);
 
 test('should use importmap to resolve non-existing package', async () => {
-	const _ = await System.import(nonExistentPkg);
-	expect(_).toBeTruthy();
-});
+	const {System, applyImportMap} = require('systemjs');
+	const spy = jest.spyOn(System.constructor.prototype, 'resolve');
+	require('../src/systemjs-unpkg'); // eslint-disable-line import/no-unassigned-import
+
+	const nonExistentPkg = 'pkg-not-on-npm-' + Math.random();
+
+	applyImportMap(System, {
+		imports: {
+			[nonExistentPkg]: 'https://unpkg.com/lodash',
+		},
+	});
+
+	await System.import(nonExistentPkg);
+	expect(spy).toHaveBeenCalledTimes(1);
+
+	spy.mockRestore();
+}, 10000);
 
 test('should use importmap to resolve underscore to lodash', async () => {
-	const _ = await System.import('underscore');
-	expect(_.default.name).toBe('lodash');
-});
+	const {System, applyImportMap} = require('systemjs');
+	const spy = jest.spyOn(System.constructor.prototype, 'resolve');
+	require('../src/systemjs-unpkg'); // eslint-disable-line import/no-unassigned-import
+
+	applyImportMap(System, {
+		imports: {
+			underscore: 'https://unpkg.com/lodash',
+		},
+	});
+
+	await System.import('underscore');
+	expect(spy).toHaveBeenCalledTimes(1);
+
+	spy.mockRestore();
+}, 10000);