chore: deps

.eslintignore

@@ -0,0 +1 @@
+*.d.ts

.eslintrc.json

@@ -0,0 +1,10 @@
+{
+	"root": true,
+	"extends": "marine/prettier/node",
+	"parserOptions": {
+		"project": "./tsconfig.eslint.json"
+	},
+	"rules": {
+		"@typescript-eslint/naming-convention": 0
+	}
+}

.gitignore

@@ -1,21 +1,20 @@
 # Packages
-node_modules/
+node_modules
+**/node_modules
+
+# Build artifacts
+dist/
 
 # Log files
-logs/
+logs
 *.log
+npm-debug.log*
 
-# Authentication
+# Runtime data
-
+pids
-# Test files
+*.pid
-test/
+*.seed
-!test/**/*.ts
 
 # Miscellaneous
 .tmp/
-.vscode/bookmarks.json
 !.vscode/launch.json
-!.vscode/tasks.json
-.vscode-test/
-dist/
-typings/

.npmrc

@@ -0,0 +1,4 @@
+audit=false
+fund=false
+node-version=false
+legacy-peer-deps=true

.vscodeignore

@@ -1,9 +1,27 @@
-.vscode
+# Packages
-dist/**/*.map
 node_modules
-src
+**/node_modules
+
+# Build artifacts
+dist/**/*.map
+
+# Log files
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Miscellaneous
+.tmp/
+.github/
+.vscode/
+src/
 .gitattributes
 .gitignore
 tsconfig.json
 webpack.config.js
-yarn.lock
+package-lock.json

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "discord-vscode",
 	"displayName": "Discord Presence",
-	"version": "4.0.0",
+	"version": "4.1.0",
 	"description": "Update your discord status with the newly added rich presence.",
 	"private": true,
 	"author": {
@@ -186,33 +186,24 @@
 		"utf-8-validate": "^5.0.3",
 		"vsls": "^1.0.3015"
 	},
-	"optionalDependencies": {
-		"register-scheme": "devsnek/node-register-scheme"
-	},
 	"devDependencies": {
 		"@types/node": "^14.14.14",
-		"@types/vscode": "^1.50.0",
+		"@types/vscode": "^1.51.0",
-		"@typescript-eslint/eslint-plugin": "^3.10.1",
+		"@typescript-eslint/eslint-plugin": "^4.10.0",
-		"@typescript-eslint/parser": "^3.10.1",
+		"@typescript-eslint/parser": "^4.10.0",
 		"clean-webpack-plugin": "^3.0.0",
 		"eslint": "^7.16.0",
 		"eslint-config-marine": "^7.2.0",
 		"eslint-config-prettier": "^7.1.0",
 		"eslint-plugin-prettier": "^3.3.0",
 		"prettier": "^2.2.1",
-		"terser-webpack-plugin": "^4.2.3",
+		"terser-webpack-plugin": "^5.0.3",
 		"ts-loader": "^8.0.12",
 		"typescript": "^4.1.3",
-		"webpack": "^4.44.2",
+		"webpack": "^5.11.0",
-		"webpack-cli": "^3.3.12"
+		"webpack-cli": "^4.2.0"
 	},
 	"engines": {
-		"vscode": "^1.47.0"
+		"vscode": "^1.51.0"
-	},
-	"eslintConfig": {
-		"extends": "marine/prettier/node",
-		"rules": {
-			"@typescript-eslint/naming-convention": 0
-		}
 	}
 }

src/data/languages.json

@@ -16,6 +16,7 @@
     "brainfuck",
     "c",
     "cargo",
+    "cfml",
     "circleci",
     "clojure",
     "cmake",
@@ -63,6 +64,7 @@
     "jar",
     "java",
     "jest",
+    "jinja",
     "js",
     "jsmap",
     "json",
@@ -179,6 +181,8 @@
     "/\\.bf?$/i": { "image": "brainfuck" },
     "/\\.c$/i": { "image": "c" },
     "/(cargo.toml|cargo.lock)/i": { "image": "cargo" },
+    ".cfc": { "image": "cfml" },
+    ".cfm": { "image": "cfml" },
     "circle.yml": { "image": "circleci" },
     ".clj": { "image": "clojure" },
     ".cl2": { "image": "clojure" },
@@ -280,6 +284,7 @@
     ".jar": { "image": "jar" },
     ".java": { "image": "java" },
     "jest.config.js": { "image": "jest" },
+    ".jinja": { "image": "jinja" },
     ".js": { "image": "js" },
     ".es6": { "image": "js" },
     ".es": { "image": "js" },

tsconfig.eslint.json

@@ -0,0 +1,17 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"allowJs": true,
+	},
+	"include": [
+		"**/*.ts",
+		"**/*.tsx",
+		"**/*.js",
+		"**/*.jsx",
+		"**/*.test.ts",
+		"**/*.test.js",
+		"**/*.spec.ts",
+		"**/*.spec.js",
+	],
+	"exclude": []
+}

tsconfig.json

@@ -9,10 +9,9 @@
 		"target": "es2017",
 		"module": "commonjs",
 		"lib": [
-			"esnext"
+			"ESNext"
 		],
 		"outDir": "dist",
-		"sourceRoot": "./",
 		"sourceMap": true,
 		"inlineSources": true,
 		"incremental": true,

webpack.config.js

@@ -1,5 +1,6 @@
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
+const path = require('path');
 
 module.exports = {
 	target: 'node',
@@ -7,6 +8,7 @@ module.exports = {
 	output: {
 		filename: 'extension.js',
 		libraryTarget: 'commonjs2',
+		path: path.resolve(process.cwd(), 'dist'),
 	},
 	devtool: 'source-map',
 	externals: {
@@ -17,13 +19,14 @@ module.exports = {
 	},
 	plugins: [new CleanWebpackPlugin()],
 	optimization: {
+		minimize: true,
 		minimizer: [
 			new TerserPlugin({
-				cache: false,
-				sourceMap: true,
 				extractComments: true,
 				terserOptions: {
-					ecma: 8,
+					output: {
+						comments: false,
+					},
 					mangle: false,
 					keep_classnames: true,
 					keep_fnames: true,