Merge branch 'release/2.6.3' into devmode-vite

Andrew Welch · Andrew Welch · commit 83c0e8e23c96 · 2022-04-27T16:29:43.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/devmode Change Log
 
+## 2.6.3 - 2022.04.28
+### Changed
+* Updated to Craft CMS `4.0.0-RC1` & latest Composer deps
+
 ## 2.6.2 - 2022.04.15
 ### Changed
 * Remove `enableLogging` and `enableProfiling` from `config/db.php` as they've now gone away
diff --git a/buildchain/package-lock.json b/buildchain/package-lock.json
diff --git a/cms/composer.lock b/cms/composer.lock
diff --git a/cms/config/project/entryTypes/about--cc4ea2bd-3bde-4bad-8f72-272fcc3c2a19.yaml b/cms/config/project/entryTypes/about--cc4ea2bd-3bde-4bad-8f72-272fcc3c2a19.yaml
@@ -16,6 +16,6 @@ fieldLayouts:
 handle: about
 hasTitleField: true
 name: About
-section: 486a0853-47b2-4509-97ad-43fe3ec42074
+section: 486a0853-47b2-4509-97ad-43fe3ec42074 # About
 sortOrder: 1
 titleFormat: ''
diff --git a/cms/config/project/entryTypes/calendar--7f6ad724-41b7-4a93-bef9-7de87d1bb23e.yaml b/cms/config/project/entryTypes/calendar--7f6ad724-41b7-4a93-bef9-7de87d1bb23e.yaml
@@ -1,7 +1,7 @@
 handle: calendar
 hasTitleField: true
 name: Calendar
-section: a1eaefb7-b32a-436d-a218-3fc7be02c917
+section: a1eaefb7-b32a-436d-a218-3fc7be02c917 # Calendar
 sortOrder: 1
 titleFormat: '{section.name|raw}'
 titleLabel: Title
diff --git a/cms/config/project/entryTypes/episodes--913ea665-c268-4177-8054-fe76f80101c6.yaml b/cms/config/project/entryTypes/episodes--913ea665-c268-4177-8054-fe76f80101c6.yaml
@@ -112,7 +112,7 @@ fieldLayouts:
 handle: episodes
 hasTitleField: true
 name: Episodes
-section: c1f6af30-7375-4feb-92ef-a3ed16ba69b2
+section: c1f6af30-7375-4feb-92ef-a3ed16ba69b2 # Episodes
 sortOrder: 1
 titleFormat: null
 titleTranslationKeyFormat: null
diff --git a/cms/config/project/entryTypes/episodesIndex--50012289-791c-48b2-8df1-31a8f5eb5380.yaml b/cms/config/project/entryTypes/episodesIndex--50012289-791c-48b2-8df1-31a8f5eb5380.yaml
@@ -1,7 +1,7 @@
 handle: episodesIndex
 hasTitleField: false
 name: 'Episodes Index'
-section: 1a66bf43-6fcc-4a78-bf36-0f350b930430
+section: 1a66bf43-6fcc-4a78-bf36-0f350b930430 # Episodes Index
 sortOrder: 1
 titleFormat: '{section.name|raw}'
 titleLabel: null
diff --git a/cms/config/project/entryTypes/genericError--e81379aa-e0c7-45c0-b506-c4ab8fce6bce.yaml b/cms/config/project/entryTypes/genericError--e81379aa-e0c7-45c0-b506-c4ab8fce6bce.yaml
@@ -24,6 +24,6 @@ fieldLayouts:
 handle: genericError
 hasTitleField: true
 name: 'Generic Error'
-section: 519413e8-a432-4cfe-98c5-5f81e9519f2a
+section: 519413e8-a432-4cfe-98c5-5f81e9519f2a # Generic Error
 sortOrder: 1
 titleFormat: null
