Merge pull request #12949 from twbs/use-our-grunt-plugin

switch to grunt-css-flip for RTL CSS generation
twbs · Mar 6, 2014 · dec1c21 · dec1c21
2 parents af5a219 + c044702
commit dec1c21
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 32 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -201,7 +201,7 @@ module.exports = function (grunt) {
       }
     },
 
-    cssFlip: {
+    css_flip: {
       rtl: {
         files: {
           'dist/css/<%= pkg.name %>-rtl.css': 'dist/css/<%= pkg.name %>.css'
@@ -390,7 +390,6 @@ module.exports = function (grunt) {
 
   // These plugins provide necessary tasks.
   require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
-  grunt.loadTasks('./grunt/tasks/');
 
   // Docs HTML validation task
   grunt.registerTask('validate-html', ['jekyll', 'validation']);
@@ -419,7 +418,7 @@ module.exports = function (grunt) {
 
   // CSS distribution task.
   grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']);
-  grunt.registerTask('dist-css', ['less-compile', 'cssFlip', 'less:minify', 'cssmin', 'csscomb', 'usebanner']);
+  grunt.registerTask('dist-css', ['less-compile', 'css_flip', 'less:minify', 'cssmin', 'csscomb', 'usebanner']);
 
   // Docs distribution task.
   grunt.registerTask('dist-docs', 'copy:docs');

diff --git a/grunt/tasks/css-flip.js b/grunt/tasks/css-flip.js
diff --git a/js/.jscsrc b/js/.jscsrc
@@ -8,7 +8,6 @@
   "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"],
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
   "disallowTrailingWhitespace": true,
-  "requireCamelCaseOrUpperCaseIdentifiers": true,
   "requireLeftStickedOperators": [","],
   "requireLineFeedAtFileEnd": true,
   "requireRightStickedOperators": ["!"],

diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
     "grunt-contrib-qunit": "~0.4.0",
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.5.3",
+    "grunt-css-flip": "^0.1.0",
     "grunt-csscomb": "~2.0.1",
     "grunt-exec": "~0.4.5",
     "grunt-html-validation": "~0.1.13",

diff --git a/test-infra/npm-shrinkwrap.canonical.json b/test-infra/npm-shrinkwrap.canonical.json