merge next

imarc · Sep 12, 2022 · 294c54f · 294c54f
1 parent 77679ce
commit 294c54f
Show file tree

Hide file tree

Showing 130 changed files with 1,680 additions and 1,834 deletions.
diff --git a/composer.json b/composer.json
@@ -19,32 +19,34 @@
     "rss": "https://craftcms.com/changelog.rss"
   },
   "require": {
-    "php": ">=7.2.5",
-    "craftcms/cms": "^3.6",
-    "craftcms/contact-form": "^2.2",
-    "craftcms/contact-form-honeypot": "^1.0",
-    "craftcms/element-api": "^2.6",
-    "craftcms/feed-me": "^4.3",
-    "craftcms/redactor": "^2.8",
-    "ether/tags": "^1.0",
-    "imarc/craft-googlecustomsearch": "^2.0",
-    "imarc/craft-kindling": "^2.0",
-    "imarc/craft-volume-permissions": "^1.0",
-    "luwes/craft3-codemirror": "^1.0",
-    "misterbk/mix": "^1.5",
-    "sebastianlenz/linkfield": "^1.0",
-    "verbb/expanded-singles": "^1.1",
-    "verbb/field-manager": "^2.2",
-    "verbb/super-table": "^2.6",
+    "php": "^8.0.2",
+    "craftcms/cms": "^4.0.0",
+    "craftcms/contact-form": "^3.0",
+    "craftcms/contact-form-honeypot": "^2.0",
+    "craftcms/element-api": "^3.0.0",
+    "craftcms/feed-me": "^5.0.4",
+    "craftcms/redactor": "^3.0.0",
+    "imarc/craft-googlecustomsearch": "^2.1",
+    "imarc/craft-pickture": "^1.0",
+    "luwes/craft3-codemirror": "dev-master",
+    "nystudio107/craft-retour": "^4.0.0",
+    "nystudio107/craft-seomatic": "^4.0.0",
+    "sebastianlenz/linkfield": "^2.1.3-rc",
+    "spicyweb/craft-neo": "^3.0",
+    "verbb/expanded-singles": "^2.0.0-beta.1",
+    "verbb/field-manager": "^3.0.0-beta.1",
+    "verbb/super-table": "^3.0.0-beta.4",
     "vlucas/phpdotenv": "^5.3",
     "wbrowar/adminbar": "^3.1",
-    "spicyweb/craft-neo": "^2.9",
-    "barrelstrength/sprout-fields": "^3.8",
-    "nystudio107/craft-seomatic": "^3.3",
-    "imarc/craft-pickture": "^1.0",
-    "nystudio107/craft-retour": "^3.1",
-    "hillholliday/craft-user-manual": "^2.1"
+    "imarc/craft-kindling": "^2.1",
+    "nystudio107/craft-vite": "^4.0"
   },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/imarc/craft-codemirror"
+    }
+  ],
   "autoload": {
     "psr-4": {
       "modules\\": "modules/"
@@ -64,8 +66,5 @@
     "post-create-project-cmd": [
       "echo -e \"\nChange into the new project's directory and run ops padstone-install\""
     ]
-  },
-  "require-dev": {
-    "roave/security-advisories": "dev-latest"
   }
 }
diff --git a/config/app.php b/config/app.php
@@ -16,10 +16,8 @@
 return [
     'modules' => [
         'site-module' => \modules\Module::class,
-        'volume-permissions' => Imarc\Craft\Modules\VolumePermissions::class,
     ],
     'bootstrap' => [
         'site-module',
-        'volume-permissions',
-    ]
+    ],
 ];
diff --git a/config/db.php b/config/db.php
@@ -6,13 +6,15 @@
  * list of the available settings in vendor/craftcms/cms/src/config/DbConfig.php.
  */
 
+use craft\helpers\App;
+
 return [
-    'driver' => $_ENV['DB_DRIVER'],
-    'server' => $_ENV['DB_SERVER'],
-    'user' => $_ENV['DB_USER'],
-    'password' => $_ENV['DB_PASSWORD'],
-    'database' => $_ENV['DB_DATABASE'],
-    'schema' => $_ENV['DB_SCHEMA'],
-    'tablePrefix' => $_ENV['DB_TABLE_PREFIX'],
-    'port' => $_ENV['DB_PORT']
+    'driver' => App::env('DB_DRIVER'),
+    'server' => App::env('DB_SERVER'),
+    'user' => App::env('DB_USER'),
+    'password' => App::env('DB_PASSWORD'),
+    'database' => App::env('DB_DATABASE'),
+    'schema' => App::env('DB_SCHEMA'),
+    'tablePrefix' => App::env('DB_TABLE_PREFIX'),
+    'port' => App::env('DB_PORT'),
 ];
