Skip to content

Commit 50dc127

Browse files
committedApr 27, 2021
Rename packageMap to importRewrites; add test
1 parent 97cb7df commit 50dc127

11 files changed

+89
-14
lines changed
 

‎ext/npm-extension.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ exports.addExtension = function addNpmExtension(System){
1515
System._extensions.push(addNpmExtension);
1616
}
1717

18-
// Returns a replacement identifier if there is one in `.packageMap`
18+
// Returns a replacement identifier if there is one in `.importRewrites`
1919
// Arguments:
2020
// - identifier - the identifier to be replaced
2121
// - parsedParentName - parent name of the module that is doing the importing
2222
// Returns `undefined` if there's no match, a string replacement if one is found
23-
function getPackageMapValue(identifier, parsedParentName) {
24-
if(this.packageMap && typeof this.packageMap === "object" && parsedParentName) {
25-
var childPackageMapping = this.packageMap[parsedParentName.packageName]
26-
if(childPackageMapping) {
27-
var identifierValue = childPackageMapping[identifier];
23+
function getImportRewritesValue(identifier, parsedParentName) {
24+
if(this.importRewrites && typeof this.importRewrites === "object" && parsedParentName) {
25+
var childimportRewrites = this.importRewrites[parsedParentName.packageName]
26+
if(childimportRewrites) {
27+
var identifierValue = childimportRewrites[identifier];
2828
return identifierValue;
2929
}
3030
}
@@ -55,9 +55,9 @@ exports.addExtension = function addNpmExtension(System){
5555
var parsedParentModuleName = parentName && utils.moduleName.parse(parentName);
5656
var parentIsNpmModule = utils.moduleName.isNpm(parentName);
5757

58-
var packageMapValue = getPackageMapValue.call(this, identifier, parsedParentModuleName);
59-
if(packageMapValue !== undefined) {
60-
name = packageMapValue;
58+
var importRewritesValue = getImportRewritesValue.call(this, identifier, parsedParentModuleName);
59+
if(importRewritesValue !== undefined) {
60+
name = importRewritesValue;
6161
}
6262

6363
var nameIsRelative = utils.path.isRelative(name);
@@ -469,8 +469,8 @@ exports.addExtension = function addNpmExtension(System){
469469
}
470470
return newPaths;
471471
},
472-
packageMap: function(packageMap) {
473-
return packageMap;
472+
importRewrites: function(importRewrites) {
473+
return importRewrites;
474474
}
475475
};
476476

‎steal-with-promises.production.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎steal.production.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/npm/import_rewrites/dev.html

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<title>SystemJS tests</title>
5+
</head>
6+
<body>
7+
<script>
8+
window.done = window.parent.done;
9+
window.assert = window.parent.assert;
10+
</script>
11+
12+
<script src="../../../steal-with-promises.js"
13+
config-main="@empty" base-url="./" main="@empty"></script>
14+
<script src="../system_test_config.js"></script>
15+
<script>
16+
17+
System.import("package.json!npm")
18+
.then(function(){
19+
return System.normalize("dep", "import_rewrites@1.0.0#main");
20+
})
21+
.then(function(){
22+
assert.equal((System.importRewrites["dep"] || {})["no.namespace.util"], "./util");
23+
return System.import("dep");
24+
}, err => { throw err; })
25+
.then(done, function(err){
26+
console.error("Oh no, error!", err);
27+
assert.notOk(err, "should not fail");
28+
done();
29+
});
30+
</script>
31+
</body>
32+
</html>

‎test/npm/import_rewrites/node_modules/dep/main.js

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/npm/import_rewrites/node_modules/dep/package.json

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/npm/import_rewrites/node_modules/dep/util.css

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/npm/import_rewrites/node_modules/dep/util.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/npm/import_rewrites/package.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"name": "map_main",
3+
"version": "0.0.0",
4+
"dependencies": {
5+
"dep": "1.2.2"
6+
},
7+
"system": {
8+
"importRewrites": {
9+
"dep": {
10+
"no.namespace.util": "./util"
11+
}
12+
}
13+
}
14+
}

‎test/npm/test.js

+4
Original file line numberDiff line numberDiff line change
@@ -299,4 +299,8 @@ QUnit.test("npm extension helpers to add/get packages", function(assert) {
299299
makeIframe("steal_npm_helpers/dev.html", assert);
300300
});
301301

302+
QUnit.test("importRewrites npm config", function(assert) {
303+
makeIframe("import_rewrites/dev.html", assert);
304+
});
305+
302306
QUnit.start();

‎test/steal-with-promises.production.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.