mirror of https://github.com/CesiumGS/obj2gltf.git
Replace JSHint with ESLint shareable config
This commit is contained in:
parent
b8ecde6e13
commit
c8adca3324
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"extends": "cesium/node"
|
||||||
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
<component name="InspectionProjectProfileManager">
|
<component name="InspectionProjectProfileManager">
|
||||||
<profile version="1.0">
|
<profile version="1.0">
|
||||||
<option name="myName" value="Project Default" />
|
<option name="myName" value="Project Default" />
|
||||||
<inspection_tool class="JSHint" enabled="true" level="ERROR" enabled_by_default="true" />
|
<inspection_tool class="Eslint" enabled="true" level="ERROR" enabled_by_default="true" />
|
||||||
</profile>
|
</profile>
|
||||||
</component>
|
</component>
|
|
@ -1,83 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="JSHintConfiguration" version="2.8.0" use-config-file="true">
|
|
||||||
<option asi="false" />
|
|
||||||
<option bitwise="true" />
|
|
||||||
<option boss="false" />
|
|
||||||
<option browser="true" />
|
|
||||||
<option browserify="false" />
|
|
||||||
<option camelcase="false" />
|
|
||||||
<option couch="false" />
|
|
||||||
<option curly="true" />
|
|
||||||
<option debug="false" />
|
|
||||||
<option devel="false" />
|
|
||||||
<option dojo="false" />
|
|
||||||
<option elision="false" />
|
|
||||||
<option enforceall="false" />
|
|
||||||
<option eqeqeq="true" />
|
|
||||||
<option eqnull="false" />
|
|
||||||
<option es3="false" />
|
|
||||||
<option es5="false" />
|
|
||||||
<option esnext="false" />
|
|
||||||
<option evil="false" />
|
|
||||||
<option expr="false" />
|
|
||||||
<option forin="true" />
|
|
||||||
<option freeze="false" />
|
|
||||||
<option funcscope="false" />
|
|
||||||
<option futurehostile="false" />
|
|
||||||
<option gcl="false" />
|
|
||||||
<option globalstrict="false" />
|
|
||||||
<option immed="false" />
|
|
||||||
<option iterator="false" />
|
|
||||||
<option jasmine="false" />
|
|
||||||
<option jquery="false" />
|
|
||||||
<option lastsemic="false" />
|
|
||||||
<option latedef="false" />
|
|
||||||
<option laxbreak="false" />
|
|
||||||
<option laxcomma="false" />
|
|
||||||
<option loopfunc="false" />
|
|
||||||
<option maxerr="50" />
|
|
||||||
<option mocha="false" />
|
|
||||||
<option mootools="false" />
|
|
||||||
<option moz="false" />
|
|
||||||
<option multistr="false" />
|
|
||||||
<option newcap="false" />
|
|
||||||
<option noarg="true" />
|
|
||||||
<option nocomma="false" />
|
|
||||||
<option node="false" />
|
|
||||||
<option noempty="true" />
|
|
||||||
<option nomen="false" />
|
|
||||||
<option nonbsp="false" />
|
|
||||||
<option nonew="true" />
|
|
||||||
<option nonstandard="false" />
|
|
||||||
<option notypeof="false" />
|
|
||||||
<option noyield="false" />
|
|
||||||
<option onevar="false" />
|
|
||||||
<option passfail="false" />
|
|
||||||
<option phantom="false" />
|
|
||||||
<option plusplus="false" />
|
|
||||||
<option proto="false" />
|
|
||||||
<option prototypejs="false" />
|
|
||||||
<option qunit="false" />
|
|
||||||
<option quotmark="false" />
|
|
||||||
<option rhino="false" />
|
|
||||||
<option scripturl="false" />
|
|
||||||
<option shadow="false" />
|
|
||||||
<option shelljs="false" />
|
|
||||||
<option singleGroups="false" />
|
|
||||||
<option smarttabs="false" />
|
|
||||||
<option strict="true" />
|
|
||||||
<option sub="false" />
|
|
||||||
<option supernew="false" />
|
|
||||||
<option trailing="false" />
|
|
||||||
<option typed="false" />
|
|
||||||
<option undef="true" />
|
|
||||||
<option unused="false" />
|
|
||||||
<option validthis="false" />
|
|
||||||
<option white="false" />
|
|
||||||
<option withstmt="false" />
|
|
||||||
<option worker="false" />
|
|
||||||
<option wsh="false" />
|
|
||||||
<option yui="false" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
60
.jshintrc
60
.jshintrc
|
@ -1,60 +0,0 @@
|
||||||
{
|
|
||||||
"bitwise": false,
|
|
||||||
"camelcase": false,
|
|
||||||
"curly": true,
|
|
||||||
"eqeqeq": true,
|
|
||||||
"forin": true,
|
|
||||||
"freeze": true,
|
|
||||||
"immed": true,
|
|
||||||
"latedef": "nofunc",
|
|
||||||
"newcap": true,
|
|
||||||
"noarg": true,
|
|
||||||
"nonbsp": true,
|
|
||||||
"nonew": true,
|
|
||||||
"plusplus": false,
|
|
||||||
"quotmark": false,
|
|
||||||
"undef": true,
|
|
||||||
"unused": "strict",
|
|
||||||
"strict": true,
|
|
||||||
"asi": false,
|
|
||||||
"boss": false,
|
|
||||||
"debug": false,
|
|
||||||
"eqnull": false,
|
|
||||||
"moz": false,
|
|
||||||
"evil": false,
|
|
||||||
"expr": false,
|
|
||||||
"funcscope": false,
|
|
||||||
"globalstrict": false,
|
|
||||||
"iterator": false,
|
|
||||||
"lastsemic": false,
|
|
||||||
"laxbreak": false,
|
|
||||||
"laxcomma": false,
|
|
||||||
"loopfunc": false,
|
|
||||||
"multistr": true,
|
|
||||||
"noyield": false,
|
|
||||||
"notypeof": false,
|
|
||||||
"proto": false,
|
|
||||||
"scripturl": false,
|
|
||||||
"shadow": false,
|
|
||||||
"sub": false,
|
|
||||||
"supernew": false,
|
|
||||||
"validthis": false,
|
|
||||||
"browser": false,
|
|
||||||
"browserify": false,
|
|
||||||
"couch": false,
|
|
||||||
"devel": true,
|
|
||||||
"dojo": false,
|
|
||||||
"jasmine": false,
|
|
||||||
"jquery": false,
|
|
||||||
"mocha": true,
|
|
||||||
"mootools": false,
|
|
||||||
"node": true,
|
|
||||||
"nonstandard": false,
|
|
||||||
"prototypejs": false,
|
|
||||||
"qunit": false,
|
|
||||||
"rhino": false,
|
|
||||||
"shelljs": false,
|
|
||||||
"worker": false,
|
|
||||||
"wsh": false,
|
|
||||||
"yui": false
|
|
||||||
}
|
|
|
@ -6,7 +6,7 @@
|
||||||
/test
|
/test
|
||||||
/output
|
/output
|
||||||
.editorconfig
|
.editorconfig
|
||||||
.jshintrc
|
.eslintrc.json
|
||||||
.npmignore
|
.npmignore
|
||||||
.travis.yml
|
.travis.yml
|
||||||
gulpfile.js
|
gulpfile.js
|
||||||
|
|
|
@ -3,7 +3,7 @@ node_js:
|
||||||
- "4"
|
- "4"
|
||||||
- "6"
|
- "6"
|
||||||
script:
|
script:
|
||||||
- npm run jsHint -- --failTaskOnError
|
- npm run eslint -- --failTaskOnError
|
||||||
- npm run test -- --failTaskOnError --suppressPassed
|
- npm run test -- --failTaskOnError --suppressPassed
|
||||||
|
|
||||||
after_success:
|
after_success:
|
||||||
|
|
|
@ -55,13 +55,13 @@ Run the tests:
|
||||||
```
|
```
|
||||||
npm run test
|
npm run test
|
||||||
```
|
```
|
||||||
To run JSHint on the entire codebase, run:
|
To run ESLint on the entire codebase, run:
|
||||||
```
|
```
|
||||||
npm run jsHint
|
npm run eslint
|
||||||
```
|
```
|
||||||
To run JSHint automatically when a file is saved, run the following and leave it open in a console window:
|
To run ESLint automatically when a file is saved, run the following and leave it open in a console window:
|
||||||
```
|
```
|
||||||
npm run jsHint-watch
|
npm run eslint-watch
|
||||||
```
|
```
|
||||||
|
|
||||||
## Running Test Coverage
|
## Running Test Coverage
|
||||||
|
|
23
gulpfile.js
23
gulpfile.js
|
@ -4,7 +4,7 @@ var Cesium = require('cesium');
|
||||||
var child_process = require('child_process');
|
var child_process = require('child_process');
|
||||||
var fsExtra = require('fs-extra');
|
var fsExtra = require('fs-extra');
|
||||||
var gulp = require('gulp');
|
var gulp = require('gulp');
|
||||||
var gulpJshint = require('gulp-jshint');
|
var eslint = require('gulp-eslint');
|
||||||
var Jasmine = require('jasmine');
|
var Jasmine = require('jasmine');
|
||||||
var JasmineSpecReporter = require('jasmine-spec-reporter').SpecReporter;
|
var JasmineSpecReporter = require('jasmine-spec-reporter').SpecReporter;
|
||||||
var open = require('open');
|
var open = require('open');
|
||||||
|
@ -20,23 +20,26 @@ var environmentSeparator = process.platform === 'win32' ? ';' : ':';
|
||||||
var nodeBinaries = path.join(__dirname, 'node_modules', '.bin');
|
var nodeBinaries = path.join(__dirname, 'node_modules', '.bin');
|
||||||
process.env.PATH += environmentSeparator + nodeBinaries;
|
process.env.PATH += environmentSeparator + nodeBinaries;
|
||||||
|
|
||||||
var jsHintFiles = ['**/*.js', '!node_modules/**', '!coverage/**', '!doc/**'];
|
var esLintFiles = ['**/*.js', '!node_modules/**', '!coverage/**', '!doc/**'];
|
||||||
var specFiles = ['**/*.js', '!node_modules/**', '!coverage/**', '!doc/**', '!bin/**'];
|
var specFiles = ['**/*.js', '!node_modules/**', '!coverage/**', '!doc/**', '!bin/**'];
|
||||||
|
|
||||||
gulp.task('jsHint', function () {
|
gulp.task('eslint', function () {
|
||||||
var stream = gulp.src(jsHintFiles)
|
var stream = gulp.src(esLintFiles)
|
||||||
.pipe(gulpJshint())
|
.pipe(eslint())
|
||||||
.pipe(gulpJshint.reporter('jshint-stylish'));
|
.pipe(eslint.format());
|
||||||
|
|
||||||
if (argv.failTaskOnError) {
|
if (argv.failTaskOnError) {
|
||||||
stream = stream.pipe(gulpJshint.reporter('fail'));
|
stream = stream.pipe(eslint.failAfterError());
|
||||||
}
|
}
|
||||||
|
|
||||||
return stream;
|
return stream;
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('jsHint-watch', function () {
|
gulp.task('eslint-watch', function() {
|
||||||
gulp.watch(jsHintFiles, ['jsHint']);
|
gulp.watch(esLintFiles).on('change', function(event) {
|
||||||
|
gulp.src(event.path)
|
||||||
|
.pipe(eslint())
|
||||||
|
.pipe(eslint.format());
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
gulp.task('test', function (done) {
|
gulp.task('test', function (done) {
|
||||||
|
|
1
index.js
1
index.js
|
@ -1 +1,2 @@
|
||||||
|
'use strict';
|
||||||
module.exports = require('./lib/obj2gltf');
|
module.exports = require('./lib/obj2gltf');
|
||||||
|
|
|
@ -38,21 +38,20 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"coveralls": "^2.12.0",
|
"coveralls": "^2.12.0",
|
||||||
|
"eslint-config-cesium": "^1.0.0",
|
||||||
"gulp": "^3.9.1",
|
"gulp": "^3.9.1",
|
||||||
"gulp-jshint": "^2.0.4",
|
"gulp-eslint": "^4.0.0",
|
||||||
"istanbul": "^0.4.5",
|
"istanbul": "^0.4.5",
|
||||||
"jasmine": "^2.5.3",
|
"jasmine": "^2.5.3",
|
||||||
"jasmine-spec-reporter": "^4.1.0",
|
"jasmine-spec-reporter": "^4.1.0",
|
||||||
"jsdoc": "^3.4.3",
|
"jsdoc": "^3.4.3",
|
||||||
"jshint": "^2.9.4",
|
|
||||||
"jshint-stylish": "^2.2.1",
|
|
||||||
"open": "^0.0.5",
|
"open": "^0.0.5",
|
||||||
"requirejs": "^2.3.3"
|
"requirejs": "^2.3.3"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"jsdoc": "jsdoc ./lib -R ./README.md -d doc",
|
"jsdoc": "jsdoc ./lib -R ./README.md -d doc",
|
||||||
"jsHint": "gulp jsHint",
|
"eslint": "gulp eslint",
|
||||||
"jsHint-watch": "gulp jsHint-watch",
|
"eslint-watch": "gulp eslint-watch",
|
||||||
"test": "gulp test",
|
"test": "gulp test",
|
||||||
"test-watch": "gulp test-watch",
|
"test-watch": "gulp test-watch",
|
||||||
"coverage": "gulp coverage",
|
"coverage": "gulp coverage",
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
{
|
||||||
|
"extends": "../.eslintrc.json",
|
||||||
|
"env": {
|
||||||
|
"jasmine": true
|
||||||
|
},
|
||||||
|
"rules": {
|
||||||
|
"no-unused-vars": "off"
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,5 +0,0 @@
|
||||||
{
|
|
||||||
"extends": "../.jshintrc",
|
|
||||||
"jasmine": true,
|
|
||||||
"unused": false
|
|
||||||
}
|
|
|
@ -1,6 +1,6 @@
|
||||||
//This file is a copy of https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Specs/addDefaultMatchers.js
|
//This file is a copy of https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Specs/addDefaultMatchers.js
|
||||||
/*global define*/
|
/*eslint strict: ["error", "function"]*/
|
||||||
/*jshint unused:false*/
|
/*eslint-env amd*/
|
||||||
define([
|
define([
|
||||||
'./equals',
|
'./equals',
|
||||||
'Cesium/Core/defined',
|
'Cesium/Core/defined',
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
/*global define*/
|
/*eslint strict: ["error", "function"]*/
|
||||||
|
/*eslint-env amd*/
|
||||||
define([
|
define([
|
||||||
'./addDefaultMatchers',
|
'./addDefaultMatchers',
|
||||||
'./equalsMethodEqualityTester'
|
'./equalsMethodEqualityTester'
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
//This file is a copy of https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Specs/equals.js
|
//This file is a copy of https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Specs/equals.js
|
||||||
/*global define*/
|
/*eslint strict: ["error", "function"]*/
|
||||||
|
/*eslint-env amd*/
|
||||||
define([
|
define([
|
||||||
'Cesium/Core/FeatureDetection'
|
'Cesium/Core/FeatureDetection'
|
||||||
], function(
|
], function(
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
//This file is a copy of https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Specs/equalsMethodEqualityTester.js
|
//This file is a copy of https://github.com/AnalyticalGraphicsInc/cesium/blob/master/Specs/equalsMethodEqualityTester.js
|
||||||
/*global define*/
|
/*eslint strict: ["error", "function"]*/
|
||||||
|
/*eslint-env amd*/
|
||||||
define([
|
define([
|
||||||
'Cesium/Core/defined'
|
'Cesium/Core/defined'
|
||||||
], function(
|
], function(
|
||||||
|
|
Loading…
Reference in New Issue