spmjs · vvenv · Aug 11, 2014 · Aug 12, 2014 · Sep 1, 2014 · Sep 1, 2014
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -10,6 +10,8 @@
 module.exports = function(grunt) {
 
   var style = require('./').style.init(grunt);
+  var cssParser = style.cssParser;
+  // now as default
   var css2jsParser = style.css2jsParser;
   var jsParser = require('./').script.init(grunt).jsParser;
 
@@ -125,6 +127,9 @@ module.exports = function(grunt) {
         options: {
           alias: {
             'button': 'alice/button/1.0.0/button.css'
+          },
+          parsers: {
+            '.css': [cssParser]
           }
         },
         files: [{
@@ -147,6 +152,11 @@ module.exports = function(grunt) {
 
       // parsing handlebars into js
       handlebars: {
+        options: {
+          alias: {
+            'handlebars': 'gallery/handlebars/1.3.0/handlebars-runtime'
+          }
+        },
         files: [{
           expand: true,
           cwd: 'test/cases/handlebars',
@@ -167,6 +177,9 @@ module.exports = function(grunt) {
 
       css2js: {
         options: {
+          alias: {
+            'importstyle': 'pandora/importstyle/1.0.0/importstyle'
+          },
           parsers: {
             '.css': [css2jsParser]
           }
@@ -181,11 +194,14 @@ module.exports = function(grunt) {
 
       style: {
         options: {
+          alias: {
+            'importstyle': 'pandora/importstyle/1.0.0/importstyle'
+          },
           parsers: {
             '.css': [css2jsParser],
             '.js': [jsParser]
           },
-          styleBox: ["a.css"],
+          styleBox: ['a.css'],
           idleading: 'arale/widget/1.0.0/'
         },
         files: [{

diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ Prepend idleading to generate the id of the module.
 Type: `Object`
 Default value: `{}`
 
-Alias of modules.
+Alias of modules, such as handlebars and importStyle id.
 
 #### options.debug
 
@@ -69,6 +69,8 @@ Create a debugfile or not.
 
 #### options.handlebars
 
+**deprecated**, use `options.alias` instead.
+
 Type: `Object`
 
 Options for handlebars compiler.
@@ -131,6 +133,14 @@ In lieu of a formal styleguide, take care to maintain the existing coding style.
 
 ## Release History
 
+**Sep 1st, 2014** `0.4.2`
+
+- get `handlebars` and `importStyle` id in `options.alias`
+
+- set default css parser to `css2jsParser`
+
+- add `importStyle` template
+
 **Dec 4th, 2013** `0.4.0`
 
 fix Windows path #58

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grunt-cmd-transport",
   "description": "Transport javascript into cmd.",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "homepage": "https://github.com/spmjs/grunt-cmd-transport",
   "author": {
     "name": "Hsiaoming Yang",
@@ -29,7 +29,7 @@
   "dependencies": {
     "clean-css": "~1.0.1",
     "cmd-util": "~0.3.5",
-    "handlebars": "1.0.11",
+    "handlebars": "1.3.0",
     "uglify-js": "~2.2.5",
     "css": "~1.4.0"
   },
@@ -43,4 +43,4 @@
   "keywords": [
     "gruntplugin"
   ]
-}
+}
diff --git a/tasks/lib/style.js b/tasks/lib/style.js
@@ -19,7 +19,10 @@ exports.init = function(grunt) {
     var data = fileObj.srcData || grunt.file.read(fileObj.src);
     var id = unixy(options.idleading + fileObj.name.replace(/\.js$/, ''));
 
-    data = css2js(data, id, options, fileObj);
+    // importstyle alias
+    var alias = options.alias.importstyle || options.importstyle.id;
+
+    data = css2js(data, id, alias, options, fileObj);
     data = ast.getAst(data).print_to_string(options.uglify);
     var dest = fileObj.dest + '.js';
     grunt.file.write(dest, data);
@@ -124,7 +127,7 @@ function parseRules(rules, prefix) {
   });
 }
 
-function css2js(code, id, options, fileObj) {
+function css2js(code, id, alias, options, fileObj) {
   // ex. arale/widget/1.0.0/ => arale-widget-1_0_0
   var styleId = unixy((options || {}).idleading || '')
     .replace(/\/$/, '')
@@ -158,20 +161,12 @@ function css2js(code, id, options, fileObj) {
     removeEmpty: true
   });
 
-  // transform css to js
-  // spmjs/spm#581
-  var tpl = [
-    'define("%s", [], function() {',
-    "seajs.importStyle('%s')",
-    '});'
-  ].join('\n');
-
   // spmjs/spm#651
   code = code.split(/\r\n|\r|\n/).map(function(line) {
     return line.replace(/\\/g, '\\\\');
   }).join('\n');
 
-  code = format(tpl, id, code.replace(/\'/g, '\\\''));
+  code = format(options.css.template, id, alias, alias, code.replace(/\'/g, '\\\''), id);
   return code;
 }
 

diff --git a/tasks/lib/template.js b/tasks/lib/template.js
@@ -47,24 +47,14 @@ exports.init = function(grunt) {
     var id = unixy(options.idleading + fileObj.name.replace(/\.js$/, ''));
 
     // handlebars alias
-    var alias = options.handlebars.id;
-
-    var template = [
-      'define("%s", ["%s"], function(require, exports, module) {',
-      'var Handlebars = require("%s");',
-      'var template = Handlebars.template;',
-      'module.exports = template(',
-      '%s',
-      ');',
-      '})'
-    ].join('\n');
+    var alias = options.alias.handlebars || options.handlebars.id;
 
     var data = fileObj.srcData || grunt.file.read(fileObj.src);
 
     patchHandlebars(handlebars);
     var code = handlebars.precompile(data, options.handlebars);
 
-    var ret = format(template, id, alias, alias, code);
+    var ret = format(options.handlebars.template, id, alias, alias, code);
     var astCache = ast.getAst(ret);
 
     data = astCache.print_to_string(options.uglify);

diff --git a/tasks/transport.js b/tasks/transport.js
@@ -22,7 +22,10 @@ module.exports = function(grunt) {
       paths: ['sea-modules'],
 
       idleading: '',
-      alias: {},
+      alias: {
+        // importstyle: 'pandora/importstyle/1.0.0/importstyle',
+        // handlebars: 'gallery/handlebars/1.3.0/handlebars-runtime'
+      },
 
       // create a debug file or not
       debug: true,
@@ -33,18 +36,37 @@ module.exports = function(grunt) {
       // define parsers
       parsers: {
         '.js': [script.jsParser],
-        '.css': [style.cssParser],
+        '.css': [style.css2jsParser],
         '.html': [text.html2jsParser],
         '.json': [json.jsonParser],
         '.tpl': [template.tplParser],
         '.handlebars': [template.handlebarsParser]
       },
 
+      // for styles
+      css: {
+        template: [
+          'define(\'%s\', [\'%s\'], function(require, exports, module) {',
+            'var importStyle = require(\'%s\');',
+            'module.exports = function() {',
+              'importStyle(\'%s\', \'%s\');',
+            '};',
+          '});'
+        ].join('\n')
+      },
+
       // for handlebars
       handlebars: {
-        id: 'gallery/handlebars/1.0.2/runtime',
         knownHelpers: [],
-        knownHelpersOnly: false
+        knownHelpersOnly: false,
+        template: [
+          'define(\'%s\', [\'%s\'], function(require, exports, module) {',
+            'var Handlebars = require(\'%s\');',
+            'module.exports = Handlebars.template(',
+              '%s',
+            ');',
+          '})'
+        ].join('\n')
       },
 
       // output beautifier

diff --git a/test/cases/css2js/a-debug.css.js.expect b/test/cases/css2js/a-debug.css.js.expect
@@ -1,3 +1,6 @@
-define("a-debug.css", [], function() {
-    seajs.importStyle("body{color:#fff}");
+define("a-debug.css", [ "pandora/importstyle/1.0.0/importstyle-debug" ], function(require, exports, module) {
+    var importStyle = require("pandora/importstyle/1.0.0/importstyle-debug");
+    module.exports = function() {
+        importStyle("body{color:#fff}", "a.css");
+    };
 });
diff --git a/test/cases/css2js/a.css.js.expect b/test/cases/css2js/a.css.js.expect
@@ -1,3 +1,6 @@
-define("a.css", [], function() {
-    seajs.importStyle("body{color:#fff}");
+define("a.css", [ "pandora/importstyle/1.0.0/importstyle" ], function(require, exports, module) {
+    var importStyle = require("pandora/importstyle/1.0.0/importstyle");
+    module.exports = function() {
+        importStyle("body{color:#fff}", "a.css");
+    };
 });
diff --git a/test/cases/handlebars/month-debug.handlebars.js.expect b/test/cases/handlebars/month-debug.handlebars.js.expect
@@ -1,8 +1,7 @@
-define("month-debug.handlebars", [ "gallery/handlebars/1.0.2/runtime-debug" ], function(require, exports, module) {
-    var Handlebars = require("gallery/handlebars/1.0.2/runtime-debug");
-    var template = Handlebars.template;
-    module.exports = template(function(Handlebars, depth0, helpers, partials, data) {
-        this.compilerInfo = [ 3, ">= 1.0.0-rc.4" ];
+define("month-debug.handlebars", [ "gallery/handlebars/1.3.0/handlebars-runtime-debug" ], function(require, exports, module) {
+    var Handlebars = require("gallery/handlebars/1.3.0/handlebars-runtime-debug");
+    module.exports = Handlebars.template(function(Handlebars, depth0, helpers, partials, data) {
+        this.compilerInfo = [ 4, ">= 1.0.0" ];
         helpers = helpers || {};
         for (var key in Handlebars.helpers) {
             helpers[key] = helpers[key] || Handlebars.helpers[key];
@@ -25,9 +24,9 @@ define("month-debug.handlebars", [ "gallery/handlebars/1.0.2/runtime-debug" ], f
             return buffer;
         }
         function program2(depth0, data) {
-            var buffer = "", stack1, options;
+            var buffer = "", stack1, helper, options;
             buffer += '\n    <li class="';
-            stack1 = helpers.unless.call(depth0, depth0.available, {
+            stack1 = helpers.unless.call(depth0, depth0 && depth0.available, {
                 hash: {},
                 inverse: self.noop,
                 fn: self.program(3, program3, data),
@@ -37,28 +36,30 @@ define("month-debug.handlebars", [ "gallery/handlebars/1.0.2/runtime-debug" ], f
                 buffer += stack1;
             }
             buffer += '" data-role="month" data-value="';
-            if (stack1 = helpers.value) {
-                stack1 = stack1.call(depth0, {
+            if (helper = helpers.value) {
+                stack1 = helper.call(depth0, {
                     hash: {},
                     data: data
                 });
             } else {
-                stack1 = depth0.value;
-                stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1;
+                helper = depth0 && depth0.value;
+                stack1 = typeof helper === functionType ? helper.call(depth0, {
+                    hash: {},
+                    data: data
+                }) : helper;
             }
-            buffer += escapeExpression(stack1) + '">';
+            buffer += escapeExpression(stack1) + '">' + escapeExpression((helper = helpers._ || depth0 && depth0._, 
             options = {
                 hash: {},
                 data: data
-            };
-            buffer += escapeExpression((stack1 = helpers["_"], stack1 ? stack1.call(depth0, depth0.label, options) : helperMissing.call(depth0, "_", depth0.label, options))) + "</li>\n    ";
+            }, helper ? helper.call(depth0, depth0 && depth0.label, options) : helperMissing.call(depth0, "_", depth0 && depth0.label, options))) + "</li>\n    ";
             return buffer;
         }
         function program3(depth0, data) {
             return "disabled-element";
         }
         buffer += '<div class="ui-calendar-month">\n';
-        stack1 = helpers.each.call(depth0, depth0.items, {
+        stack1 = helpers.each.call(depth0, depth0 && depth0.items, {
             hash: {},
             inverse: self.noop,
             fn: self.program(1, program1, data),

diff --git a/test/cases/handlebars/month.handlebars.js.expect b/test/cases/handlebars/month.handlebars.js.expect
@@ -1,8 +1,7 @@
-define("month.handlebars", [ "gallery/handlebars/1.0.2/runtime" ], function(require, exports, module) {
-    var Handlebars = require("gallery/handlebars/1.0.2/runtime");
-    var template = Handlebars.template;
-    module.exports = template(function(Handlebars, depth0, helpers, partials, data) {
-        this.compilerInfo = [ 3, ">= 1.0.0-rc.4" ];
+define("month.handlebars", [ "gallery/handlebars/1.3.0/handlebars-runtime" ], function(require, exports, module) {
+    var Handlebars = require("gallery/handlebars/1.3.0/handlebars-runtime");
+    module.exports = Handlebars.template(function(Handlebars, depth0, helpers, partials, data) {
+        this.compilerInfo = [ 4, ">= 1.0.0" ];
         helpers = helpers || {};
         for (var key in Handlebars.helpers) {
             helpers[key] = helpers[key] || Handlebars.helpers[key];
@@ -25,9 +24,9 @@ define("month.handlebars", [ "gallery/handlebars/1.0.2/runtime" ], function(requ
             return buffer;
         }
         function program2(depth0, data) {
-            var buffer = "", stack1, options;
+            var buffer = "", stack1, helper, options;
             buffer += '\n    <li class="';
-            stack1 = helpers.unless.call(depth0, depth0.available, {
+            stack1 = helpers.unless.call(depth0, depth0 && depth0.available, {
                 hash: {},
                 inverse: self.noop,
                 fn: self.program(3, program3, data),
@@ -37,28 +36,30 @@ define("month.handlebars", [ "gallery/handlebars/1.0.2/runtime" ], function(requ
                 buffer += stack1;
             }
             buffer += '" data-role="month" data-value="';
-            if (stack1 = helpers.value) {
-                stack1 = stack1.call(depth0, {
+            if (helper = helpers.value) {
+                stack1 = helper.call(depth0, {
                     hash: {},
                     data: data
                 });
             } else {
-                stack1 = depth0.value;
-                stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1;
+                helper = depth0 && depth0.value;
+                stack1 = typeof helper === functionType ? helper.call(depth0, {
+                    hash: {},
+                    data: data
+                }) : helper;
             }
-            buffer += escapeExpression(stack1) + '">';
+            buffer += escapeExpression(stack1) + '">' + escapeExpression((helper = helpers._ || depth0 && depth0._, 
             options = {
                 hash: {},
                 data: data
-            };
-            buffer += escapeExpression((stack1 = helpers["_"], stack1 ? stack1.call(depth0, depth0.label, options) : helperMissing.call(depth0, "_", depth0.label, options))) + "</li>\n    ";
+            }, helper ? helper.call(depth0, depth0 && depth0.label, options) : helperMissing.call(depth0, "_", depth0 && depth0.label, options))) + "</li>\n    ";
             return buffer;
         }
         function program3(depth0, data) {
             return "disabled-element";
         }
         buffer += '<div class="ui-calendar-month">\n';
-        stack1 = helpers.each.call(depth0, depth0.items, {
+        stack1 = helpers.each.call(depth0, depth0 && depth0.items, {
             hash: {},
             inverse: self.noop,
             fn: self.program(1, program1, data),