From fe4d283311f33620d1390fe5c3b1febb3134481e Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 13 Feb 2022 13:00:52 -0500
Subject: [PATCH] Fix feature pathing

---
 package.json                                               | 3 +--
 .../server/features/{eula => }/EulaModalFeature.tsx        | 0
 .../{java_version => }/JavaVersionModalFeature.tsx         | 0
 resources/scripts/components/server/features/index.ts      | 2 +-
 webpack.config.js                                          | 2 +-
 yarn.lock                                                  | 7 -------
 6 files changed, 3 insertions(+), 11 deletions(-)
 rename resources/scripts/components/server/features/{eula => }/EulaModalFeature.tsx (100%)
 rename resources/scripts/components/server/features/{java_version => }/JavaVersionModalFeature.tsx (100%)

diff --git a/package.json b/package.json
index 0e6890294..c7ed805f3 100644
--- a/package.json
+++ b/package.json
@@ -7,10 +7,9 @@
         "watch": "$npm_execpath cross-env NODE_ENV=development $npm_execpath webpack --watch --progress",
         "build": "$npm_execpath cross-env NODE_ENV=development $npm_execpath webpack --progress",
         "build:production": "$npm_execpath run clean && $npm_execpath cross-env NODE_ENV=production $npm_execpath webpack --mode production",
-        "serve": "$npm_execpath run clean && $npm_execpath cross-env PUBLIC_PATH=https://pterodactyl.test:8080 NODE_ENV=development $npm_execpath webpack-dev-server --host 0.0.0.0 --hot --https --key /etc/ssl/private/pterodactyl.test-key.pem --cert /etc/ssl/private/pterodactyl.test.pem"
+        "serve": "$npm_execpath run clean && $npm_execpath cross-env WEBPACK_PUBLIC_PATH=/webpack@hmr/ NODE_ENV=development $npm_execpath webpack-dev-server --host 0.0.0.0 --port 8080 --public https://pterodactyl.test --hot"
     },
     "dependencies": {
-        "@": "link:./resources/scripts",
         "@codemirror/autocomplete": "^0.19.0",
         "@codemirror/closebrackets": "^0.19.0",
         "@codemirror/commands": "^0.19.0",
diff --git a/resources/scripts/components/server/features/eula/EulaModalFeature.tsx b/resources/scripts/components/server/features/EulaModalFeature.tsx
similarity index 100%
rename from resources/scripts/components/server/features/eula/EulaModalFeature.tsx
rename to resources/scripts/components/server/features/EulaModalFeature.tsx
diff --git a/resources/scripts/components/server/features/java_version/JavaVersionModalFeature.tsx b/resources/scripts/components/server/features/JavaVersionModalFeature.tsx
similarity index 100%
rename from resources/scripts/components/server/features/java_version/JavaVersionModalFeature.tsx
rename to resources/scripts/components/server/features/JavaVersionModalFeature.tsx
diff --git a/resources/scripts/components/server/features/index.ts b/resources/scripts/components/server/features/index.ts
index 6dcba53e6..a0be5daef 100644
--- a/resources/scripts/components/server/features/index.ts
+++ b/resources/scripts/components/server/features/index.ts
@@ -6,7 +6,7 @@ import { lazy } from 'react';
  * whenever they are actually loaded for the client (which may be never, depending
  * on the feature and the egg).
  */
-const EulaModalFeature = lazy(() => import(/* webpackChunkName: "feature.eula" */'@feature/eula/EulaModalFeature'));
+const EulaModalFeature = lazy(() => import(/* webpackChunkName: "feature.eula" */'@feature/EulaModalFeature'));
 const JavaVersionModalFeature = lazy(() => import(/* webpackChunkName: "feature.java_version" */'@feature/JavaVersionModalFeature'));
 const GSLTokenModalFeature = lazy(() => import(/* webpackChunkName: "feature.gsl_token" */'@feature/GSLTokenModalFeature'));
 const PIDLimitModalFeature = lazy(() => import(/* webpackChunkName: "feature.pid_limit" */'@feature/PIDLimitModalFeature'));
diff --git a/webpack.config.js b/webpack.config.js
index 2f26af1cc..40deffd22 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -60,7 +60,7 @@ module.exports = {
         extensions: ['.ts', '.tsx', '.js', '.json'],
         alias: {
             '@': path.join(__dirname, '/resources/scripts'),
-            'feature': path.join(__dirname, '/resources/scripts/components/server/features'),
+            '@feature': path.join(__dirname, '/resources/scripts/components/server/features'),
             'react-dom': '@hot-loader/react-dom',
         },
         symlinks: false,
diff --git a/yarn.lock b/yarn.lock
index 105f55e58..86467635c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,12 +5,6 @@ __metadata:
   version: 4
   cacheKey: 8
 
-"@@link:./resources/scripts::locator=pterodactyl-panel%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@@link:./resources/scripts::locator=pterodactyl-panel%40workspace%3A."
-  languageName: node
-  linkType: soft
-
 "@babel/code-frame@npm:7.12.11":
   version: 7.12.11
   resolution: "@babel/code-frame@npm:7.12.11"
@@ -10207,7 +10201,6 @@ fsevents@^1.2.7:
   version: 0.0.0-use.local
   resolution: "pterodactyl-panel@workspace:."
   dependencies:
-    "@": "link:./resources/scripts"
     "@babel/core": ^7.16.0
     "@babel/plugin-proposal-class-properties": ^7.16.0
     "@babel/plugin-proposal-nullish-coalescing-operator": ^7.16.0