change handlebars and css transport style

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

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"
   ]
-}
+}

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;
 }
 

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);

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