From b5935bdef103481b427239e4e76a2f6db19da382 Mon Sep 17 00:00:00 2001
From: guybedford <guybedford@gmail.com>
Date: Mon, 4 Nov 2013 22:55:22 +0200
Subject: [PATCH] plugin fix

---
 loader.js      |  2 +-
 test/test.html | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/loader.js b/loader.js
index a5e5e291..43a101e7 100644
--- a/loader.js
+++ b/loader.js
@@ -312,7 +312,7 @@
           return singleGlobal ? { default: singleGlobal } : moduleGlobal;
         }
 
-        var pluginRegEx = /(\.[^\/\.]+)?!(.*)/;
+        var pluginRegEx = /(\.[^\/\.]+|.)!(.*)/;
 
         var nodeProcess = {
           nextTick: function(f) {
diff --git a/test/test.html b/test/test.html
index 89443164..6450ca6e 100644
--- a/test/test.html
+++ b/test/test.html
@@ -4,11 +4,6 @@
 <script src="../loader.js" type="text/javascript"></script>
 
 <script>
-  jspm.config({
-    locations: {
-      plugin: '../../jspm-plugins'
-    }
-  });
 
   jspm.import('./test-runner', function(runner) {
     runner.execute([
@@ -234,7 +229,7 @@
         run: function(complete) {
           jspm.config({
             map: {
-              'plugin:coffee': './tests/compiler-plugin'
+              '!coffee': './tests/compiler-plugin'
             }
           });
           jspm.import(['./tests/compiler-test.coffee!'], complete);
@@ -246,16 +241,6 @@
             return 'Compiler not working.';
         }
       },
-      {
-        name: 'Handlebars plugin',
-        run: function(complete) {
-          jspm.import('./tests/hbs.hbs!', complete);
-        },
-        confirm: function(m) {
-          if (m({ title: 'hello' }) != '<h1>hello</h1>\n')
-            return 'Handlebars template not compiled';
-        }
-      },
       {
         name: 'Text plugin',
         run: function(complete) {
@@ -300,6 +285,16 @@
         confirm: function(m) {
         }
       },
+      {
+        name: 'Handlebars plugin',
+        run: function(complete) {
+          jspm.import('./tests/hbs.hbs!', complete);
+        },
+        confirm: function(m) {
+          if (m({ title: 'hello' }) != '<h1>hello</h1>\n')
+            return 'Handlebars template not compiled';
+        }
+      },
       {
         name: 'onLoad hook',
         run: function(complete) {