Add prettier to format js and ts files

.eslintrc.js

@@ -19,6 +19,12 @@ module.exports = {
         "no-console": "off",
         "no-invalid-this": "off",
         "no-shadow": "warn",
+        "brace-style": "off",
+        "wrap-iife": "off",
+        "space-before-function-paren": "off",
+        "indent": "off",
+        "@typescript-eslint/indent": "off",
+        "@typescript-eslint/member-delimiter-style": "off",
     },
     "globals": {
         "$": false,

.gitattributes

@@ -1,2 +1,6 @@
 # Auto detect text files and perform LF normalization
-* text=auto
+* text=auto
+*.js text eol=lf
+*.jsx text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf

gulpfile.js

@@ -7,57 +7,66 @@ const gulp = require("gulp");
     "./tasks/download-default-extensions",
     "./tasks/nls-check",
     "./tasks/eslint",
+    "./tasks/format",
     "./tasks/npm-install",
     "./tasks/test",
     "./tasks/watch",
     "./tasks/webpack",
-    "./tasks/write-config"
+    "./tasks/write-config",
 ].forEach((taskfile) => {
     require(taskfile);
 });
 
+gulp.task(
+    "install",
+    gulp.series(
+        "write-config:dist",
+        "npm-download-default-extensions",
+        "npm-install-source",
+        "webpack-browser-dependencies"
+    )
+);
 
-gulp.task("install", gulp.series(
-    "write-config:dist",
-    "npm-download-default-extensions",
-    "npm-install-source",
-    "webpack-browser-dependencies"
-));
-
-gulp.task("build", gulp.series(
-    "npm-install-dist",
-    "npm-install-extensions-dist"
-));
+gulp.task("build", gulp.series("npm-install-dist", "npm-install-extensions-dist"));
 
 // task: optimize - optimize contents of dist folder
-gulp.task("optimize-common", gulp.series(
-    // "eslint:src",
-    // "clean",
-    // "targethtml",
-    // "useminPrepare",
-    // "htmlmin",
-    // "requirejs",
-    // "concat",
-    // "cssmin",
-    // "uglify",
-    // "copy:dist",
-    // "cleanempty",
-    // "usemin",
-    "build-config"
-    // "clean:node_modules_test_dir"
-));
+gulp.task(
+    "optimize-common",
+    gulp.series(
+        // "eslint:src",
+        // "clean",
+        // "targethtml",
+        // "useminPrepare",
+        // "htmlmin",
+        // "requirejs",
+        // "concat",
+        // "cssmin",
+        // "uglify",
+        // "copy:dist",
+        // "cleanempty",
+        // "usemin",
+        "build-config"
+        // "clean:node_modules_test_dir"
+    )
+);
 
 // task: optimize
-gulp.task("optimize", gulp.series(
-    // "write-config:dist",
-    "optimize-common"
-));
+gulp.task(
+    "optimize",
+    gulp.series(
+        // "write-config:dist",
+        "optimize-common"
+    )
+);
 
 // task: optimize-prerelease
-gulp.task("optimize-prerelease", gulp.series(
-    // "write-config:prerelease",
-    "optimize-common"
-));
+gulp.task(
+    "optimize-prerelease",
+    gulp.series(
+        // "write-config:prerelease",
+        "optimize-common"
+    )
+);
 
-gulp.task("test", gulp.parallel("eslint", "nls-check"));
+gulp.task("test", gulp.parallel("eslint", "nls-check", "format-check"));
 gulp.task("default", gulp.series("test"));

package.json

@@ -104,6 +104,8 @@
     "tslint:app": "tslint -c tslint.json --project app/tsconfig.json -t stylish",
     "tslint:src": "tslint -c src/tslint.json --project src/tsconfig.json -t stylish",
     "tslint": "npm run tslint:app && npm run tslint:src",
+    "lint": "npm run tslint && gulp eslint",
+    "format": "gulp format",
     "dev": "concurrently --kill-others \"gulp watch\" \"tsc --watch --project src\" \"npm run webpack -- --watch\"",
     "start": "electron .",
     "pack": "npm run build-optimized && electron-builder --dir",
@@ -175,6 +177,7 @@
     "glob": "^7.1.4",
     "gulp": "^4.0.2",
     "gulp-eslint-new": "^2.3.0",
+    "gulp-prettier": "^5.0.0",
     "gulp-rename": "^2.0.0",
     "gulp-watch": "^5.0.1",
     "iconv-lite": "^0.6.3",

src/config.json

@@ -132,6 +132,8 @@
         "tslint:app": "tslint -c tslint.json --project app/tsconfig.json -t stylish",
         "tslint:src": "tslint -c src/tslint.json --project src/tsconfig.json -t stylish",
         "tslint": "npm run tslint:app && npm run tslint:src",
+        "lint": "npm run tslint && gulp eslint",
+        "format": "gulp format",
         "dev": "concurrently --kill-others \"gulp watch\" \"tsc --watch --project src\" \"npm run webpack -- --watch\"",
         "start": "electron .",
         "pack": "npm run build-optimized && electron-builder --dir",
@@ -203,6 +205,7 @@
         "glob": "^7.1.4",
         "gulp": "^4.0.2",
         "gulp-eslint-new": "^2.3.0",
+        "gulp-prettier": "^5.0.0",
         "gulp-rename": "^2.0.0",
         "gulp-watch": "^5.0.1",
         "iconv-lite": "^0.6.3",

tasks/eslint.js

@@ -49,6 +49,7 @@ const meta = {
         "tasks/**/*.ts"
     ]
 };
+exports.meta = meta;
 
 function eslintTask(files) {
     // To automatically fix issues add `fix: true` to the eslint options and

tasks/format.js

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2024 - present The quadre code authors. All rights reserved.
+ * @license MIT
+ *
+ */
+
+"use strict";
+
+const gulp = require("gulp");
+const prettier = require("gulp-prettier");
+// const { meta } = require("./eslint");
+
+const options = {
+    printWidth: 100,
+    tabWidth: 4,
+    semi: true,
+    trailingComma: "es5",
+};
+
+function getGlobs() {
+    const globs = [
+        "gulpfile.js",
+        // ...meta.app,
+        // ...meta.src,
+        // ...meta.test,
+        // ...meta.build,
+    ];
+    return globs;
+}
+
+function format() {
+    return gulp
+        .src(getGlobs())
+        .pipe(prettier(options))
+        .pipe(gulp.dest((file) => file.base));
+}
+
+format.description = "Format the source code";
+
+gulp.task("format", format);
+
+function validate() {
+    return gulp.src(getGlobs()).pipe(prettier.check(options));
+}
+
+format.description = "Format the source code";
+
+gulp.task("format-check", validate);

tslint.json

@@ -18,6 +18,7 @@
     "variable-name": false,
     "no-implicit-dependencies": [true, "dev"],
     "no-console": false,
-    "max-classes-per-file": false
+    "max-classes-per-file": false,
+    "one-line": false
   }
 }

webpack.dev.ts

@@ -1,3 +1,9 @@
+/*
+ * Copyright (c) 2024 - present The quadre code authors. All rights reserved.
+ * @license MIT
+ *
+ */
+
 import path from "node:path";
 import { Configuration } from "webpack";
 import TranspilePlugin from "transpile-webpack-plugin";