# HG changeset patch # User Marcin Lulek # Date 2016-08-29 13:04:09 # Node ID e87a13fefdd273895889be6e1d705a8e635c0b25 # Parent 1dd495ed91626492f4529797f901b39da210923b styles: build shared styles with vulcanize instead of grunt magic diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -43,7 +43,6 @@ syntax: regexp ^rhodecode/public/css/style-polymer.css$ ^rhodecode/public/js/scripts.js$ ^rhodecode/public/js/rhodecode-components.html$ -^rhodecode/public/js/src/components/shared-styles.html$ ^rhodecode\.db$ ^rhodecode\.log$ ^rhodecode_dev\.log$ diff --git a/Gruntfile.js b/Gruntfile.js --- a/Gruntfile.js +++ b/Gruntfile.js @@ -17,16 +17,6 @@ module.exports = function(grunt) { }, }, concat: { - polymercss:{ - src: [ - // Base libraries - '<%= dirs.js.src %>/components/shared-styles-prefix.html', - '<%= dirs.css %>/style-polymer.css', - '<%= dirs.js.src %>/components/shared-styles-suffix.html' - ], - dest: '<%= dirs.js.dest %>/src/components/shared-styles.html', - nonull: true - }, dist: { src: [ // Base libraries @@ -144,7 +134,7 @@ module.exports = function(grunt) { watch: { less: { files: ["<%= dirs.css %>/*.less"], - tasks: ["less:development", 'less:components', 'concat:polymercss', "vulcanize"] + tasks: ["less:development", 'less:components', "vulcanize"] }, js: { files: ["<%= dirs.js.src %>/**/*.js", "<%= dirs.js.src %>/components/*.*"], @@ -183,7 +173,5 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-crisper'); grunt.loadNpmTasks('grunt-contrib-copy'); - // TODO: johbo: missing bower bits - // grunt.registerTask('default', ['less:production', 'less:components', 'concat:polymercss', 'copy','vulcanize', 'concat:dist']); - grunt.registerTask('default', ['less:production', 'concat:dist']); + grunt.registerTask('default', ['less:production', 'less:components', 'copy','vulcanize', 'concat:dist']); }; diff --git a/rhodecode/public/js/src/components/shared-styles.html b/rhodecode/public/js/src/components/shared-styles.html new file mode 100644 --- /dev/null +++ b/rhodecode/public/js/src/components/shared-styles.html @@ -0,0 +1,5 @@ + + +