Merge pull request #1995 from maartenbreddels/custom_file_for_module

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

Author: jasongrout

packages/html-manager/src/libembed-amd.ts

@@ -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)]);
+       }
     });
 }