Merge branch 'master' of github.com:vazco/universe-modules

vazco · Oct 21, 2015 · ec4d475 · ec4d475
2 parents 00ef267 + 5788fbe
commit ec4d475
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### 0.5.1
 
 - Bring back compatibility for `filename.import` syntax (TypeScript support)
+- Allow loading assets from packages through SystemJS
 
 ### 0.5.0
 

diff --git a/loader.js b/loader.js
@@ -20,6 +20,7 @@ const appRegex = /^\{}\//;
 const packageRegex = /^{([\w-]*?):?([\w-]+)}/;
 const onlyPackageRegex = /^{([\w-]*?):?([\w-]+)}$/;
 const normalizedRegex = /^\/_modules_\//;
+const assetsRegex = /^\/packages\//;
 const selectedPlatformRegex = /@(client|server)$/;
 const endsWithSlashRegex = /\/$/;
 const endsWithImportRegex = /\.import$/;
@@ -40,8 +41,8 @@ const normalizeModuleName = function normalizeModuleName (name, parentName) {
     if (name.charAt(0) === '/') {
         // absolute path
 
-        if (normalizedRegex.test(name)) {
-            // already normalized name, leave it as is
+        if (normalizedRegex.test(name) || assetsRegex.test(name)) {
+            // already normalized name or meteor asset, leave it as is
             return name;
         }