carbonfive · mattbrictson · Jun 25, 2021 · Jun 25, 2021 · Jun 25, 2021 · Jun 26, 2021
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,37 @@
+module.exports = {
+  env: {
+    jest: true,
+    node: true,
+  },
+  parser: "@typescript-eslint/parser",
+  plugins: ["@typescript-eslint", "jest", "prettier"],
+  rules: {
+    "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/explicit-member-accessibility": "off",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        args: "after-used",
+        argsIgnorePattern: "^_",
+        varsIgnorePattern: "^_",
+      },
+    ],
+    "no-var": "error",
+    "prettier/prettier": "error",
+  },
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:jest/recommended",
+    "prettier",
+  ],
+  overrides: [
+    {
+      files: ["*.test.ts"],
+      rules: {
+        "@typescript-eslint/no-non-null-assertion": ["off"],
+        "@typescript-eslint/no-explicit-any": ["off"],
+      },
+    },
+  ],
+};
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/Dockerfile b/Dockerfile
@@ -5,4 +5,4 @@ RUN npx [email protected] install --production
 COPY . .
 ENV NODE_ENV=production
 EXPOSE 5000
-CMD ["node", "app/server.js"]
+CMD npm run server
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: node app/server.js
+web: npm run server
diff --git a/app/config/env.js → app/config/env.ts b/app/config/env.js → app/config/env.ts
diff --git a/app/config/index.js → app/config/index.ts b/app/config/index.js → app/config/index.ts
diff --git a/app/controllers/auth.test.js → app/controllers/auth.test.ts b/app/controllers/auth.test.js → app/controllers/auth.test.ts
diff --git a/app/controllers/auth.js → app/controllers/auth.ts b/app/controllers/auth.js → app/controllers/auth.ts
diff --git a/app/controllers/hello.test.js → app/controllers/hello.test.ts b/app/controllers/hello.test.js → app/controllers/hello.test.ts
diff --git a/app/controllers/hello.js → app/controllers/hello.ts b/app/controllers/hello.js → app/controllers/hello.ts
diff --git a/app/controllers/not-found.test.js → app/controllers/not-found.test.ts b/app/controllers/not-found.test.js → app/controllers/not-found.test.ts
diff --git a/app/controllers/not-found.js → app/controllers/not-found.ts b/app/controllers/not-found.js → app/controllers/not-found.ts
diff --git a/app/controllers/secret.test.js → app/controllers/secret.test.ts b/app/controllers/secret.test.js → app/controllers/secret.test.ts
diff --git a/app/controllers/secret.js → app/controllers/secret.ts b/app/controllers/secret.js → app/controllers/secret.ts
diff --git a/app/index.js → app/index.ts b/app/index.js → app/index.ts
diff --git a/app/logger.js → app/logger.ts b/app/logger.js → app/logger.ts
diff --git a/app/middleware/basic-auth.js → app/middleware/basic-auth.ts b/app/middleware/basic-auth.js → app/middleware/basic-auth.ts
diff --git a/app/middleware/error.js → app/middleware/error.ts b/app/middleware/error.js → app/middleware/error.ts
diff --git a/app/middleware/handle-async.js → app/middleware/handle-async.ts b/app/middleware/handle-async.js → app/middleware/handle-async.ts
diff --git a/app/middleware/json-only.js → app/middleware/json-only.ts b/app/middleware/json-only.js → app/middleware/json-only.ts
diff --git a/app/middleware/jwt-session.js → app/middleware/jwt-session.ts b/app/middleware/jwt-session.js → app/middleware/jwt-session.ts
diff --git a/app/middleware/logging.js → app/middleware/logging.ts b/app/middleware/logging.js → app/middleware/logging.ts
diff --git a/app/server.js → app/server.ts b/app/server.js → app/server.ts
@@ -7,3 +7,5 @@ const logger = require("@app/logger");
 const port = config.express.port;
 
 app.listen(port, () => logger.info(`Listening on port ${port}`));
+
+export {};
diff --git a/jest.config.js b/jest.config.js
@@ -0,0 +1,14 @@
+module.exports = {
+  collectCoverageFrom: ["app/**/*.{js,ts}"],
+  globals: {
+    "ts-jest": {
+      isolatedModules: true,
+    },
+  },
+  moduleNameMapper: {
+    "^@app(.*)$": "<rootDir>/app$1",
+  },
+  preset: "ts-jest",
+  roots: ["app"],
+  testEnvironment: "node",
+};
diff --git a/package.json b/package.json
@@ -5,9 +5,11 @@
   "scripts": {
     "prepare": "husky install",
     "prestart": "node bin/pre-start",
-    "start": "nodemon --watch . --watch .env.development --watch .env.development.local app/server.js",
-    "lint": "eslint 'app/**/*.js'",
-    "server": "node app/server.js",
+    "start": "ts-node-dev --transpile-only --watch .,.env.development,.env.development.local app/server.ts",
+    "lint": "npm-run-all -c lint:*",
+    "lint:eslint": "eslint 'app/**/*.{js,ts}'",
+    "lint:tsc": "tsc --noEmit",
+    "server": "ts-node --transpile-only app/server.ts",
     "test": "jest --watch",
     "test:coverage": "jest --coverage"
   },
@@ -17,6 +19,7 @@
   "dependencies": {
     "body-parser": "^1.19.0",
     "cookie-parser": "^1.4.4",
+    "dotenv": "^10.0.0",
     "express": "^4.17.1",
     "express-basic-auth": "^1.2.0",
     "helmet": "^4.6.0",
@@ -26,10 +29,18 @@
     "morgan": "^1.9.0",
     "passport": "^0.4.0",
     "passport-jwt": "^4.0.0",
+    "ts-node": "^10.0.0",
+    "typescript": "^4.3.4",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "dotenv": "^10.0.0",
+    "@types/express": "^4.17.12",
+    "@types/jest": "^26.0.23",
+    "@types/lodash": "^4.14.170",
+    "@types/node": "^15.12.4",
+    "@types/supertest": "^2.0.11",
+    "@typescript-eslint/eslint-plugin": "^4.28.0",
+    "@typescript-eslint/parser": "^4.28.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-jest": "^24.4.0",
@@ -38,27 +49,18 @@
     "jest": "^27.1.0",
     "jest-junit": "^12.0.0",
     "lint-staged": "^11.1.2",
-    "nodemon": "^2.0.7",
+    "npm-run-all": "^4.1.5",
     "prettier": "^2.3.2",
     "shelljs": "^0.8.2",
-    "supertest": "^6.1.6"
+    "supertest": "^6.1.6",
+    "ts-jest": "^27.0.3",
+    "ts-node-dev": "^1.1.6"
   },
   "engines": {
     "node": "^14.17.6",
     "yarn": ">=1.12.1"
   },
   "_moduleAliases": {
     "@app": "app"
-  },
-  "jest": {
-    "roots": [
-      "app"
-    ],
-    "moduleNameMapper": {
-      "^@app(.*)$": "<rootDir>/app$1"
-    },
-    "collectCoverageFrom": [
-      "app/**/*.js"
-    ]
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "baseUrl": "app",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "lib": ["es2020"],
+    "module": "commonjs",
+    "outDir": "build",
+    "skipLibCheck": true,
+    "strict": true,
+    "target": "es2020"
+  }
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,5 @@ const logger = require("@app/logger");
		const port = config.express.port;

		app.listen(port, () => logger.info(`Listening on port ${port}`));

		export {};