Update for d.js v12, new lint rules

Author: zajrik

.github/workflows/build_indev_docs.yml

@@ -13,10 +13,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v1
 
-      - name: Install Node v10
+      - name: Install Node v14
         uses: actions/setup-node@v1
         with:
-          node-version: 10
+          node-version: 14
 
       - name: Install dependencies
         run: |
@@ -25,13 +25,18 @@ jobs:
       - name: Clone gh-pages branch
         run: git clone https://${{ github.actor }}:${{ secrets.DOCS_TOKEN }}@github.com/${{ github.repository }}.git -b gh-pages ../yamdbf-docs
 
-      - name: Build docs
+      - name: Build project and run localization doc generation script
         run: |
           npm run build
-          npm run docs:indev
+          npm run localization
 
-      - name: Build localization string list
-        run: npm run localization
+      - name: Switch to node v8.9.3
+        uses: actions/setup-node@v1
+        with:
+          node-version: 8.9.3
+
+      - name: Build docs
+          npm run docs:indev
 
       - name: Check if commit is needed
         id: git_status

.gitignore

@@ -8,6 +8,7 @@ npm-debug*
 /test/**/*.js*
 test_*.js
 /scripts/**/*.js
+/scripts/**/*.js.map
 /scripts/**/*.d.ts
 /scripts/storage
 *.sqlite

gulpfile.js

@@ -1,45 +1,35 @@
+/* eslint-disable @typescript-eslint/typedef, no-return-assign, @typescript-eslint/explicit-function-return-type */
 const gulp = require('gulp');
-const gulp_ts = require('gulp-typescript');
-const gulp_sourcemaps = require('gulp-sourcemaps');
+const typescript = require('gulp-typescript');
+const sourcemaps = require('gulp-sourcemaps');
+const eslint = require('gulp-eslint');
 const del = require('del');
 const path = require('path');
 const { execSync } = require('child_process');
 
-const project = gulp_ts.createProject('tsconfig.json');
+const project = typescript.createProject('tsconfig.json');
 
-let _linter;
-let _gulp_tslint;
-let _tslint;
 let _runSequence;
 
 const runSequence = () => _runSequence = _runSequence || require('run-sequence');
-const gulp_tslint = () => _gulp_tslint = _gulp_tslint || require('gulp-tslint');
-const tslint = () => _tslint = _tslint || require('tslint');
-const linter = () => _linter = _linter || tslint().Linter.createProgram('tsconfig.json');
 
-gulp.task('default', ['build']);
-gulp.task('build:vscode', cb => runSequence()('lint', 'build', cb));
 gulp.task('build:docs', () => execSync('npm run docs:indev'));
 gulp.task('docs', cb => runSequence()('build', 'build:docs', cb));
 gulp.task('gh-prebuild', cb => runSequence()('build', 'gh-prebuild-prepare', cb));
 
 gulp.task('pause', cb => setTimeout(() => cb(), 1e3));
-gulp.task('tests', cb => runSequence()('lint', 'build', 'pause', 'build:tests', cb));
 
