Use SystemJS baseURL instead of relying on proxy configuration

computmaxer · Sep 29, 2014 · c14be8a · c14be8a
1 parent 9f196b1
commit c14be8a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -30,14 +30,6 @@ jspm: {
 }
 ```
 
-The proxy configuration tells Karma to rewrite the requests for `/jspm_packages/...` to `/base/jspm_packages/...` so that karma knows how to serve the files that jspm/systemjs will try to load.
-
-```js
-proxies: {
-    '/jspm_packages/': '/base/jspm_packages/'
-}
-```
-
 That's it!
 
 

diff --git a/src/adapter.js b/src/adapter.js
@@ -31,9 +31,14 @@
                         "or by running 'jspm dl-loader'.");
     }
 
+    // Configure SystemJS baseURL
+    System.config({
+        baseURL: 'base'
+    });
+
+    // Load everything specified in loadFiles
     karma.config.jspm.expandedFiles.map(function(modulePath){
-        // Prepend base to each path. Karma serves files from /base/
-        promises.push(System.import('base/' + extractModuleName(modulePath)));
+        promises.push(System.import(extractModuleName(modulePath)));
     });
 
     // Promise comes from the es6_module_loader