diff --git a/cms/config/project/entryTypes/guests--032dc0eb-27cf-4034-ad36-dc8c274a455e.yaml b/cms/config/project/entryTypes/guests--032dc0eb-27cf-4034-ad36-dc8c274a455e.yaml
@@ -36,6 +36,6 @@ fieldLayouts:
 handle: guests
 hasTitleField: true
 name: Guests
-section: 214e4dc6-a454-4df0-a1f5-cd94ecdab53f
+section: 214e4dc6-a454-4df0-a1f5-cd94ecdab53f # Guests
 sortOrder: 1
 titleFormat: null
diff --git a/cms/config/project/entryTypes/homepage--9aae2c4b-7316-4ee9-a2d1-41474766b361.yaml b/cms/config/project/entryTypes/homepage--9aae2c4b-7316-4ee9-a2d1-41474766b361.yaml
@@ -1,7 +1,7 @@
 handle: homepage
 hasTitleField: true
 name: Homepage
-section: a9d3a609-1f18-4cb7-afc3-3c103a7e09de
+section: a9d3a609-1f18-4cb7-afc3-3c103a7e09de # Homepage
 sortOrder: 1
 titleFormat: null
 titleLabel: Title
diff --git a/cms/config/project/entryTypes/notFound--78ad1f1e-5dc5-4cff-b19f-43aa4ec02869.yaml b/cms/config/project/entryTypes/notFound--78ad1f1e-5dc5-4cff-b19f-43aa4ec02869.yaml
@@ -24,6 +24,6 @@ fieldLayouts:
 handle: notFound
 hasTitleField: false
 name: '404 Not Found'
-section: 52b673e7-3d80-44a4-94f7-43eaafcc9d6f
+section: 52b673e7-3d80-44a4-94f7-43eaafcc9d6f # 404 Not Found
 sortOrder: 1
 titleFormat: '{section.name|raw}'
diff --git a/cms/config/project/entryTypes/serviceUnavailable--29da80bf-c705-441b-be33-96df307c84c6.yaml b/cms/config/project/entryTypes/serviceUnavailable--29da80bf-c705-441b-be33-96df307c84c6.yaml
@@ -24,6 +24,6 @@ fieldLayouts:
 handle: serviceUnavailable
 hasTitleField: true
 name: '503 Service Unavailable'
-section: 9089688f-6602-4d69-91cd-ec9a94c4bc6f
+section: 9089688f-6602-4d69-91cd-ec9a94c4bc6f # 503 Service Unavailable
 sortOrder: 1
 titleFormat: null
diff --git a/cms/config/project/entryTypes/siteOffline--a4be3483-f316-4f96-8820-3914ad7b863a.yaml b/cms/config/project/entryTypes/siteOffline--a4be3483-f316-4f96-8820-3914ad7b863a.yaml
@@ -24,6 +24,6 @@ fieldLayouts:
 handle: siteOffline
 hasTitleField: true
 name: 'Site Offline'
-section: 5f70b9e0-f42b-4fdb-bcf6-5e82691d89de
+section: 5f70b9e0-f42b-4fdb-bcf6-5e82691d89de # Site Offline
 sortOrder: 1
 titleFormat: null
diff --git a/cms/config/project/fields/episodeGuests--7e338b73-ac10-44cf-892e-04afc0164991.yaml b/cms/config/project/fields/episodeGuests--7e338b73-ac10-44cf-892e-04afc0164991.yaml
@@ -10,7 +10,7 @@ settings:
   selectionLabel: ''
   source: null
   sources:
-    - 'section:214e4dc6-a454-4df0-a1f5-cd94ecdab53f'
+    - 'section:214e4dc6-a454-4df0-a1f5-cd94ecdab53f' # Guests
   targetSiteId: null
   viewMode: null
 translationKeyFormat: null
diff --git a/cms/config/project/fields/episodeMedia--0090f7a3-1e22-4fb5-9ae0-01de38805601.yaml b/cms/config/project/fields/episodeMedia--0090f7a3-1e22-4fb5-9ae0-01de38805601.yaml
@@ -7,13 +7,13 @@ searchable: true
 settings:
   allowedKinds:
     - audio
