Skip to content

if moduleName contains a slash, use a different module/path #1995

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 2 commits into from
Mar 16, 2018
Merged

if moduleName contains a slash, use a different module/path #1995

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e6b0e1
if moduleName contains a slash, use a different module/path
maartenbreddels Mar 13, 2018
9679b3c
fix: support namespaces, and refactored a bit
maartenbreddels Mar 13, 2018
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
23 changes: 21 additions & 2 deletions packages/html-manager/src/libembed-amd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,32 @@ let requirePromise = function(pkg: string | string[]): Promise<any> {
});
}

function moduleNameToCDNUrl(moduleName: string, moduleVersion: string) {
let packageName = moduleName;
let fileName = 'index'; // default filename
// if a '/' is present, like 'foo/bar', packageName is changed to 'foo', and path to 'bar'
// We first find the first '/'
let index = moduleName.indexOf('/');
if ((index != -1) && (moduleName[0] == '@')) {
// if we have a namespace, it's a different story
// @foo/bar/baz should translate to @foo/bar and baz
// so we find the 2nd '/'
index = moduleName.indexOf('/', index+1);
}
if (index != -1) {
fileName = moduleName.substr(index+1);
packageName = moduleName.substr(0, index);
}
return `https://unpkg.com/${packageName}@${moduleVersion}/dist/${fileName}.js`;
}

function requireLoader(moduleName: string, moduleVersion: string) {
return requirePromise([`${moduleName}`]).catch((err) => {
let failedId = err.requireModules && err.requireModules[0];
if (failedId) {
console.log(`Falling back to unpkg.com for ${moduleName}@${moduleVersion}`);
return requirePromise([`https://unpkg.com/${moduleName}@${moduleVersion}/dist/index.js`]);
}
return requirePromise([moduleNameToCDNUrl(moduleName, moduleVersion)]);
}
});
}

Expand Down