More dependency management adjustments

Author: DaneEveritt

composer.json

@@ -50,7 +50,8 @@
         "fzaninotto/faker": "^1.6",
         "mockery/mockery": "^1.0",
         "php-mock/php-mock-phpunit": "^2.0",
-        "phpunit/phpunit": "~6.4.0"
+        "phpunit/phpunit": "~6.4.0",
+        "tightenco/ziggy": "^0.5.0"
     },
     "autoload": {
         "classmap": [

composer.lock

@@ -6,7 +6,6 @@ const gulp = require('gulp');
 const gulpif = require('gulp-if');
 const postcss = require('gulp-postcss');
 const rev = require('gulp-rev');
-const tailwindcss = require('tailwindcss');
 const uglify = require('gulp-uglify-es').default;
 const webpackStream = require('webpack-stream');
 const webpackConfig = require('./webpack.config.js');
@@ -19,11 +18,11 @@ const paths = {
     manifest: './public/assets',
     assets: './public/assets/{css,scripts}/*.{css,js}',
     styles: {
-        src: './resources/assets/pterodactyl/styles/**/*.css',
+        src: './resources/assets/pterodactyl/styles/main.css',
         dest: './public/assets/css',
     },
     scripts: {
-        src: './resources/assets/pterodactyl/scripts/**/*.js',
+        src: './resources/assets/pterodactyl/scripts/**/*.{js,vue}',
         dest: './public/assets/scripts',
     },
 };
@@ -35,8 +34,8 @@ function styles() {
     return gulp.src(paths.styles.src)
         .pipe(postcss([
             require('postcss-import'),
+            require('tailwindcss')('./tailwind.js'),
             require('postcss-preset-env')({stage: 0}),
-            tailwindcss('./tailwind.js'),
             require('autoprefixer'),
         ]))
         .pipe(gulpif(argv.production, cssmin()))
@@ -69,7 +68,7 @@ function watch() {
         return del(['./public/assets/css/**/*.css']);
     }, styles));
 
-    gulp.watch([paths.scripts.src, paths.vue.src], gulp.series(function cleanScripts() {
+    gulp.watch(paths.scripts.src, gulp.series(function cleanScripts() {
         return del(['./public/assets/scripts/**/*.js']);
     }, scripts));
 }

gulpfile.js

@@ -6,10 +6,12 @@
         "babel-cli": "6.18.0",
         "babel-core": "^6.26.0",
         "babel-loader": "^7.1.4",
+        "babel-plugin-transform-object-assign": "^6.22.0",
         "babel-plugin-transform-runtime": "^6.23.0",
         "babel-plugin-transform-strict-mode": "^6.18.0",
         "babel-preset-es2015": "^6.24.1",
         "babel-register": "^6.26.0",
+        "css-loader": "^0.28.11",
         "del": "^3.0.0",
         "gulp": "^4.0.0",
         "gulp-babel": "^7.0.1",
@@ -32,6 +34,8 @@
         "vue-axios": "^2.1.1",
         "vue-devtools": "^3.1.9",
         "vue-loader": "^14.2.2",
+        "vue-router": "^3.0.1",
+        "vue-template-compiler": "^2.5.16",
         "vueify-insert-css": "^1.0.0",
         "webpack": "^4.4.1",
         "webpack-stream": "^4.0.3",

package.json

@@ -19,7 +19,7 @@ module.exports = {
             },
             {
                 test: /\.js$/,
-                exclude: /(node_modules)/,
+                exclude: /(node_modules|vendor)/,
                 use: [{
                     loader: "babel-loader",
                     options: { presets: ['es2015'] }
@@ -29,7 +29,8 @@ module.exports = {
     },
     resolve: {
         alias: {
-            'vue': 'vue/dist/vue.js'
+            // 'vue': 'vue/dist/vue.js'
+            'vue$': 'vue/dist/vue.esm.js'
         },
         extensions: ['*', '.js', '.vue', '.json']
     },