-  defaultUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99'
+  defaultUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99' # Devmode Episodes
   defaultUploadLocationSubpath: ''
   limit: '1'
   localizeRelations: false
   restrictFiles: '1'
   selectionLabel: ''
-  singleUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99'
+  singleUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99' # Devmode Episodes
   singleUploadLocationSubpath: ''
   source: null
   sources: '*'
diff --git a/cms/config/project/fields/episodeTranscript--523395ea-5738-4ca5-a119-f32221ea5ca8.yaml b/cms/config/project/fields/episodeTranscript--523395ea-5738-4ca5-a119-f32221ea5ca8.yaml
@@ -10,7 +10,7 @@ settings:
   allowUploads: true
   allowedKinds:
     - text
-  defaultUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99'
+  defaultUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99' # Devmode Episodes
   defaultUploadLocationSubpath: ''
   limit: '1'
   localizeRelations: false
@@ -20,7 +20,7 @@ settings:
   showSiteMenu: false
   showUnpermittedFiles: false
   showUnpermittedVolumes: false
-  singleUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99'
+  singleUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99' # Devmode Episodes
   singleUploadLocationSubpath: ''
   source: null
   sources:
diff --git a/cms/config/project/fields/errorImage--4d90d0e7-b705-4035-b396-2f82ce5bb871.yaml b/cms/config/project/fields/errorImage--4d90d0e7-b705-4035-b396-2f82ce5bb871.yaml
@@ -17,7 +17,7 @@ settings:
   singleUploadLocationSubpath: ''
   source: null
   sources:
-    - 'volume:7540db37-7ec3-4471-9de6-36bde06e949a'
+    - 'volume:7540db37-7ec3-4471-9de6-36bde06e949a' # Devmode Site
   targetSiteId: null
   useSingleFolder: ''
   validateRelatedElements: ''
diff --git a/cms/config/project/fields/relatedEpisodes--07f04bdf-277d-4010-9fbe-497cd9593324.yaml b/cms/config/project/fields/relatedEpisodes--07f04bdf-277d-4010-9fbe-497cd9593324.yaml
@@ -13,7 +13,7 @@ settings:
   showSiteMenu: false
   source: null
   sources:
-    - 'section:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
+    - 'section:c1f6af30-7375-4feb-92ef-a3ed16ba69b2' # Episodes
   targetSiteId: null
   validateRelatedElements: false
   viewMode: null
diff --git a/cms/config/project/fields/showImage--bda219fa-bace-4d8b-ad3a-08243caaf6ca.yaml b/cms/config/project/fields/showImage--bda219fa-bace-4d8b-ad3a-08243caaf6ca.yaml
@@ -10,7 +10,7 @@ settings:
   allowUploads: true
   allowedKinds:
     - image
-  defaultUploadLocationSource: 'volume:7540db37-7ec3-4471-9de6-36bde06e949a'
+  defaultUploadLocationSource: 'volume:7540db37-7ec3-4471-9de6-36bde06e949a' # Devmode Site
   defaultUploadLocationSubpath: ''
   limit: '1'
   localizeRelations: false
@@ -20,11 +20,11 @@ settings:
   showSiteMenu: true
   showUnpermittedFiles: false
   showUnpermittedVolumes: true
-  singleUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99'
+  singleUploadLocationSource: 'volume:e69c8edb-d562-4367-9a05-91a6fd2c7d99' # Devmode Episodes
   singleUploadLocationSubpath: ''
   source: null
   sources:
-    - 'volume:7540db37-7ec3-4471-9de6-36bde06e949a'
+    - 'volume:7540db37-7ec3-4471-9de6-36bde06e949a' # Devmode Site
   targetSiteId: null
   useSingleFolder: false
   validateRelatedElements: false
