Skip to content

Commit cc6d10d

Browse files
committed
Initial Webpack 4 configuration
1 parent 2a0d649 commit cc6d10d

File tree

7 files changed

+2198
-2597
lines changed

7 files changed

+2198
-2597
lines changed

.babelrc

Lines changed: 0 additions & 9 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 11 deletions
This file was deleted.

package.json

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
22
"name": "pterodactyl-panel",
33
"dependencies": {
4-
"cssnano": "^4.0.3",
4+
"axios": "^0.18.0",
55
"date-fns": "^1.29.0",
66
"feather-icons": "^4.10.0",
7+
"jquery": "^3.3.1",
8+
"lodash": "^4.17.11",
79
"socket.io-client": "^2.1.1",
810
"vee-validate": "^2.1.0-beta.2",
911
"vue": "^2.5.7",
@@ -15,72 +17,55 @@
1517
"xterm": "^3.5.1"
1618
},
1719
"devDependencies": {
18-
"@babel/core": "^7.0.0-beta.49",
19-
"@babel/plugin-proposal-class-properties": "^7.2.1",
20-
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.49",
21-
"@babel/plugin-transform-async-to-generator": "^7.0.0-beta.49",
22-
"@babel/plugin-transform-runtime": "^7.0.0-beta.49",
23-
"@babel/preset-env": "^7.0.0-beta.49",
20+
"@babel/cli": "^7.2.3",
21+
"@babel/core": "^7.2.2",
22+
"@babel/plugin-proposal-class-properties": "^7.3.0",
23+
"@babel/plugin-proposal-object-rest-spread": "^7.3.1",
24+
"@babel/preset-env": "^7.3.1",
2425
"@types/feather-icons": "^4.7.0",
2526
"@types/lodash": "^4.14.119",
2627
"@types/node": "^10.12.15",
2728
"@types/socket.io-client": "^1.4.32",
2829
"@types/webpack-env": "^1.13.6",
29-
"autoprefixer": "^8.2.0",
30-
"axios": "^0.18.0",
31-
"babel-cli": "6.18.0",
32-
"babel-core": "^6.26.3",
33-
"babel-eslint": "^9.0.0",
34-
"babel-loader": "^8.0.0-beta.3",
35-
"babel-plugin-transform-flow-strip-types": "^6.22.0",
36-
"babel-plugin-transform-object-assign": "^6.22.0",
37-
"babel-plugin-transform-runtime": "^6.23.0",
38-
"babel-plugin-transform-strict-mode": "^6.18.0",
39-
"babel-register": "^6.26.0",
30+
"babel-loader": "^8.0.5",
4031
"clean-webpack-plugin": "^0.1.19",
41-
"css-loader": "^0.28.11",
42-
"eslint": "^5.6.0",
43-
"eslint-config-vue": "^2.0.2",
44-
"eslint-plugin-html": "^4.0.6",
45-
"eslint-plugin-vue": "^4.7.1",
46-
"extract-text-webpack-plugin": "^4.0.0-beta.0",
32+
"css-loader": "^2.1.0",
33+
"cssnano": "^4.0.3",
4734
"glob-all": "^3.1.0",
4835
"html-webpack-plugin": "^3.2.0",
49-
"jquery": "^3.3.1",
50-
"lodash": "^4.17.5",
36+
"mini-css-extract-plugin": "^0.5.0",
5137
"postcss": "^6.0.21",
5238
"postcss-import": "^11.1.0",
53-
"postcss-loader": "^2.1.5",
39+
"postcss-loader": "^3.0.0",
5440
"postcss-preset-env": "^3.4.0",
5541
"precss": "^3.1.2",
5642
"purgecss-webpack-plugin": "^1.1.0",
57-
"style-loader": "^0.21.0",
58-
"tailwindcss": "^0.5.1",
59-
"ts-loader": "^5.3.1",
60-
"typescript": "^3.2.2",
61-
"uglifyjs-webpack-plugin": "^1.2.5",
43+
"resolve-url-loader": "^3.0.0",
44+
"style-loader": "^0.23.1",
45+
"tailwindcss": "^0.7.4",
46+
"ts-loader": "^5.3.3",
47+
"typescript": "^3.3.1",
48+
"uglifyjs-webpack-plugin": "^2.1.1",
6249
"vue-devtools": "^3.1.9",
6350
"vue-feather-icons": "^4.7.1",
64-
"vue-loader": "^14.2.2",
51+
"vue-loader": "^15.6.2",
6552
"vue-mc": "^0.2.4",
6653
"vue-template-compiler": "^2.5.16",
6754
"vueify-insert-css": "^1.0.0",
68-
"webpack": "^4.4.1",
69-
"webpack-assets-manifest": "^3.0.1",
55+
"webpack": "^4.29.0",
56+
"webpack-assets-manifest": "^3.1.1",
7057
"webpack-cli": "^3.0.2",
71-
"webpack-hot-client": "^4.0.2",
58+
"webpack-dev-server": "^3.1.14",
7259
"webpack-manifest-plugin": "^2.0.3",
73-
"webpack-serve": "^1.0.2",
7460
"webpack-shell-plugin": "^0.5.0",
7561
"webpack-stream": "^4.0.3"
7662
},
7763
"scripts": {
78-
"build:filemanager": "./node_modules/babel-cli/bin/babel.js public/themes/pterodactyl/js/frontend/files/src --source-maps --out-file public/themes/pterodactyl/js/frontend/files/filemanager.min.js",
7964
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --watch --progress",
8065
"build": "NODE_ENV=development ./node_modules/.bin/webpack --progress",
8166
"build:production": "NODE_ENV=production ./node_modules/.bin/webpack",
82-
"serve": "NODE_ENV=development webpack-serve --hot --config ./webpack.config.js --no-clipboard --progress",
83-
"v:serve": "PUBLIC_PATH=http://pterodactyl.test:8080 NODE_ENV=development webpack-serve --hot --config ./webpack.config.js --host 0.0.0.0 --no-clipboard",
67+
"serve": "NODE_ENV=development webpack-dev-server --host 0.0.0.0 --hot --hot-only",
68+
"v:serve": "PUBLIC_PATH=http://pterodactyl.test:8080 yarn run serve",
8469
"compile:assets": "php artisan vue-i18n:generate & php artisan ziggy:generate resources/assets/scripts/helpers/ziggy.js"
8570
}
8671
}

resources/assets/scripts/components/server/subpages/Console.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,5 +179,5 @@
179179
</script>
180180

181181
<style lang="postcss">
182-
@import "~xterm/src/xterm.css";
182+
/*@import "xterm/src/xterm.css";*/
183183
</style>

resources/assets/scripts/components/server/subpages/FileManager.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<script>
4545
import map from 'lodash/map';
4646
import { mapState } from 'vuex';
47-
import FileManagerFileRow from '../components/filemanager/FileManagerFileRow';
48-
import FileManagerFolderRow from '../components/filemanager/FileManagerFolderRow';
47+
import FileManagerFileRow from '../components/filemanager/FileRow';
48+
import FileManagerFolderRow from '../components/filemanager/FolderRow';
4949
import { getDirectoryContents } from '../../../api/server/getDirectoryContents';
5050
5151
export default {

0 commit comments

Comments
 (0)