Merge branch 'merge-fuckup'

getkey · Jun 8, 2021 · 34ae3a3 · 34ae3a3
2 parents 7f7c3c3 + 673d09f
commit 34ae3a3
Show file tree

Hide file tree

Showing 8 changed files with 1,550 additions and 1,837 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -1,14 +1,9 @@
 const { pathsToModuleNameMapper } = require('ts-jest/utils');
-const { compilerOptions } = require('./tsconfig.test.json');
+const { compilerOptions } = require('./tsconfig.json');
 
 module.exports = {
 	preset: 'ts-jest',
 	testEnvironment: 'node',
-	globals: {
-		'ts-jest': {
-			tsconfig: 'tsconfig.test.json',
-		},
-	},
 	moduleNameMapper: pathsToModuleNameMapper(compilerOptions.paths, {
 		prefix: '<rootDir>',
 	}),

diff --git a/package.json b/package.json
@@ -16,65 +16,66 @@
     "@fortawesome/free-regular-svg-icons": "^5.15.3",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.1.14",
-    "@msgpack/msgpack": "^2.6.3",
-    "@sentry/react": "^6.3.6",
-    "@sentry/tracing": "^6.3.6",
+
+    "@msgpack/msgpack": "^2.7.0",
+    "@sentry/react": "^6.5.1",
+    "@sentry/tracing": "^6.5.1",
     "@types/d3-color": "^2.0.1",
     "@types/d3-interpolate": "^2.0.0",
     "@types/file-saver": "^2.0.2",
     "base64-js": "^1.5.1",
     "bombhopperio-level-tools": "^0.9.2",
-    "core-js": "^3.12.1",
-    "d3-color": "^2.0.0",
-    "d3-interpolate": "^2.0.1",
+    "core-js": "^3.14.0",
+    "d3-color": "^3.0.1",
+    "d3-interpolate": "^3.0.1",
     "epix": "^0.0.3",
     "file-saver": "^2.0.5",
     "iso-639-1": "^2.1.9",
     "lzma": "^2.3.2",
-    "mobx": "^6.3.0",
+    "mobx": "^6.3.2",
     "mobx-react-lite": "^3.2.0",
     "mobx-state-tree": "^5.0.1",
     "mst-middlewares": "^5.0.1",
-    "nanoid": "^3.1.22",
+    "nanoid": "^3.1.23",
     "pixi.js": "^5.3.8",
     "poly-decomp": "^0.3.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-pixi-fiber": "^0.14.2",
+    "react-pixi-fiber": "^0.14.3",
     "react-toastify": "^7.0.4",
-    "rxjs": "^7.0.1",
+    "rxjs": "^7.1.0",
     "sat": "^0.9.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.2",
-    "@babel/preset-env": "^7.14.2",
+    "@babel/core": "^7.14.3",
+    "@babel/preset-env": "^7.14.4",
     "@babel/preset-react": "^7.13.13",
     "@types/jest": "^26.0.23",
-    "@types/nanoid": "^2.1.0",
-    "@types/react": "^17.0.5",
-    "@types/react-dom": "^17.0.4",
+    "@types/nanoid": "^3.0.0",
+    "@types/react": "^17.0.9",
+    "@types/react-dom": "^17.0.6",
     "@types/sat": "^0.0.31",
-    "@typescript-eslint/eslint-plugin": "^4.23.0",
-    "@typescript-eslint/parser": "^4.23.0",
+    "@typescript-eslint/eslint-plugin": "^4.26.1",
+    "@typescript-eslint/parser": "^4.26.1",
     "babel-loader": "^8.2.2",
     "clean-webpack-plugin": "^3.0.0",
-    "css-loader": "^5.2.4",
-    "eslint": "^7.26.0",
+    "css-loader": "^5.2.6",
+    "eslint": "^7.28.0",
     "eslint-config-getkey": "^0.2.1",
-    "eslint-plugin-react": "^7.23.2",
+    "eslint-plugin-react": "^7.24.0",
     "extract-loader": "^5.1.0",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.3.1",
     "husky": "^6.0.0",
-    "jest": "^26.6.3",
+    "jest": "^27.0.4",
     "mini-css-extract-plugin": "^1.6.0",
     "ref-loader": "^1.0.3",
-    "ts-jest": "^26.5.6",
-    "ts-loader": "^9.1.2",
-    "typescript": "^4.2.4",
-    "webpack": "^5.37.0",
-    "webpack-bundle-analyzer": "^4.4.1",
-    "webpack-cli": "^4.7.0",
+    "ts-jest": "^27.0.3",
+    "ts-loader": "^9.2.3",
+    "typescript": "^4.3.2",
+    "webpack": "^5.38.1",
+    "webpack-bundle-analyzer": "^4.4.2",
+    "webpack-cli": "^4.7.2",
     "webpack-dev-server": "^3.11.2"
   },
   "scripts": {

diff --git a/src/components/ProgressiveText.tsx b/src/components/ProgressiveText.tsx
@@ -32,7 +32,11 @@ const ProgressiveText: FunctionComponent<Props> = ({ color, ...props }) => {
 	return (
 		<BitmapText
 			{...props}
-			font={`${fontSize} Press Start 2P`}
+			style={{
+				fontName: 'Press Start 2P',
+			}}
+			fontName="Press Start 2P"
+			fontSize={fontSize}
 			tint={color}
 		/>
 	);

diff --git a/src/index.ejs b/src/index.ejs
@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
-		<title>BombHopper.io's Level Editor</title>
+		<title><%= htmlWebpackPlugin.options.title %></title>
 		<%= htmlWebpackPlugin.tags.headTags %>
 		<style>
 			html, body {

diff --git a/tsconfig.json b/tsconfig.json
@@ -13,7 +13,8 @@
 		"forceConsistentCasingInFileNames": true,
 		"baseUrl": ".",
 		"paths": {
-			"src/*": ["src/*"]
+			"src/*": ["src/*"],
+			"static/*": ["static/*"]
 		}
 	}
 }
diff --git a/tsconfig.test.json b/tsconfig.test.json
diff --git a/webpack.config.js b/webpack.config.js
@@ -107,6 +107,15 @@ module.exports = {
 			// https://github.com/jantimon/html-webpack-plugin/tree/0a6568d587a82d88fd3a0617234ca98d26a1e0a6/examples/custom-insertion-position
 			// inject has to be false because we add the headTags and bodyTags manually in ejs (to position them in the best spot)
 			inject: false,
+			title: 'BombHopper.io\'s Level Editor',
+			meta: {
+				viewport: 'width=device-width, initial-scale=1, user-scalable=no',
+				description: 'Create and edit your BombHopper.io levels!',
+				keywords: 'bombhopperio, bombhopper, bomb hopper, bomb hopper io, platformer, level, editor, creator, maker',
+				'twitter:card': 'summary',
+				'twitter:creator:id': '1166876286',
+			},
+			xhtml: true,
 		}),
 	],
 	devServer: {