diff --git a/cms/config/project/project.yaml b/cms/config/project/project.yaml
@@ -1,4 +1,4 @@
-dateModified: 1649462884
+dateModified: 1651086403
 email:
   fromEmail: andrew@nystudio107.com
   fromName: devMode
@@ -80,66 +80,66 @@ graphql:
 meta:
   __names__:
     0c790066-43c5-4b67-b6d9-8492fa40cf71: Show # Show
-    1a66bf43-6fcc-4a78-bf36-0f350b930430: 'Episodes Index'
+    1a66bf43-6fcc-4a78-bf36-0f350b930430: 'Episodes Index' # Episodes Index
     1be1c156-82fa-4f08-bb63-6d3417da2844: 'Optimized Images' # Optimized Images
     2a4761bd-2461-4db9-96a0-4f52b8cef633: devMode # devMode
     4d90d0e7-b705-4035-b396-2f82ce5bb871: 'Error Image' # Error Image
-    5f70b9e0-f42b-4fdb-bcf6-5e82691d89de: 'Site Offline'
+    5f70b9e0-f42b-4fdb-bcf6-5e82691d89de: 'Site Offline' # Site Offline
     6def66f0-2a8f-4b88-9435-7f9cc1ccfe9c: 'Show Genre' # Show Genre
     7e338b73-ac10-44cf-892e-04afc0164991: 'Episode Guests' # Episode Guests
     07f04bdf-277d-4010-9fbe-497cd9593324: 'Related Episodes' # Related Episodes
     8c9dd611-b43b-4e22-b076-3f6a6362c93e: 'Episode Reference Links' # Episode Reference Links
     12aa936c-807f-4ec3-81dc-69283a344171: Profile # Profile
     18d7721b-780b-4a44-976a-716c3df0bb7a: 'Error Headline' # Error Headline
-    19dfdfbb-837c-46d5-87bf-e6540df98dc4: Hosts
+    19dfdfbb-837c-46d5-87bf-e6540df98dc4: Hosts # Hosts
     19e4e8ba-93c2-4a86-8c57-9b54d46e0981: Site # Site
-    29da80bf-c705-441b-be33-96df307c84c6: '503 Service Unavailable'
+    29da80bf-c705-441b-be33-96df307c84c6: '503 Service Unavailable' # 503 Service Unavailable
     31b8c511-37f9-4d83-956d-5aa215572122: 'Profile URL' # Profile URL
-    032dc0eb-27cf-4034-ad36-dc8c274a455e: Guests
+    032dc0eb-27cf-4034-ad36-dc8c274a455e: Guests # Guests
     41fdb4c8-4774-4101-918f-1412190b085b: 'Profile Optimized Images' # Profile Optimized Images
-    52b673e7-3d80-44a4-94f7-43eaafcc9d6f: '404 Not Found'
-    78ad1f1e-5dc5-4cff-b19f-43aa4ec02869: '404 Not Found'
+    52b673e7-3d80-44a4-94f7-43eaafcc9d6f: '404 Not Found' # 404 Not Found
+    78ad1f1e-5dc5-4cff-b19f-43aa4ec02869: '404 Not Found' # 404 Not Found
     087ee23d-4f8f-42d4-af12-99fcc2462247: 'Show Info' # Show Info
     88db3e41-57f4-404d-b3ea-762b09c37afe: Errors # Errors
     0090f7a3-1e22-4fb5-9ae0-01de38805601: 'Episode Media' # Episode Media
-    98f56e95-4be6-4238-a110-1f21574fa642: 'Devmode Users'
-    214e4dc6-a454-4df0-a1f5-cd94ecdab53f: Guests
+    98f56e95-4be6-4238-a110-1f21574fa642: 'Devmode Users' # Devmode Users
+    214e4dc6-a454-4df0-a1f5-cd94ecdab53f: Guests # Guests
     324e7a11-3346-41e7-a29d-4636ab907e51: 'Episode Number' # Episode Number
     380e3b7e-07de-4d39-b0e5-360f5e87d00d: 'Profile Title' # Profile Title
     406c20cb-9b86-4b0d-9123-1ce57220e2a8: 'Profile Twitter URL' # Profile Twitter URL
     428ec106-b2d1-4d48-a5fa-de192155dff5: 'Show URL' # Show URL
