Merge remote-tracking branch 'origin/develop' into feature/clan-scrape

.eslintrc

@@ -0,0 +1,7 @@
+{
+  "root": true,
+  "extends": ["standard"],
+  "rules": {
+    "indent": ["error", 4]
+  }
+}

.github/workflows/code-quality.yml

@@ -16,6 +16,8 @@ jobs:
         node-version: '20'
         cache: 'yarn'
     - run: yarn install
-    # --force should be removed if all the issues are fixed
-    - run: ./node_modules/.bin/grunt jshint --force
+    - run: npx webpack
+    - run: yarn run lint
+      continue-on-error: true # should be removed if all the issues are fixed
     - run: yarn run test
+    - uses: codecov/codecov-action@v3

.gitignore

@@ -50,3 +50,5 @@ public/js/*.js
 
 #Sessions
 sessions
+
+dist

.npmcheckrc

@@ -9,8 +9,5 @@ depcheck:
     "grunt-postcss",
     "grunt-nodemon",
     "grunt-contrib-watch",
-    "grunt-contrib-uglify-es",
-    "grunt-contrib-jshint",
-    "grunt-contrib-concat",
     "grunt-concurrent"
   ]

Dockerfile

@@ -6,6 +6,7 @@ COPY . /code
 WORKDIR /code
 
 RUN yarn install --production=false --frozen-lockfile
+RUN npx webpack
 RUN ./node_modules/.bin/grunt prod
 RUN yarn install --production=true --ignore-optional --frozen-lockfile
 

Gruntfile.js

@@ -22,8 +22,6 @@ module.exports = function(grunt) {
 
   grunt.registerTask('prod', [
     'sass:dist',
-    'concat:js',
-    'uglify:dist',
     'copy'
   ]);
 };

fafApp.js

@@ -116,6 +116,11 @@ module.exports.setup = (app) => {
         maxAge: 4 * 60 * 60 * 1000 // 4 hours
     }))
 
+    app.use('/dist', express.static('dist', {
+        immutable: true,
+        maxAge: 4 * 60 * 60 * 1000 // 4 hours, could be longer since we got cache-busting
+    }))
+
     app.use(express.json())
     app.use(bodyParser.json())
     app.use(bodyParser.urlencoded({extended: false}))
@@ -138,5 +143,6 @@ module.exports.setup = (app) => {
 
     app.use(flash())
     app.use(middleware.populatePugGlobals)
+    app.use(middleware.webpackAsset)
     app.use(copyFlashHandler)
 }

grunt/concurrent.js

@@ -1,6 +1,6 @@
 module.exports = {
 	dev: {
-		tasks: ['nodemon', 'concat', 'watch', 'copy', 'sass:dev'],
+		tasks: [['run:webpack','copy', 'sass:dev','nodemon'], 'watch'],
 		options: {
 			logConcurrentOutput: true
 		}

grunt/nodemon.js

@@ -4,6 +4,7 @@ module.exports = {
     options: {
       delay: 500,
       ignore: [
+        'dist/js/*.js',
         'sessions/**',
         'node_modules/**',
         'grunt/**',

grunt/run.js

@@ -0,0 +1,5 @@
+module.exports = {
+    webpack: {
+        args: ['node_modules/.bin/webpack'],
+    }
+};

grunt/watch.js

@@ -1,23 +1,10 @@
 module.exports = {
-	js: {
-		files: [
-			'public/js/app/*.js'
-		],
-		tasks: ['concat:js'],
-	},
-	express: {
-		files: [
-      'routes/**/*.js',
-			'express.js',
-		]
-	},
+    webpack: {
+        files: ['src/frontend/**/*.js'],
+        tasks: ['run:webpack']
+    },
 	sass: {
 		files: ['public/styles/**/*.{scss,sass}'],
 		tasks: ['sass:dev']
-	},
-	livereload: {
-		files: [
-			'public/styles/**/*.css'
-		],
 	}
 };

jest.config.js

@@ -1,4 +1,6 @@
 const config = {
+    collectCoverage: true,
+    coverageReporters: ['text', 'cobertura'],
     setupFilesAfterEnv: ['./tests/setup.js'],
 };
 

package.json

@@ -30,19 +30,25 @@
   "devDependencies": {
     "awesomplete": "^1.1.5",
     "dart-sass": "^1.25.0",
+    "eslint": "^8.54.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-n": "^16.3.1",
+    "eslint-plugin-promise": "^6.1.1",
     "grunt": "1.6.1",
     "grunt-concurrent": "3.0.0",
-    "grunt-contrib-concat": "^2.1.0",
-    "grunt-contrib-jshint": "^3.2.0",
-    "grunt-contrib-uglify-es": "3.3.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-nodemon": "^0.4.2",
     "grunt-postcss": "0.9.0",
+    "grunt-run": "^0.8.1",
     "grunt-sass": "3.1.0",
     "jest": "^29.7.0",
-    "jshint-stylish": "2.2.1",
     "load-grunt-config": "4.0.1",
     "load-grunt-tasks": "5.1.0",
+    "octokit": "^3.1.2",
+    "webpack": "^5.89.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-manifest-plugin": "^5.0.0"
     "nock": "^13.3.8",
     "supertest": "^6.3.3"
   },
