Merge branch 'master' into build

IPLSplatoon · Jan 27, 2022 · 55d3199 · 55d3199
2 parents 9bcd754 + 806e8d0
commit 55d3199
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,16 +42,6 @@
         ]
     },
     "license": "SEE LICENSE IN LICENSE",
-    "dependencies": {
-        "@fortawesome/fontawesome-svg-core": "^1.2.35",
-        "@fortawesome/free-brands-svg-icons": "^5.15.4",
-        "@fortawesome/free-regular-svg-icons": "^5.15.4",
-        "@fortawesome/free-solid-svg-icons": "^5.15.4",
-        "fitted-text": "^2.0.5",
-        "gsap": "npm:@gsap/shockingly@^3.8.0",
-        "lodash": "^4.17.21",
-        "luxon": "^2.0.1"
-    },
     "devDependencies": {
         "@babel/core": "^7.14.3",
         "@babel/preset-env": "^7.14.4",
@@ -82,6 +72,14 @@
         "typescript": "^4.3.2",
         "webpack": "^5.42.0",
         "webpack-cli": "^4.7.0",
-        "webpack-livereload-plugin": "^3.0.1"
+        "webpack-livereload-plugin": "^3.0.1",
+        "@fortawesome/fontawesome-svg-core": "^1.2.35",
+        "@fortawesome/free-brands-svg-icons": "^5.15.4",
+        "@fortawesome/free-regular-svg-icons": "^5.15.4",
+        "@fortawesome/free-solid-svg-icons": "^5.15.4",
+        "fitted-text": "^2.0.5",
+        "gsap": "npm:@gsap/shockingly@^3.8.0",
+        "lodash": "^4.17.21",
+        "luxon": "^2.0.1"
     }
 }