Merge branch 'craft-3' of https://github.com/verbb/field-manager into craft-4

# Conflicts:
#	CHANGELOG.md
#	composer.json
#	src/controllers/BaseController.php
#	src/services/Audit.php
#	src/twigextensions/Extension.php

Author: engram-design

CHANGELOG.md

@@ -10,6 +10,15 @@
 - Now requires Craft `4.0.0+`.
 - Rename base plugin methods.
 
+## 2.2.5 - 2021-07-10
+
+### Changed
+- Revamp Neo import/export handling to support field layout elements.
+
+### Fixed
+- Improve `displayName` twig function.
+- Fix an error when exporting Neo fields with child blocks configured.
+
 ## 2.2.4 - 2021-06-30
 
 ### Fixed

config.codekit3

@@ -7,7 +7,7 @@
       "uuidString" : "ECE3F09A-2816-43C6-9715-3F4A30BD28C5"
     }
   ],
-  "creatorBuild" : "34335",
+  "creatorBuild" : "34365",
   "files" : {
     "\/.github\/FUNDING.yml" : {
       "cB" : 0,
@@ -419,6 +419,14 @@
       "oAP" : "\/src\/templates",
       "oF" : 0
     },
+    "\/src\/translations\/en\/field-manager.php" : {
+      "cB" : 0,
+      "ft" : 8192,
+      "hM" : 0,
+      "oA" : 2,
+      "oAP" : "\/src\/translations\/en\/field-manager.php",
+      "oF" : 0
+    },
     "\/src\/twigextensions\/Extension.php" : {
       "cB" : 0,
       "ft" : 8192,
@@ -444,8 +452,8 @@
     "creationDate" : 528723773,
     "displayValue" : "field-manager",
     "displayValueWasSetByUser" : 0,
-    "iconImageName" : "meme-ariel",
-    "iconImageWasSetByUser" : 0
+    "iconImageName" : "brackets-koamaru",
+    "iconImageWasSetByUser" : 1
   },
   "projectSettings" : {
     "abortBuildOnError" : 1,
@@ -795,10 +803,6 @@
         "active" : 0,
         "optionString" : "'1tbs', {'allowSingleLine': true}"
       },
-      "callback-return" : {
-        "active" : 0,
-        "optionString" : "['callback', 'cb', 'next']"
-      },
       "camelcase" : {
         "active" : 0,
         "optionString" : "{'properties': 'always'}"
@@ -890,6 +894,10 @@
         "active" : 0,
         "optionString" : "'expression'"
       },
+      "function-call-argument-newline" : {
+        "active" : 0,
+        "optionString" : "'always'"
+      },
       "function-paren-newline" : {
         "active" : 0,
         "optionString" : "'multiline'"
@@ -902,21 +910,14 @@
         "active" : 0,
         "optionString" : "{'allowImplicit': false}"
       },
-      "global-require" : {
-        "active" : 0
-      },
       "grouped-accessor-pairs" : {
         "active" : 0,
         "optionString" : "'anyOrder'"
       },
       "guard-for-in" : {
         "active" : 0
       },
-      "handle-callback-err" : {
-        "active" : 0,
-        "optionString" : "'err'"
-      },
-      "id-blacklist" : {
+      "id-denylist" : {
         "active" : 0,
         "optionString" : "'data', 'err', 'e', 'cb', 'callback'"
       },
@@ -1040,9 +1041,6 @@
         "active" : 0,
         "optionString" : "{'allow': ['~'], 'int32Hint': true}"
       },
-      "no-buffer-constructor" : {
-        "active" : 0
-      },
       "no-caller" : {
         "active" : 0
       },
@@ -1070,6 +1068,9 @@
       "no-const-assign" : {
         "active" : 1
       },
+      "no-constant-binary-expression" : {
+        "active" : 0
+      },
       "no-constant-condition" : {
         "active" : 1,
         "optionString" : "{'checkLoops': true}"
@@ -1104,6 +1105,9 @@
       "no-dupe-keys" : {
         "active" : 1
       },
+      "no-duplicate-case" : {
+        "active" : 1
+      },
       "no-duplicate-imports" : {
         "active" : 0,
         "optionString" : "{'includeExports': false}"
@@ -1145,7 +1149,7 @@
       "no-extra-boolean-cast" : {
         "active" : 1
       },
-      "no-extra-labels" : {
+      "no-extra-label" : {
         "active" : 0
       },
       "no-extra-parens" : {
@@ -1233,10 +1237,6 @@
         "active" : 0,
         "optionString" : "{'groups': [['+', '-', '*', '\/', '%', '**'], ['&', '|', '^', '~', '<<', '>>', '>>>'], ['==', '!=', '===', '!==', '>', '>=', '<', '<='], ['&&', '||'], ['in', 'instanceof']], 'allowSamePrecedence': true}"
       },
-      "no-mixed-requires" : {
-        "active" : 0,
-        "optionString" : "{'grouping': false, 'allowCall': false }"
-      },
       "no-mixed-spaces-and-tabs" : {
         "active" : 0,
         "optionString" : ""
@@ -1271,9 +1271,6 @@
       "no-new-object" : {
         "active" : 0
       },
-      "no-new-require" : {
-        "active" : 0
-      },
       "no-new-symbol" : {
         "active" : 1
       },
@@ -1296,19 +1293,10 @@
         "active" : 0,
         "optionString" : "{'props': false}"
       },
-      "no-path-concat" : {
-        "active" : 0
-      },
       "no-plusplus" : {
         "active" : 0,
         "optionString" : "{'allowForLoopAfterthoughts': false}"
       },
-      "no-process-env" : {
-        "active" : 0
-      },
-      "no-process-exit" : {
-        "active" : 0
-      },
       "no-promise-executor-return" : {
         "active" : 0
       },
@@ -1336,10 +1324,6 @@
       "no-restricted-imports" : {
         "active" : 0
       },
-      "no-restricted-modules" : {
-        "active" : 0,
-        "optionString" : ""
-      },
       "no-restricted-properties" : {
         "active" : 0,
         "optionString" : "[{'object': 'disallowedObjectName', 'property': 'disallowedPropertyName'}, {'object': 'disallowedObjectName', 'property': 'anotherDisallowedPropertyName', 'message': 'Please use allowedObjectName.allowedPropertyName.'}]"
@@ -1382,10 +1366,6 @@
       "no-sparse-arrays" : {
         "active" : 1
       },
-      "no-sync" : {
-        "active" : 0,
-        "optionString" : "{'allowAtRootLevel': false}"
-      },
       "no-tabs" : {
         "active" : 0,
         "optionString" : ""
@@ -1617,10 +1597,6 @@
       "require-await" : {
         "active" : 0
       },
-      "require-jsdoc" : {
-        "active" : 0,
-        "optionString" : "{'require': {'FunctionDeclaration': true, 'MethodDefinition': false, 'ClassDeclaration': false, 'ArrowFunctionExpression': false}}"
-      },
       "require-unicode-regexp" : {
         "active" : 0
       },
@@ -1706,10 +1682,6 @@
         "active" : 1,
         "optionString" : ""
       },
-      "valid-jsdoc" : {
-        "active" : 0,
-        "optionString" : "{'prefer': {'return': 'returns'}, 'requireReturn': true, 'requireReturnDescription': true, 'requireReturnType': true, 'requireParamDescription': true}"
-      },
       "valid-typeof" : {
         "active" : 1,
         "optionString" : "{'requireStringLiterals': true}"
@@ -2210,6 +2182,10 @@
         "active" : 0,
         "flagValue" : -1
       },
+      "keep_numbers" : {
+        "active" : 0,
+        "flagValue" : -1
+      },
       "keep_quoted_props" : {
         "active" : 0,
         "flagValue" : -1
@@ -2234,6 +2210,10 @@
         "active" : 1,
         "flagValue" : 1
       },
+      "preserve_annotations" : {
+        "active" : 0,
+        "flagValue" : -1
+      },
       "properties" : {
         "active" : 1,
         "flagValue" : -1
@@ -2338,6 +2318,10 @@
         "active" : 0,
         "flagValue" : -1
       },
+      "wrap_func_args" : {
+        "active" : 1,
+        "flagValue" : -1
+      },
       "wrap_iife" : {
         "active" : 0,
         "flagValue" : -1

src/controllers/BaseController.php

@@ -349,4 +349,4 @@ public function actionImport(): ?Response
 
         return null;
     }
-}
+}

src/translations/en/field-manager.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+
+];