-    486a0853-47b2-4509-97ad-43fe3ec42074: About
+    486a0853-47b2-4509-97ad-43fe3ec42074: About # About
     913ea665-c268-4177-8054-fe76f80101c6: Episodes # Episodes
     2405ed1c-fd52-4264-a96a-f6e6fab437b5: 'Show Sub-Title' # Show Sub-Title
-    7540db37-7ec3-4471-9de6-36bde06e949a: 'Devmode Site'
-    9436ac5e-44de-4fe9-be59-fd1f0fc26941: Owners
+    7540db37-7ec3-4471-9de6-36bde06e949a: 'Devmode Site' # Devmode Site
+    9436ac5e-44de-4fe9-be59-fd1f0fc26941: Owners # Owners
     34348a98-83b9-4f2d-8e14-0437ec964a15: devMode # devMode
     49649e9a-033b-4ddf-9f3d-26a480502993: About # About
     61953a92-8b34-4678-9bae-fd5a45142f26: 'Episode Tags' # Episode Tags
-    519413e8-a432-4cfe-98c5-5f81e9519f2a: 'Generic Error'
+    519413e8-a432-4cfe-98c5-5f81e9519f2a: 'Generic Error' # Generic Error
     523395ea-5738-4ca5-a119-f32221ea5ca8: 'Episode Transcript' # Episode Transcript
     8011817c-9518-4a31-9aa8-cad6d4a08b81: 'Episode Summary' # Episode Summary
-    9089688f-6602-4d69-91cd-ec9a94c4bc6f: '503 Service Unavailable'
+    9089688f-6602-4d69-91cd-ec9a94c4bc6f: '503 Service Unavailable' # 503 Service Unavailable
     9687721c-33b8-4a40-abb7-5c42e07ce274: 'Profile Bio' # Profile Bio
     14605669-4768-4f57-88d6-1f06480a9b80: 'Show iTunes URL' # Show iTunes URL
     86909527-3ec4-4d57-a44c-167649eb86bf: 'Show Description' # Show Description
-    a1eaefb7-b32a-436d-a218-3fc7be02c917: Calendar
-    a4be3483-f316-4f96-8820-3914ad7b863a: 'Site Offline'
+    a1eaefb7-b32a-436d-a218-3fc7be02c917: Calendar # Calendar
+    a4be3483-f316-4f96-8820-3914ad7b863a: 'Site Offline' # Site Offline
     a5cf9c0d-1797-4a60-8c47-bc28c5f01a95: 'Episode Hosts' # Episode Hosts
     a8f2ec1a-a218-451c-a658-e3c600ddb5fa: 'Show Title' # Show Title
-    a9d3a609-1f18-4cb7-afc3-3c103a7e09de: Homepage
+    a9d3a609-1f18-4cb7-afc3-3c103a7e09de: Homepage # Homepage
     ab0ca0e9-1308-472f-92a5-2ab0cbd84943: 'Show RSS Feed URL' # Show RSS Feed URL
     b5eb01ec-a6ed-4a08-9438-64e7138b08f0: FAQs # FAQs
     bd8ef0d7-f73b-4138-ac52-c14d11dd780e: 'Devmode Transcripts' # Devmode Transcripts
     bda219fa-bace-4d8b-ad3a-08243caaf6ca: 'Show Image' # Show Image
     bfbd2913-36d8-4e54-9f9c-644e793f0ae9: Episodes # Episodes
     c05161c0-a294-4d47-8909-1cfc88c2f970: 'Profile Company' # Profile Company