diff --git a/config/general.php b/config/general.php
@@ -6,6 +6,8 @@
  * list of the available settings in vendor/craftcms/cms/src/config/GeneralConfig.php.
  */
 
+use craft\helpers\App;
+
 return [
     // Global settings
     '*' => [
@@ -22,16 +24,18 @@
         'omitScriptNameInUrls' => true,
 
         // Control Panel trigger word
-        'cpTrigger' => $_ENV['CP_TRIGGER'] ?? 'admin',
+        'cpTrigger' => App::env('CP_TRIGGER') ?? 'admin',
 
         // The secure key Craft will use for hashing and encrypting data
-        'securityKey' => $_ENV['SECURITY_KEY'],
+        'securityKey' => App::env('SECURITY_KEY'),
 
         // Whether the site should be in dev mode
-        'devMode' => $_ENV['DEV_MODE'],
+        'devMode' => App::env('DEV_MODE'),
 
-        // Use config/project.yaml as the canonical project config
-        'useProjectConfigFile' => $_ENV['USE_PROJECT_CONFIG'],
+        'aliases' => [
+            // Environment
+            '@environment' => App::env('ENVIRONMENT'),
+        ],
     ],
 
     // Dev environment settings
@@ -43,6 +47,6 @@
     ],
 
     // Production environment settings
-    'production' => [
+    'prod' => [
     ],
 ];
diff --git a/config/project/categoryGroups/blogCategories--380fab36-d288-4b53-9d1b-d5aad2afc914.yaml b/config/project/categoryGroups/blogCategories--380fab36-d288-4b53-9d1b-d5aad2afc914.yaml
@@ -25,10 +25,11 @@ fieldLayouts:
             tip: null
             title: null
             type: craft\fieldlayoutelements\TitleField
+            uid: b0e214ac-5da7-4fb4-91cd-79362fb50c1a
             warning: null
             width: 100
         name: Content
-        sortOrder: 1
+        uid: 945b2c7b-96d4-497c-9fe5-4260e30103d8
 handle: blogCategories
 name: 'Blog Categories'
 siteSettings:

diff --git a/config/project/categoryGroups/resourceTopics--ca915fd0-926d-4128-b286-ce7f553add12.yaml b/config/project/categoryGroups/resourceTopics--ca915fd0-926d-4128-b286-ce7f553add12.yaml
@@ -25,10 +25,11 @@ fieldLayouts:
             tip: null
             title: null
             type: craft\fieldlayoutelements\TitleField
+            uid: 1d06fadc-f83f-4f4f-b599-cc4febf51cc5
             warning: null
             width: 100
         name: Content
-        sortOrder: 1
+        uid: 286d52e6-3b7c-4ddd-a130-befd745e2bba
 handle: resourceTopics
 name: 'Resource Topics'
 siteSettings:

diff --git a/config/project/categoryGroups/resourceTypes--d9b26dd3-8815-474a-b2d1-df10d1da9ea4.yaml b/config/project/categoryGroups/resourceTypes--d9b26dd3-8815-474a-b2d1-df10d1da9ea4.yaml
@@ -25,10 +25,11 @@ fieldLayouts:
             tip: null
             title: null
             type: craft\fieldlayoutelements\TitleField
+            uid: 1d6ac590-f963-4e59-86ae-43b5caf018d6
             warning: null
             width: 100
         name: Content
-        sortOrder: 1
+        uid: a359910c-0963-4f11-be22-30665ae39f11
 handle: resourceTypes
 name: 'Resource Types'
 siteSettings:

diff --git a/config/project/entryTypes/alert--0bcdc18c-156d-4d49-b4fe-272e7d33ff45.yaml b/config/project/entryTypes/alert--0bcdc18c-156d-4d49-b4fe-272e7d33ff45.yaml
@@ -10,8 +10,8 @@ fieldLayouts:
             class: null
             disabled: false
             id: null
-            instructions: 'For admin reference only - not shown.'
-            label: ''
+            instructions: null
+            label: null
             max: null
             min: null
             name: null
@@ -23,20 +23,22 @@ fieldLayouts:
             step: null
             tip: null
             title: null
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
+            uid: 41c354d0-3d14-4408-889f-c613013c9d46
             warning: null
             width: 100
           -
             fieldUid: 6978af6e-566d-496d-abfc-884513d509b9 # Alert
-            instructions: ''
-            label: ''
-            required: '1'
+            instructions: null
+            label: null
+            required: true
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: 7befb4b7-37f9-4e25-b2b3-946cbc918c25
             warning: null
             width: 100
         name: Content