-gulp.task('lint', () => {
+gulp.task('lint', () =>
 	gulp.src('src/**/*.ts')
-		.pipe(gulp_tslint()({
-			configuration: 'tslint.json',
-			formatter: 'prose',
-			program: linter()
-		}))
-		.pipe(gulp_tslint().report());
-})
-
-gulp.task('build', () => {
+		.pipe(eslint())
+		.pipe(eslint.format())
+		.pipe(eslint.failAfterError()));
+
+gulp.task('build', () =>
+{
 	del.sync(['bin/**/*.*']);
 	const tsCompile = gulp.src('src/**/*.ts')
-		.pipe(gulp_sourcemaps.init({ base: 'src' }))
+		.pipe(sourcemaps.init({ base: 'src' }))
 		.pipe(project());
 
 	tsCompile.pipe(gulp.dest('bin/'));
@@ -49,11 +39,12 @@ gulp.task('build', () => {
 	gulp.src('src/**/*.lang').pipe(gulp.dest('bin/'));
 
 	return tsCompile.js
-		.pipe(gulp_sourcemaps.write('.', { sourceRoot: '../src' }))
+		.pipe(sourcemaps.write('.', { sourceRoot: '../src' }))
 		.pipe(gulp.dest('bin/'));
 });
 
-gulp.task('gh-prebuild-prepare', () => {
+gulp.task('gh-prebuild-prepare', () =>
+{
 	del.sync([
 		'../yamdbf-prebuilt/**',
 		'../yamdbf-prebuilt/.*',
@@ -63,25 +54,39 @@ gulp.task('gh-prebuild-prepare', () => {
 	], { force: true });
 	gulp.src('bin/**/*.*').pipe(gulp.dest('../yamdbf-prebuilt/bin'));
 	gulp.src('package.json').pipe(gulp.dest('../yamdbf-prebuilt'));
-})
+});
 
-gulp.task('build:tests', () => {
+gulp.task('build:tests', () =>
+{
 	del.sync(['test/**/*.js']);
 	const tsCompile = gulp.src('test/**/*.ts')
-		.pipe(gulp_sourcemaps.init({ base: 'test' }))
+		.pipe(sourcemaps.init({ base: 'test' }))
 		.pipe(project());
 
 	tsCompile.pipe(gulp.dest('test/'));
 
 	return tsCompile.js
-		.pipe(gulp_sourcemaps.mapSources(sourcePath => path.join(__dirname, 'test', sourcePath)))
-		.pipe(gulp_sourcemaps.write())
+		.pipe(sourcemaps.mapSources(sourcePath => path.join(__dirname, 'test', sourcePath)))
+		.pipe(sourcemaps.write())
 		.pipe(gulp.dest('test/'));
 });
 
-gulp.task('build:scripts', () => {
+gulp.task('build:scripts', () =>
+{
 	del.sync(['scripts/**/*.js']);
-	gulp.src('scripts/**/*.ts')
-		.pipe(project())		
+	del.sync(['scripts/**/*.js.map']);
+	del.sync(['scripts/**/*.d.ts']);
+	const tsCompile = gulp.src('scripts/**/*.ts')
+		.pipe(sourcemaps.init({ base: 'scripts' }))
+		.pipe(project());
+
+	tsCompile.pipe(gulp.dest('scripts/'));
+
+	return tsCompile.js
+		.pipe(sourcemaps.write('.', { sourceRoot: '../scripts' }))
 		.pipe(gulp.dest('scripts/'));
 });
+
+gulp.task('default', gulp.series('build'));
+gulp.task('build:vscode', gulp.series('lint', 'build'));
+gulp.task('tests', gulp.series('lint', 'build', 'pause', 'build:tests'));

package.json

@@ -49,29 +49,35 @@
     "pg": "7.10.0",
     "sequelize": "5.7.6",
     "sequelize-typescript": "1.0.0-alpha.9",
-    "sqlite3": "4.0.6",
+    "sqlite3": "^5.0.0",
     "tedious": "6.1.1"
   },
   "devDependencies": {
+    "@discord-samba/eslint-config": "github:discord-samba/eslint-config",
     "@types/chalk": "^0.4.31",
     "@types/glob": "^5.0.30",
     "@types/node": "^8.0.19",
     "@types/node-json-db": "0.0.1",
     "@types/sequelize": "^4.0.68",
+    "@typescript-eslint/eslint-plugin": "^2.4.0",
+    "@typescript-eslint/parser": "^2.4.0",
     "cross-env": "^5.1.3",
-    "del": "^3.0.0",
-    "gulp": "^3.9.1",
-    "gulp-sourcemaps": "^2.4.1",
-    "gulp-tslint": "^8.1.1",
-    "gulp-typescript": "^4.0.2",
+    "del": "^6.0.0",
+    "eslint": "^6.5.1",
+    "gulp": "^4.0.2",
+    "gulp-eslint": "^6.0.0",
+    "gulp-sourcemaps": "^3.0.0",
+    "gulp-typescript": "^5.0.1",
     "jsdoc": "zajrik/jsdoc",
     "jsdoc-strip-async-await": "^0.1.0",
     "minami": "zajrik/minami",
     "run-sequence": "^1.2.2",
     "sequelize": "^5.7.6",
-    "sqlite3": "^4.0.6",
     "ts-node": "^6.1.1",
-    "tslint": "^5.4.3",
-    "typescript": "^3.7.0-beta"
+    "typescript": "^3.7.2"
+  },
+  "eslintConfig": {
+	"extends": "@discord-samba",
+	"ignorePatterns": "test/*"
   }
 }

scripts/generateBaseCommandNameFiles.ts

@@ -36,6 +36,7 @@ export type BaseCommandName = ${commands.map(c => `'${c}'`).join('\n\t| ')};
 	}
 }
 logger.log('Script', 'Starting base command names file builder');
+// @ts-ignore Needed to run the script
 const script: ScriptClient = new ScriptClient();
 
 process.on('unhandledRejection', (err: any) => logger.error(err));

scripts/generateDefaultLocalizationMarkdown.ts

@@ -71,6 +71,7 @@ class ScriptClient extends Client
 	}
 }
 logger.log('Script', 'Starting localization markdown builder');
+// @ts-ignore Needed to run the script
 const script: ScriptClient = new ScriptClient();
 
 process.on('unhandledRejection', (err: any) => logger.error(err));

scripts/generateLocalizationStringsEnum.ts

@@ -32,6 +32,7 @@ export enum BaseStrings
 	}
 }
 logger.log('Script', 'Starting base string key enum file builder');
+// @ts-ignore Needed to run the script
 const script: ScriptClient = new ScriptClient();
 
 process.on('unhandledRejection', (err: any) => logger.error(err));