Skip to content

Commit

Permalink
wip rollup - fix jscs
Browse files Browse the repository at this point in the history
  • Loading branch information
rosskevin committed Jan 4, 2016
1 parent ccc251c commit 9a41585
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 15 deletions.
1 change: 0 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
sourceMap: true,
presets: [ "es2015-rollup" ]
}
21 changes: 13 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,15 @@ module.exports = function (grunt) {
advanced: false
},
core: {
files: [{
expand: true,
cwd: 'dist/css',
src: ['*.css', '!*.min.css'],
dest: 'dist/css',
ext: '.min.css'
}]
files: [
{
expand: true,
cwd: 'dist/css',
src: ['*.css', '!*.min.css'],
dest: 'dist/css',
ext: '.min.css'
}
]
},
docs: {
src: 'docs/assets/css/docs.css',
Expand Down Expand Up @@ -377,7 +379,7 @@ module.exports = function (grunt) {
options: {
// https://regex101.com/r/hG8lU4/1
process: function (content, srcpath) {
return content.replace(/([\s\S]+)/mg, "// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs\n\n$1");
return content.replace(/([\s\S]+)/mg, '// DO NOT EDIT IT WILL BE OVERWRITTEN - copy of bootstrap documentation generated by grunt docs-copy-bootstrap-docs\n\n$1');
}
},
expand: true,
Expand Down Expand Up @@ -613,6 +615,9 @@ module.exports = function (grunt) {
grunt.registerTask('dist-js', [
'clean:dist-js',
'eslint',
'jscs:grunt',
'jscs:core',
'jscs:test',
'exec:rollup-iife',
'exec:rollup-umd',
'exec:rollup-es6',
Expand Down
4 changes: 2 additions & 2 deletions grunt/module-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ module.exports = (function () {
}

return {
'commonJs': commonJs,
'systemJs': systemJs
commonJs: commonJs,
systemJs: systemJs
}
}())

6 changes: 3 additions & 3 deletions js/.jscsrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"esnext": true,
"verbose": true,
"disallowEmptyBlocks": true,
"disallowEmptyBlocks": false,
"disallowKeywords": ["with"],
"disallowMixedSpacesAndTabs": true,
"disallowMultipleLineStrings": true,
Expand All @@ -26,7 +26,7 @@
"requirePaddingNewLinesBeforeExport": true,
"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpaceAfterLineComment": true,
"requireSpaceAfterLineComment": false,
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
"requireSpaceBetweenArguments": true,
"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true, "allExcept": ["shorthand"] },
Expand All @@ -35,7 +35,7 @@
"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
"requireSpacesInsideObjectBrackets": "allButNested",
"requireSpacesInsideObjectBrackets": false,
"validateAlignedFunctionParameters": true,
"validateIndentation": 2,
"validateLineBreaks": "LF",
Expand Down
2 changes: 1 addition & 1 deletion js/src/bootstrapMaterialDesign.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ const BootstrapMaterialDesign = (($) => {
// private

_resolveSelector(componentConfig) {
let selector = componentConfig['selector']
let selector = componentConfig.selector
if (Array.isArray(selector)) {
selector = selector.join(', ')
}
Expand Down
1 change: 1 addition & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import babel from 'rollup-plugin-babel';

export default {
entry: 'js/src/index.js',
sourceMap: true,
plugins: [babel()]
//external: external
};

0 comments on commit 9a41585

Please sign in to comment.