@@ -52,7 +58,8 @@
   },
   "scripts": {
     "start": "node express.js",
-    "test": "jest"
-  },
-  "main": "express.js"
+    "test": "jest",
+    "lint": "eslint --ignore-path .gitignore src tests",
+    "lint:fix": "eslint --fix --ignore-path .gitignore src tests"
+  }
 }

routes/middleware.js

@@ -9,6 +9,8 @@ const ClanRepository = require("../lib/clan/ClanRepository")
 const UserService = require("../lib/UserService");
 const UserRepository = require("../lib/UserRepository");
 const wordpressService = WordpressServiceFactory(appConfig.wordpressUrl)
+const fs = require('fs');
+const webpackManifestJS = JSON.parse(fs.readFileSync('dist/js/manifest.json', 'utf8'));
 
 exports.initLocals = function(req, res, next) {
 	let locals = res.locals;
@@ -17,6 +19,18 @@ exports.initLocals = function(req, res, next) {
   next();
 };
 
+exports.webpackAsset = (req, res, next) => {
+    res.locals.webpackAssetJS = (asset) => {
+        if (asset in webpackManifestJS) {
+            return webpackManifestJS[asset]
+        }
+
+        throw new Error('[error] middleware::webpackAsset Failed to find asset "' + asset + '"')
+    }
+
+    next()
+}
+
 exports.populatePugGlobals = function(req, res, next) {
     res.locals.loggedInUser = req.user || null
 

src/backend/.eslintrc

@@ -0,0 +1,6 @@
+{
+    "env": {
+        "node": true,
+        "es2020": true
+    }
+}

src/frontend/js/.eslintrc

@@ -0,0 +1,6 @@
+{
+  "env": {
+    "browser": true,
+    "es2020": true
+  }
+}

public/js/app/play.js → src/frontend/js/entrypoint/play.js

@@ -1,4 +1,4 @@
-import {Octokit} from "https://esm.sh/@octokit/core";
+import {Octokit} from "octokit";
 
 const githubOrg = 'faforever'
 const githubRepository = 'downlords-faf-client'

templates/layouts/default.pug

@@ -282,7 +282,7 @@ html(lang='en')
             li
               a(href='https://forum.faforever.com/')  FORUMS
 
-      script(src="../../js/app/navigation.js")
+      script(src=webpackAssetJS('navigation'))
 
       //- Include template-specific javascript files by extending the js block
       block js

templates/views/account/activate.pug

@@ -34,7 +34,3 @@ block content
           br
           br
           br
-
-
-block js
-  script(src='/js/account.min.js')

templates/views/account/changeEmail.pug

@@ -20,6 +20,3 @@ block content
                     +currentPassword
                     .form-actions
                         button(type='submit').btn.btn-default.btn-lg.btn-outro.btn-danger Change Email
-
-block js
-    script(src='/js/account.min.js')

templates/views/account/changeUsername.pug

@@ -17,5 +17,3 @@ block content
                 +username
                 .form-actions
                     button(type='submit').btn.btn-default.btn-lg.btn-outro.btn-danger Change
-block js
-    script(src='/js/account.min.js')

templates/views/account/confirmPasswordReset.pug

@@ -18,6 +18,3 @@ block content
                     +confirm-password
                     .form-actions
                         button(type='submit').btn.btn-default.btn-lg.btn-outro.btn-danger Reset
-
-block js
-    script(src='/js/account.min.js')

templates/views/account/linkGog.pug

@@ -67,7 +67,3 @@ block content
         h2 Why do I need to link my Steam/GOG account to FAF?
           p FAF as an organization doesn't own the copyright or trademark to SC:FA (Square Enix does). <br> Therefore, we need to verify you own a copy of SC:FA to prevent piracy.
           p Linking your GOG account to FAF doesn't provide us with any information or powers over your account. <br> Only the fact that you own Supreme Commander: Forged Alliance. <br> Which is why we need you to set your Game Details to public when linking your account.
-
-
-block js
-  script(src='/js/account.min.js')

templates/views/account/linkSteam.pug

@@ -49,9 +49,3 @@ block content
         h2 Why do I need to link my Steam/GOG account to FAF?
           p FAF as an organization doesn't own the copyright or trademark to SC:FA (Square Enix does). <br> Therefore, we need to verify you own a copy of SC:FA to prevent piracy.
           p Linking your steam account to FAF doesn't provide us with any information or powers over your account. <br> Only the fact that you own Supreme Commander: Forged Alliance. <br> Which is why we need you to set your Game Details to public when linking your account.
-
-
-
-
-block js
-    script(src='/js/account.min.js')