Merge pull request #113 from kirschbaum-development/feature/nova-4-support

Nova 4 Upgrade

Author: luisdalmolin

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ jobs:
   phpunit:
     runs-on: ubuntu-latest
     container:
-      image: kirschbaumdevelopment/laravel-test-runner:7.3.0
+      image: kirschbaumdevelopment/laravel-test-runner:8.0
 
     services:
       mysql:
@@ -23,8 +23,7 @@ jobs:
         fetch-depth: 1
 
     - name: Configure composer for Nova
-      run: |
-        composer config "http-basic.nova.laravel.com" "${{ secrets.NOVA_USERNAME }}" "${{ secrets.NOVA_PASSWORD }}"
+      run: composer config 'http-basic.nova.laravel.com' '${{ secrets.NOVA_USERNAME }}' '${{ secrets.NOVA_LICENSE_KEY }}'
 
     - name: Install composer dependencies
       run: |

.github/workflows/code-style.yml

@@ -4,7 +4,7 @@ jobs:
   php-cs-fixer:
     runs-on: ubuntu-latest
     container:
-      image: kirschbaumdevelopment/laravel-test-runner:7.3.0
+      image: kirschbaumdevelopment/laravel-test-runner:8.0
 
     steps:
     - uses: actions/checkout@v1

.gitignore

@@ -6,6 +6,9 @@ composer.phar
 composer.lock
 phpunit.xml
 .phpunit.result.cache
+.php-cs-fixer.cache
 .DS_Store
 Thumbs.db
 .php_cs.cache
+
+auth.json

.php_cs renamed to .php-cs-fixer.php

@@ -9,7 +9,7 @@
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setFinder($finder)
     ->setRules([
         '@PSR2' => true,
@@ -20,9 +20,14 @@
         ],
         'no_singleline_whitespace_before_semicolons' => true,
         'no_extra_blank_lines' => [
-            'break', 'case', 'continue', 'curly_brace_block', 'default',
-            'extra', 'parenthesis_brace_block', 'return',
-            'square_brace_block', 'switch', 'throw', 'use', 'useTrait', 'use_trait',
+            'tokens' => [
+                'curly_brace_block',
+                'extra',
+                'parenthesis_brace_block',
+                'square_brace_block',
+                'throw',
+                'use',
+            ]
         ],
         'cast_spaces' => [
             'space' => 'single',
@@ -43,7 +48,7 @@
         // 'increment_style' => ['style' => 'post'],
         'short_scalar_cast' => true,
         'class_attributes_separation' => [
-            'elements' => ['const', 'method', 'property'],
+            'elements' => ['method' => 'one',],
         ],
         'no_mixed_echo_print' => [
             'use' => 'echo',
@@ -54,7 +59,7 @@
         ],
         'no_empty_statement' => true,
         'unary_operator_spaces' => true, // $number ++ becomes $number++
-        'hash_to_slash_comment' => true, // # becomes //
+        'single_line_comment_style' => true, // # becomes //
         'standardize_not_equals' => true, // <> becomes !=
         'native_function_casing' => true,
         'ternary_operator_spaces' => true,
@@ -64,16 +69,7 @@
         ],
         'function_typehint_space' => true,
         'no_leading_import_slash' => true,
-        'blank_line_before_statement' => [
-            'statements' => [
-                'break', 'case', 'continue',
-                'declare', 'default', 'die',
-                'do', 'exit', 'for', 'foreach',
-                'goto', 'if', 'include',
-                'include_once', 'require', 'require_once',
-                'return', 'switch', 'throw', 'try', 'while', 'yield',
-            ],
-        ],
+        'blank_line_before_statement' => true,
         'combine_consecutive_unsets' => true,
         'method_chaining_indentation' => true,
         'no_whitespace_in_blank_line' => true,
@@ -84,7 +80,7 @@
         'compact_nullable_typehint' => true,
         'explicit_string_variable' => true,
         'no_leading_namespace_whitespace' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'not_operator_with_successor_space' => true,
         'object_operator_without_whitespace' => true,
         'single_blank_line_before_namespace' => true,
@@ -113,7 +109,7 @@
                 'protected',
                 'private',
             ],
-            'sortAlgorithm' => 'none',
+            'sort_algorithm' => 'none',
         ],
         'return_type_declaration' => [
             'space_before' => 'none',

composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=7.1.0"
+        "php": "^7.4|^8.0"
     },
     "repositories": [
         {
@@ -16,11 +16,10 @@
         }
     ],
     "require-dev": {
-        "codedungeon/phpunit-result-printer": "^0.26.2",
-        "orchestra/testing": "^4.0",
-        "phpunit/phpunit": "^8.3",
+        "orchestra/testbench": "^7.4",
+        "phpunit/phpunit": "^9.5.10",
         "mockery/mockery": "^1.1",
-        "laravel/nova": "*"
+        "laravel/nova": "4.2"
     },
     "autoload": {
         "psr-4": {

dist/css/field.css

@@ -0,0 +1 @@
+

dist/js/field.js

@@ -0,0 +1,21 @@
+/*!
+ * vuex v4.1.0
+ * (c) 2022 Evan You
+ * @license MIT
+ */
+
+/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
+ * 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
+ */
+
+/**!
+ * Sortable 1.14.0
+ * @author	RubaXa   <[email protected]>
+ * @author	owenm    <[email protected]>
+ * @license MIT
+ */

dist/js/field.js.LICENSE.txt

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

dist/mix-manifest.json

@@ -0,0 +1,40 @@
+const mix = require('laravel-mix');
+const webpack = require('webpack');
+const path = require('path');
+
+class NovaExtension {
+    name() {
+        return 'nova-extension';
+    }
+
+    register(name) {
+        this.name = name;
+    }
+
+    webpackPlugins() {
+        return new webpack.ProvidePlugin({
+            _: 'lodash',
+            Errors: 'form-backend-validation',
+        });
+    }
+
+    webpackConfig(webpackConfig) {
+        webpackConfig.externals = {
+            vue: 'Vue',
+        };
+
+        webpackConfig.resolve.alias = {
+            ...(webpackConfig.resolve.alias || {}),
+            'laravel-nova': path.join(
+                __dirname,
+                '../../vendor/laravel/nova/resources/js/mixins/packages.js'
+            ),
+        };
+
+        webpackConfig.output = {
+            uniqueName: this.name,
+        };
+    }
+}
+
+mix.extend('nova', new NovaExtension())