-        sortOrder: 1
+        uid: 155b0727-7c90-4456-bce9-26d865bc9c4d
 handle: alert
 hasTitleField: true
 name: Alert

diff --git a/config/project/entryTypes/authors--f7ade5a5-61b5-4252-b776-39dd9f92d0fc.yaml b/config/project/entryTypes/authors--f7ade5a5-61b5-4252-b776-39dd9f92d0fc.yaml
@@ -10,8 +10,8 @@ fieldLayouts:
             class: null
             disabled: false
             id: null
-            instructions: ''
-            label: Name
+            instructions: null
+            label: null
             max: null
             min: null
             name: null
@@ -23,7 +23,8 @@ fieldLayouts:
             step: null
             tip: null
             title: null
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
+            uid: a85681da-ea01-4b62-99f3-3aa8230571aa
             warning: null
             width: 100
           -
@@ -33,10 +34,11 @@ fieldLayouts:
             required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: 399417a7-3d95-4849-ae16-4cc58486c836
             warning: null
             width: 100
         name: Content
-        sortOrder: 1
+        uid: 0a9e3e9a-8b9d-4c34-aed8-08bd2f3d9db5
 handle: authors
 hasTitleField: true
 name: Authors

diff --git a/config/project/entryTypes/blog--2bce713c-e1dd-4517-8bf0-60f2c1165bc3.yaml b/config/project/entryTypes/blog--2bce713c-e1dd-4517-8bf0-60f2c1165bc3.yaml
@@ -23,61 +23,68 @@ fieldLayouts:
             step: null
             tip: null
             title: null
-            type: craft\fieldlayoutelements\EntryTitleField
+            type: craft\fieldlayoutelements\entries\EntryTitleField
+            uid: 70dd77fc-b5a6-4c07-b1c3-ac94a3f47dfe
             warning: null
             width: 100
           -
             fieldUid: fe9f15e5-2b68-477e-af16-c6e83c83e642 # Featured Image
             instructions: null
             label: null
-            required: '0'
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: 87b927c5-8e1f-4f40-9df1-bea0cef74d14
             warning: null
             width: 100
           -
             fieldUid: 2575b2df-9c7d-43dc-b00c-7c8b4a389b22 # Abstract
             instructions: null
             label: null
-            required: '0'
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: ea025335-1500-4329-8ec4-4934b98103e6
             warning: null
             width: 100
           -
             fieldUid: 2e868be5-415e-4f7c-b96c-160e9091705c # Call to Action
             instructions: null
             label: null
-            required: '0'
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: e56056f6-b8e0-464a-bb71-48ee00461d78
             warning: null
             width: 100
           -
             fieldUid: c2b63486-bb0e-42d6-9986-12cead0acc47 # Blog Date
             instructions: null
             label: null
-            required: '1'
+            required: true
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: 3055378d-fc56-49a0-b243-ed01285f12ed
             warning: null
             width: 100
           -
             fieldUid: b54bac54-a6a2-4e19-af8b-eead56deed68 # Author
             instructions: null
             label: null
-            required: '0'
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: 448ac33c-065c-4bd8-be25-48d3e951a598
             warning: null
             width: 100
           -
             fieldUid: a889cfc2-e16d-4719-88be-773bf11567f4 # Blog Categories
             instructions: null
             label: null
-            required: '0'
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: 35d07391-b46d-4ffa-81d1-91f6ffe8a194
             warning: null
             width: 100
           -
@@ -87,10 +94,11 @@ fieldLayouts:
             required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: cd9536a0-343e-476e-917c-e8fdc4334b15
             warning: null
             width: 100
         name: Content
-        sortOrder: 1
+        uid: dcfa88f5-b345-461c-9c7e-4467667a59dd
       -
         elements:
           -
@@ -100,28 +108,31 @@ fieldLayouts:
             required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: 57d72012-8aac-49d6-867e-b5dc6f23e80e
             warning: null
             width: 100
           -
             fieldUid: d1edff97-994f-4f78-9318-6cdbbdfd446d # Additional Header Code
             instructions: null
             label: null
-            required: '0'
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: 64d545d5-e964-4bdf-9569-9f8bbe8e39ae
             warning: null
             width: 100
           -
             fieldUid: e60a84f5-789c-489b-a95e-ae0419f4ae7d # Additional Footer Code
             instructions: null
             label: null
-            required: '0'
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
+            uid: 192fbec3-afa7-4a06-bdba-7af4feff8bcd
             warning: null
             width: 100
         name: SEO
-        sortOrder: 2
+        uid: 8cdb67db-09e4-4755-b730-1c0ad981f9fe
 handle: blog
 hasTitleField: true
 name: 'Blog Article'