Skip to content

Commit

Permalink
5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
guybedford committed Jul 31, 2019
1 parent cbde650 commit a8d4dc5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
**SystemJS 5.0.0 (2019/07/30) - Major Change**
* Import map scopes now resolve relative to the base, not the scope (https://github.com/systemjs/systemjs/pull/1975)

SystemJS 4.1.1 (2019/07/30)
* Fix bug in named exports extra with AMD exports (https://github.com/systemjs/systemjs/pull/1978)
* Ensure that global frames are not detected in global extra (https://github.com/systemjs/systemjs/pull/1973, @kduret)
Expand Down
2 changes: 1 addition & 1 deletion dist/s.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SJS 4.1.1
* SJS 5.0.0
* Minimal SystemJS Build
*/
(function () {
Expand Down
7 changes: 3 additions & 4 deletions dist/system.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SystemJS 4.1.1
* SystemJS 5.0.0
*/
(function () {
const hasSelf = typeof self !== 'undefined';
Expand Down Expand Up @@ -137,7 +137,7 @@
let resolvedScopeName = resolveUrl(scopeName, baseUrl);
if (resolvedScopeName[resolvedScopeName.length - 1] !== '/')
resolvedScopeName += '/';
scopes[resolvedScopeName] = resolvePackages(scope, resolvedScopeName) || {};
scopes[resolvedScopeName] = resolvePackages(scope, baseUrl) || {};
}
}

Expand All @@ -159,8 +159,7 @@
const pkgName = getMatch(id, packages);
if (pkgName) {
const pkg = packages[pkgName];
if (pkg === null)

if (pkg === null) return;
if (id.length > pkgName.length && pkg[pkg.length - 1] !== '/')
console.warn("Invalid package target " + pkg + " for '" + pkgName + "' should have a trailing '/'.");
return pkg + id.slice(pkgName.length);
Expand Down
4 changes: 2 additions & 2 deletions dist/system.min.js

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

Loading

0 comments on commit a8d4dc5

Please sign in to comment.