Skip to content

Commit

Permalink
ESLint added
Browse files Browse the repository at this point in the history
  • Loading branch information
kvet committed Nov 17, 2016
1 parent a443516 commit 175da43
Show file tree
Hide file tree
Showing 15 changed files with 954 additions and 929 deletions.
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 4
18 changes: 18 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"env": {
"browser": true,
"commonjs": true
},
"extends": "eslint:recommended",
"rules": {
"indent": ["error", 4],
"linebreak-style": ["error", "unix"],
"quotes": ["error", "single"],
"semi": ["error", "always"],
"space-before-function-paren": ["error", "never"],
"space-before-blocks": ["error", "always"],
"space-in-parens": ["error", "never"],
"no-multi-spaces": ["error"],
"space-infix-ops": ["error"]
}
}
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules
npm-debug.log
dist/
shippable/
locale-data/
node_modules
npm-debug.log
dist/
shippable/
locale-data/
2 changes: 1 addition & 1 deletion examples/modular.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<link rel="stylesheet" type="text/css" href="../node_modules/devextreme/dist/css/dx.common.css"/>
<link rel="stylesheet" type="text/css" href="../node_modules/devextreme/dist/css/dx.light.css"/>

<script src="../node_modules/systemjs/dist/system.src.js"></script>
<script>
System.config({
Expand Down
76 changes: 38 additions & 38 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
module.exports = function (config) {
config.set({
browsers: ['PhantomJS', 'Chrome'],
frameworks: ["qunit"],
files: [
"node_modules/intl/dist/Intl.min.js",
"node_modules/intl/locale-data/complete.js",

"node_modules/jquery/dist/jquery.min.js",
"node_modules/devextreme/dist/js/dx.all.debug.js",
"node_modules/devextreme/dist/js/localization/dx.all.de.js",
"node_modules/devextreme/dist/js/localization/dx.all.ja.js",
"node_modules/devextreme/dist/js/localization/dx.all.ru.js",
"dist/" + (config.useProdBundle ? "devextreme-intl.js" : "devextreme-intl.dev.js"),

"tests/number-tests.js",
"tests/date-tests.js",
"tests/message-tests.js"
],
plugins: [
"karma-qunit",
"karma-junit-reporter",
"karma-phantomjs-launcher",
"karma-chrome-launcher"
],
reporters: [
"dots",
"junit"
],
junitReporter: {
outputDir: 'shippable/testresults/',
outputFile: 'test-results.xml'
}
});
};
module.exports = function(config) {
config.set({
browsers: ['PhantomJS', 'Chrome'],
frameworks: ['qunit'],
files: [
'node_modules/intl/dist/Intl.min.js',
'node_modules/intl/locale-data/complete.js',

'node_modules/jquery/dist/jquery.min.js',

'node_modules/devextreme/dist/js/dx.all.debug.js',

'node_modules/devextreme/dist/js/localization/dx.all.de.js',
'node_modules/devextreme/dist/js/localization/dx.all.ja.js',
'node_modules/devextreme/dist/js/localization/dx.all.ru.js',

'dist/' + (config.useProdBundle ? 'devextreme-intl.js' : 'devextreme-intl.dev.js'),

'tests/number-tests.js',
'tests/date-tests.js',
'tests/message-tests.js'
],
plugins: [
'karma-qunit',
'karma-junit-reporter',
'karma-phantomjs-launcher',
'karma-chrome-launcher'
],
reporters: [
'dots',
'junit'
],
junitReporter: {
outputDir: 'shippable/testresults/',
outputFile: 'test-results.xml'
}
});
};
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"build-dev": "npm run prepare-build -s && webpack --dev",
"test-dev": "parallelshell \"npm run build-dev -s\" \"karma start --browsers Chrome\"",
"test-dev-phantom": "parallelshell \"npm run build-dev -s\" \"karma start --browsers PhantomJS\"",
"test": "npm run build && karma start --browsers PhantomJS --single-run --use-prod-bundle=true",
"lint": "eslint src scripts tests webpack.config.js karma.conf.js",
"test": "npm run build -s && npm run lint -s && karma start --browsers PhantomJS --single-run --use-prod-bundle=true",
"pack": "npm run test -s && npm pack"
},
"keywords": [
Expand Down
18 changes: 9 additions & 9 deletions scripts/locale-data-generator.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var Cldr = require("cldrjs");
var locales = require("cldr-core/availableLocales.json").availableLocales.full;
var fs = require("fs");
var path = require("path");
var Cldr = require('cldrjs');
var locales = require('cldr-core/availableLocales.json').availableLocales.full;
var fs = require('fs');
var path = require('path');

var DAY_INDEXES = {
sun: 0,
Expand All @@ -16,19 +16,19 @@ var DEFAULT_DAY_INDEX = 1;

var result = {};

Cldr.load(require("cldr-core/supplemental/weekData.json"), require("cldr-core/supplemental/likelySubtags.json"));
Cldr.load(require('cldr-core/supplemental/weekData.json'), require('cldr-core/supplemental/likelySubtags.json'));

locales.forEach(function(locale) {
var firstDay = new Cldr(locale).supplemental.weekData.firstDay(),
firstDayIndex = DAY_INDEXES[firstDay];

if(firstDayIndex !== DEFAULT_DAY_INDEX) {
result[locale] = firstDayIndex;
result[locale] = firstDayIndex;
}
});

var LOCALE_DATA_FOLDER = "locale-data";
var LOCALE_DATA_FOLDER = 'locale-data';
try {
fs.mkdirSync(LOCALE_DATA_FOLDER);
} catch(e) {}
fs.writeFile(path.join(LOCALE_DATA_FOLDER, "first-day-of-week-data.js"), "module.exports = " + JSON.stringify(result, null, " ") + ";");
} catch(e) { } // eslint-disable-line no-empty
fs.writeFile(path.join(LOCALE_DATA_FOLDER, 'first-day-of-week-data.js'), 'module.exports = ' + JSON.stringify(result, null, ' ') + ';');
Loading

0 comments on commit 175da43

Please sign in to comment.