Merge pull request #34 from GeneaLabs/develop

Develop

composer.json

@@ -16,8 +16,8 @@
     "require": {
         "laravel/nova": "^3.0",
         "symfony/thanks": "^1.2",
-        "unisharp/laravel-filemanager": "^1.9",
-        "van-ons/laraberg": "0.0.6-beta"
+        "unisharp/laravel-filemanager": "^2.0",
+        "van-ons/laraberg": "^1.1"
     },
     "autoload": {
         "psr-4": {

dist/js/field.js.LICENSE.txt

@@ -0,0 +1,15 @@
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @license  MIT
+ */
+
+/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright JS Foundation and other contributors <https://js.foundation/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */

dist/mix-manifest.json

@@ -1,4 +1,4 @@
 {
     "/js/field.js": "/js/field.js",
     "/css/field.css": "/css/field.css"
-}
+}

package.json

@@ -3,16 +3,20 @@
     "scripts": {
         "dev": "npm run development",
         "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch": "npm run development -- --watch",
         "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
         "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "cross-env": "^5.0.0",
-        "laravel-mix": "^1.0",
+        "cross-env": "^5.1",
+        "laravel-mix": "^5.0",
         "laravel-nova": "^1.0",
-        "vue": "^2.5.0"
+        "resolve-url-loader": "^3.1.0",
+        "sass": "^1.26.10",
+        "sass-loader": "^8.0.2",
+        "vue": "^2.5",
+        "vue-template-compiler": "^2.6.11"
     }
 }

resources/js/components/FormField.vue

@@ -13,14 +13,6 @@ export default {
         'resourceName',
     ],
 
-    created: function () {
-        if (window.Laraberg.editor != null) {
-            window.location.reload();
-            // window.Laraberg.editor = null;
-            // window.wp = null;
-        }
-    },
-
     mounted: function () {
         Laraberg.init(this.field.name, {
             laravelFilemanager: true,

src/FieldServiceProvider.php

@@ -15,8 +15,8 @@ public function boot()
     {
         Nova::serving(function (ServingNova $event) {
             Nova::script('nova-gutenberg', __DIR__ . '/../dist/js/field.js');
-            Nova::script("nova-gutenberg-react", "https://unpkg.com/react@16.6.3/umd/react.production.min.js");
-            Nova::script("nova-gutenberg-react-dom", "https://unpkg.com/react-dom@16.6.3/umd/react-dom.production.min.js");
+            Nova::script("nova-gutenberg-react", "https://unpkg.com/react@16.8.6/umd/react.production.min.js");
+            Nova::script("nova-gutenberg-react-dom", "https://unpkg.com/react-dom@16.8.6/umd/react-dom.production.min.js");
             // Nova::script("nova-gutenberg-moment", "https://unpkg.com/moment@2.22.1/min/moment.min.js");
             Nova::script("nova-gutenberg-jquery", "https://code.jquery.com/jquery-1.12.4.min.js");
             Nova::script("nova-gutenberg-laraberg", base_path("vendor/van-ons/laraberg/public/js/laraberg.js"));

webpack.mix.js

@@ -1,5 +1,7 @@
-let mix = require('laravel-mix')
+const mix = require("laravel-mix");
 
-mix.setPublicPath('dist')
+mix
+    .setPublicPath('dist')
     .js('resources/js/field.js', 'js')
     .sass('resources/sass/field.scss', 'css')
+;