-    c1f6af30-7375-4feb-92ef-a3ed16ba69b2: Episodes
+    c1f6af30-7375-4feb-92ef-a3ed16ba69b2: Episodes # Episodes
     ca279869-925f-4960-865c-96cacd2aa942: 'Show Email' # Show Email
-    cc4ea2bd-3bde-4bad-8f72-272fcc3c2a19: About
+    cc4ea2bd-3bde-4bad-8f72-272fcc3c2a19: About # About
     d6df6fe7-14f3-42a3-9949-dcee7c8c26d9: 'Profile GitHub URL' # Profile GitHub URL
-    e69c8edb-d562-4367-9a05-91a6fd2c7d99: 'Devmode Episodes'
-    e81379aa-e0c7-45c0-b506-c4ab8fce6bce: 'Generic Error'
+    e69c8edb-d562-4367-9a05-91a6fd2c7d99: 'Devmode Episodes' # Devmode Episodes
+    e81379aa-e0c7-45c0-b506-c4ab8fce6bce: 'Generic Error' # Generic Error
     e1087165-5769-428d-bf14-c98e6011cf5e: 'Error Text' # Error Text
     eecc24bf-e253-43b8-b327-632e0dc07fa6: 'Show Technologies Links' # Show Technologies Links
 plugins:
@@ -321,5 +321,5 @@ system:
   live: true
   name: devMode.fm
   retryDuration: 60
-  schemaVersion: 4.0.0.8
+  schemaVersion: 4.0.0.9
   timeZone: America/New_York
diff --git a/cms/config/project/users/groups/hosts--19dfdfbb-837c-46d5-87bf-e6540df98dc4.yaml b/cms/config/project/users/groups/hosts--19dfdfbb-837c-46d5-87bf-e6540df98dc4.yaml
@@ -44,10 +44,10 @@ permissions:
   - 'seomatic:tracking-scripts:hubspot'
   - 'seomatic:tracking-scripts'
   - 'seomatic:plugin-settings'
-  - 'viewentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'saveentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'viewpeerentrydrafts:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'savepeerentrydrafts:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'viewpeerentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'savepeerentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2'
-  - 'assignusergroup:19dfdfbb-837c-46d5-87bf-e6540df98dc4'
+  - 'viewentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2' # Episodes
+  - 'saveentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2' # Episodes
+  - 'viewpeerentrydrafts:c1f6af30-7375-4feb-92ef-a3ed16ba69b2' # Episodes
+  - 'savepeerentrydrafts:c1f6af30-7375-4feb-92ef-a3ed16ba69b2' # Episodes
+  - 'viewpeerentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2' # Episodes
+  - 'savepeerentries:c1f6af30-7375-4feb-92ef-a3ed16ba69b2' # Episodes
+  - 'assignusergroup:19dfdfbb-837c-46d5-87bf-e6540df98dc4' # Hosts
diff --git a/cms/config/project/users/groups/owners--9436ac5e-44de-4fe9-be59-fd1f0fc26941.yaml b/cms/config/project/users/groups/owners--9436ac5e-44de-4fe9-be59-fd1f0fc26941.yaml
@@ -1,4 +1,4 @@
 handle: owners
 name: Owners
 permissions:
-  - 'assignusergroup:9436ac5e-44de-4fe9-be59-fd1f0fc26941'
+  - 'assignusergroup:9436ac5e-44de-4fe9-be59-fd1f0fc26941' # Owners
diff --git a/cms/config/project/users/users.yaml b/cms/config/project/users/users.yaml
@@ -2,5 +2,5 @@ allowPublicRegistration: false
 deactivateByDefault: false
 defaultGroup: ''
 photoSubpath: ''
-photoVolumeUid: 98f56e95-4be6-4238-a110-1f21574fa642
+photoVolumeUid: 98f56e95-4be6-4238-a110-1f21574fa642 # Devmode Users
 requireEmailVerification: true
