diff --git a/.gitignore b/.gitignore index d562023..c9c12b1 100644 --- a/.gitignore +++ b/.gitignore @@ -20,8 +20,7 @@ coverage # node-waf configuration .lock-wscript -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release +build # Dependency directory # https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git diff --git a/app/package.json b/app/package.json index ab63ce7..4c02080 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "FilterJS", "description": "Generate textures with JS power!", - "version": "0.0.0", + "version": "1.0.0", "main": "index.html", "dependencies": { "fs-extra": "^6.0.0", diff --git a/gulpfile.js b/gulpfile.js index 82a8cc8..552b5c0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -194,9 +194,14 @@ const release = gulp.series([build, lint, done => { flavor: 'normal', buildType: 'versioned' }); - nw.build().then(done) + nw.build() + .then(() => { + console.log('Binaries done'); + done(); + }) .catch(function (error) { console.error(error); + done(error); }); }]); diff --git a/src/js/WebGL2.d.ts b/src/js/WebGL2.d.ts index bb5a5d6..3554418 100644 --- a/src/js/WebGL2.d.ts +++ b/src/js/WebGL2.d.ts @@ -1,3 +1,4 @@ +/*tslint:disable:interface-name*/ interface HTMLCanvasElement { - getContext(contextId: "webgl2" | "experimental-webgl2", contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null; -} \ No newline at end of file + getContext(contextId: 'webgl2' | 'experimental-webgl2', contextAttributes?: WebGLContextAttributes): WebGLRenderingContext | null; +} diff --git a/src/js/oneShotWebGL.ts b/src/js/oneShotWebGL.ts index b8374c9..e9cd146 100644 --- a/src/js/oneShotWebGL.ts +++ b/src/js/oneShotWebGL.ts @@ -65,11 +65,11 @@ class Renderer { gl.shaderSource(this.vecShader, vectorShader); gl.compileShader(this.fragShader); gl.compileShader(this.vecShader); - if (!gl.getShaderParameter(this.fragShader, gl.COMPILE_STATUS) ) { + if (!gl.getShaderParameter(this.fragShader, gl.COMPILE_STATUS)) { console.error(gl.getShaderInfoLog(this.fragShader)); return null; } - if (!gl.getShaderParameter(this.vecShader, gl.COMPILE_STATUS) ) { + if (!gl.getShaderParameter(this.vecShader, gl.COMPILE_STATUS)) { console.error(gl.getShaderInfoLog(this.vecShader)); return null; } diff --git a/tslint.json b/tslint.json index bf51913..ad55210 100644 --- a/tslint.json +++ b/tslint.json @@ -1,5 +1,5 @@ { - "extends": "tslint:recommended", + "extends": "tslint:latest", "linterOptions": { "exclude": ["./src/js/3rdparty/**/*"] }, @@ -24,16 +24,27 @@ }], "no-angle-bracket-type-assertion": false, "no-console": { + "severity": "warning", + "options": ["debug", "info", "log", "time", "timeEnd", "trace"] + }, + "no-implicit-dependencies": { /* As the app is split into two packages, this will give false positives… kinda */ + "severity": "warning" + }, + "no-invalid-template-strings": { /* Is used for a reason at oneShotWebGL */ "severity": "warning" }, + "no-misused-new": false, /* Because of buggy tslint */ + "no-object-literal-type-assertion": false, "no-shadowed-variable": { "severity": "warning" }, + "no-string-literal": false, /* Because of buggy tslint */ "no-var-keyword": false, "no-var-requires": false, "object-literal-sort-keys": false, "one-variable-per-declaration": false, "ordered-imports": false, + "prefer-for-of": false, /* Because of buggy tslint */ "quotemark": [true, "single"], "trailing-comma": [ false, {