Merge pull request #171 from hull/feature/new_component_build

Includes grunt-hull-components into hull.js build system
hull · Jun 4, 2014 · 22a13e4 · 22a13e4
2 parents 933a8e0 + 5ae32d3
commit 22a13e4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -12,7 +12,7 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-symlink');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-hull-dox');
-  grunt.loadNpmTasks('grunt-hull-widgets');
+  grunt.loadNpmTasks('grunt-hull-components');
   grunt.loadNpmTasks('grunt-s3');
   grunt.loadNpmTasks('grunt-git-describe');
   grunt.loadNpmTasks('grunt-wrap');
@@ -220,9 +220,9 @@ module.exports = function (grunt) {
       }
     },
     watch: {
-      widgets: {
+      components: {
         files: ['aura_components/**/*'],
-        tasks: ['dist:widgets', 'cssmin']
+        tasks: ['dist:components', 'cssmin']
       },
       remote: {
         files: remoteConfig.coffeeFiles,
@@ -249,13 +249,15 @@ module.exports = function (grunt) {
       template: "define(function () { return '<%= PKG_VERSION %>';});",
       dest: 'lib/utils/version.js'
     },
-    hull_widgets: {
+    hull_components: {
+      options: {
+        optimize: !grunt.option('dev')
+      },
       hull: {
+      sourceName: "hull",
         src: 'aura_components',
-        before: [],
-        dest: 'dist/<%= PKG_VERSION%>',
-        optimize: !grunt.option('dev')
-      }
+        dest: 'dist/<%= PKG_VERSION%>/aura_components'
+      },
     },
     describe: {
       out: 'dist/<%= PKG_VERSION%>/REVISION'
@@ -293,7 +295,7 @@ module.exports = function (grunt) {
       "api": ['version', 'clean:client', 'coffee:api', 'wrap', 'version', 'requirejs:api', 'uglify:api', 'symlink:current'],
       "client-no-underscore": ['version', 'clean:client', 'coffee:client', 'wrap', 'version', 'requirejs:client-no-underscore'],
       "client-no-backbone": ['version', 'clean:client', 'coffee:client', 'wrap', 'version', 'requirejs:client-no-backbone'],
-      "widgets": ["version", "hull_widgets"],
+      "components": ["version", "hull_components:hull"],
       "docs": ['dox'],
       "describe": ['describe']
     }
@@ -311,7 +313,7 @@ module.exports = function (grunt) {
 
   //These tasks are the only ones needed to be used
   grunt.registerTask('default', 'server');
-  grunt.registerTask('server', ['connect', 'dist:remote', 'dist:client', 'test', 'dist:api', 'dist:widgets', 'watch']);
+  grunt.registerTask('server', ['connect', 'dist:remote', 'dist:client', 'test', 'dist:api', 'dist:components', 'watch']);
   grunt.registerTask('deploy', ['dist', 's3:prod']);
 
   require('./.grunt/customTasks')(grunt);

diff --git a/app/index.html b/app/index.html
@@ -12,6 +12,6 @@
   </head>
   <body>
     <div data-hull-component="login/profile@hull"></div>
-    <div data-hull-component="login@default"></div>
+    <div data-hull-component="login/form@hull"></div>
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "grunt-contrib-watch": "0.5.3",
     "grunt-contrib-symlink": "0.2.0",
     "grunt-hull-dox": "git://github.com/hull/grunt-hull-dox.git",
-    "grunt-hull-widgets": "0.7.0",
+    "grunt-hull-components": "0.2.0-beta",
     "bower": "1.3.1",
     "grunt-wrap": "0.2.0",
     "git-rev": "0.2.1",