Merge pull request #9 from a2nt/v5

SilverStripe v5.*

.env.dist

@@ -6,4 +6,17 @@ SS_DATABASE_NAME=''
 SS_DEFAULT_ADMIN_USERNAME=''
 SS_DEFAULT_ADMIN_PASSWORD=''
 
-SS_ENVIRONMENT_TYPE='dev'
+SS_ENVIRONMENT_TYPE='dev'
+
+
+NOCAPTCHA_SITE_KEY=''
+NOCAPTCHA_SECRET_KEY=''
+
+TURNSTILE_SITE_KEY=''
+TURNSTILE_SECRET_KEY=''
+
+GOOGLEMAPS_API_KEY=''
+MAPBOX_API_KEY=''
+
+APP_SMTP_USERNAME=''
+APP_SMTP_PASSWORD=''

.gitignore

@@ -9,4 +9,7 @@
 /silverstripe-cache
 yarn-error\.log
 package-lock.json
-pnpm-lock.yaml
+pnpm-lock.yaml
+public/_resources
+.graphql-generated
+public/_graphql

app/_config.php

@@ -1,5 +1,10 @@
 <?php
 
+use SilverStripe\Core\EnvironmentLoader;
+
+$env = BASE_PATH . '/app/.env';
+$loader = new EnvironmentLoader();
+$loader->loadFile($env);
 /*\SilverStripe\Core\Config\Config::modify()->set(
     \SilverStripe\Control\Email\Email::class,
     'bcc_all_emails_to',//'cc_all_emails_to',

app/_config/options-elements.yml

@@ -14,14 +14,14 @@ SilverStripe\CMS\Model\SiteTree:
     - DNADesign\ElementalList\Model\ElementList
     - DNADesign\Elemental\Models\ElementContent
     - DNADesign\ElementalUserForms\Model\ElementForm
-    - Dynamic\Elements\Image\Elements\ElementImage
-    - Dynamic\Elements\Blog\Elements\ElementBlogPosts
-    - Dynamic\Elements\Oembed\Elements\ElementOembed
-    - Dynamic\Elements\Elements\ElementTestimonials
+    #- Dynamic\Elements\Image\Elements\ElementImage
+    #- Dynamic\Elements\Blog\Elements\ElementBlogPosts
+    #- Dynamic\Elements\Oembed\Elements\ElementOembed
+    #- Dynamic\Elements\Elements\ElementTestimonials
     #- A2nt\ElementalBasics\Elements\TeamMembersElement
     - A2nt\ElementalBasics\Elements\SliderElement
-    - A2nt\ElementalBasics\Elements\MapElement
-    #- A2nt\ElementalBasics\Elements\AccordionElement
+    #- A2nt\ElementalBasics\Elements\MapElement
+    - A2nt\ElementalBasics\Elements\AccordionElement
     - DNADesign\ElementalVirtual\Model\ElementVirtual
     - A2nt\ElementalBasics\Elements\AccordionElement
     - A2nt\ElementalBasics\Elements\CustomSnippetElement

app/_config/templates-requirements.yml

@@ -3,18 +3,6 @@ Name: webapp-templates-requirements
 After:
   - a2nt-cms-niceties-templates-requirements
 ---
-A2nt\CMSNiceties\Templates\DeferredRequirements:
-  nofontawesome: false
-  version: false
-  static_domain: false
-  deferred: true
-  noreact: true
-  nojquery: true
-  jquery_version: '`JQUERY_VER`'
-  fontawesome_svg: false
-
-SilverStripe\FontAwesome\FontAwesomeField:
-  version: '`FONTAWESOME_VER`'
 
 SilverStripe\View\Requirements:
   disable_flush_combined: true

app/_config/templates-themes.yml

@@ -4,6 +4,20 @@ After:
   - webapp-options-elements
   - a2nt-cms-niceties-templates-themes
 ---
+
+A2nt\CMSNiceties\Templates\DeferredRequirements:
+  nofontawesome: false
+  version: false
+  static_domain: false
+  deferred: true
+  noreact: true
+  nojquery: true
+  jquery_version: '3.7.1'
+  fontawesome_svg: false
+
+SilverStripe\FontAwesome\FontAwesomeField:
+  version: '6.5.1'
+
 SilverStripe\View\SSViewer:
   source_file_comments: false
   themes:
@@ -25,5 +39,5 @@ Only:
   environment: dev
 ---
 SilverStripe\View\SSViewer:
-  source_file_comments: true
+  source_file_comments: false
 

app/src/Pages/Page.php

@@ -19,7 +19,6 @@
  * @mixin \DNADesign\Elemental\Extensions\ElementalPageExtension
  * @mixin \A2nt\CMSNiceties\Widgets\WidgetPageExtension
  * @mixin \A2nt\CMSNiceties\GraphQL\ObjectGraphQlEx
- * @mixin \Sheadawson\Linkable\Extensions\LinkableDataExtension
  */
 class Page extends SiteTree
 {

app/src/Pages/PageController.php

@@ -18,14 +18,18 @@
  * @method \Page data()
  * @mixin \Page
  * @mixin \A2nt\CMSNiceties\Extensions\PageControllerEx
- * @mixin \A2nt\CMSNiceties\Ajax\Ex\AjaxLoginFormControllerEx
- * @mixin \App\Service\Ex\ServiceSignUpControllerEx
+ * @mixin \A2nt\CMSNiceties\Ajax\Ex\AjaxControllerEx
  */
 class PageController extends ContentController
 {
     private static $graphql_resources = [];
     private static $ajax_resources = [];
 
+    public function ElementalArea()
+    {
+        return $this->dataRecord->ElementalArea();
+    }
+
     public function getViewer($action)
     {
         // Manually set templates should be dealt with by Controller::getViewer()

composer.json

@@ -10,7 +10,7 @@
   "require": {
     "php": ">=8",
     "ext-json": "*",
-    "silverstripe/recipe-cms": "^4",
+    "silverstripe/recipe-cms": "^5",
     "silverstripe/recipe-plugin": "*",
     "wilr/silverstripe-googlesitemaps": "*",
     "silverstripe/userforms": "*",
@@ -19,39 +19,30 @@
     "jonom/silverstripe-betternavigator": "*",
     "silverstripe/externallinks": "*",
     "symbiote/silverstripe-gridfieldextensions": "*",
-    "colymba/gridfield-bulk-editing-tools": "*",
+    "colymba/gridfield-bulk-editing-tools": "^4",
     "dnadesign/silverstripe-elemental-list": "*",
     "dnadesign/silverstripe-elemental-virtual": "*",
     "dnadesign/silverstripe-elemental-userforms": "*",
-    "dynamic/silverstripe-elemental-blocks": "*",
     "axllent/silverstripe-version-truncator": "*",
-    "gorriecoe/silverstripe-dataobjecthistory": "*",
     "axllent/silverstripe-bootstrap-forms": "*",
     "silverstripe/redirectedurls": "*",
     "undefinedoffset/silverstripe-nocaptcha": "*",
     "stevie-mayhew/silverstripe-svg": "*",
-    "betterbrief/silverstripe-googlemapfield": "*",
     "innoweb/silverstripe-sitemap": "*",
     "silverstripe/multiuser-editing-alert": "*",
     "silverstripe/environmentcheck": "*",
     "a2nt/silverstripe-font-awesome-field": "dev-master",
-    "a2nt/silverstripe-mapboxfield": "dev-master",
     "a2nt/silverstripe-progressivewebapp": "dev-master",
-    "a2nt/silverstripe-elemental-basics": "*",
-    "a2nt/cms-niceties": "dev-main",
-    "a2nt/silverstripe-live-checks": "*",
     "bummzack/sortablefile": "*",
     "ezyang/htmlpurifier": "^4.13",
     "endroid/qr-code": "^3.9",
     "jonom/focuspoint": "*",
-    "symbiote/silverstripe-addressable": "dev-master",
     "silverstripe/login-forms": "*",
-    "webbuilders-group/silverstripe-image-cropper-field": "dev-master",
-    "dynamic/silverstripe-linkable": "*",
-    "axllent/silverstripe-trailing-slash": "^2.2",
-    "sunnysideup/dataintegritytests": "*",
-    "derralf/elemental-archive-report": "*",
-    "webbuilders-group/silverstripe-turnstile": "^1.1"
+    "axllent/silverstripe-trailing-slash": "*",
+    "webbuilders-group/silverstripe-turnstile": "*",
+    "a2nt/cms-niceties": "*",
+    "dynamic/flexslider": "^5",
+    "dynamic/silverstripe-elemental-flexslider": "^2.0@dev"
   },
   "require-dev": {
     "phpunit/phpunit": "*",
@@ -81,11 +72,11 @@
     },
     {
       "type": "vcs",
-      "url": "https://github.com/a2nt/GridFieldBulkEditingTools"
+      "url": "https://github.com/a2nt/silverstripe-dataintegritytests"
     },
     {
       "type": "vcs",
-      "url": "https://github.com/a2nt/silverstripe-dataintegritytests"
+      "url": "https://github.com/a2nt/silverstripe-flexslider"
     }
   ],
   "extra": {
@@ -127,4 +118,4 @@
   },
   "prefer-stable": true,
   "minimum-stability": "dev"
-}
+}

env-dist

@@ -19,6 +19,3 @@ MAPBOX_API_KEY=''
 
 APP_SMTP_USERNAME=''
 APP_SMTP_PASSWORD=''
-
-FONTAWESOME_VER='6.5.1'
-JQUERY_VER='3.4.1'

package.json

@@ -37,9 +37,9 @@
     "@a2nt/meta-lightbox-js": "^4.2.8",
     "@a2nt/mithril-ui": "^1.1.5",
     "@a2nt/ss-bootstrap-ui-webpack-boilerplate-react": "^5.3.5",
-    "@angular/common": "^17.3.2",
-    "@angular/core": "^17.3.2",
-    "@apollo/client": "^3.9.9",
+    "@angular/common": "^17.3.5",
+    "@angular/core": "^17.3.5",
+    "@apollo/client": "^3.9.11",
     "@glidejs/glide": "^3.6.0",
     "@popperjs/core": "^2.11.8",
     "@turf/clone": "^6.5.0",
@@ -69,7 +69,7 @@
     "localforage-cordovasqlitedriver": "^1.8.0",
     "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
-    "mapbox-gl": "^3.2.0",
+    "mapbox-gl": "^3.3.0",
     "material-design-color": "^2.3.2",
     "minimatch": "^9.0.4",
     "mithril": "^2.2.2",
@@ -90,18 +90,18 @@
   },
   "devDependencies": {
     "@a2nt/image-sprite-webpack-plugin": "^0.2.5",
-    "@babel/core": "^7.24.3",
+    "@babel/core": "^7.24.4",
     "@babel/eslint-parser": "^7.24.1",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/plugin-syntax-jsx": "^7.24.1",
     "@babel/plugin-syntax-top-level-await": "^7.14.5",
     "@babel/plugin-transform-react-jsx": "^7.23.4",
     "@babel/plugin-transform-runtime": "^7.24.3",
-    "@babel/plugin-transform-typescript": "^7.24.1",
-    "@babel/preset-env": "^7.24.3",
+    "@babel/plugin-transform-typescript": "^7.24.4",
+    "@babel/preset-env": "^7.24.4",
     "@babel/preset-react": "^7.24.1",
-    "@babel/runtime": "^7.24.1",
+    "@babel/runtime": "^7.24.4",
     "@googlemaps/markerclusterer": "^2.5.3",
     "@sucrase/webpack-loader": "^2.0.0",
     "@ungap/global-this": "^0.4.4",
@@ -118,7 +118,7 @@
     "copy-webpack-plugin": "^12.0.2",
     "croppie": "^2.6.5",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.10.0",
+    "css-loader": "^7.1.1",
     "css-minimizer-webpack-plugin": "^6.0.0",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
@@ -144,8 +144,8 @@
     "img-optimize-loader": "^1.0.7",
     "js-yaml": "^4.1.0",
     "loglevel": "^1.9.1",
-    "mini-css-extract-plugin": "^2.8.1",
-    "msw": "^2.2.13",
+    "mini-css-extract-plugin": "^2.9.0",
+    "msw": "^2.2.14",
     "node-fetch": "^3.3.2",
     "object-assign": "^4.1.1",
     "optimism": "^0.17.5",
@@ -162,15 +162,15 @@
     "resolve-url-loader": "^5.0.0",
     "rimraf": "^5.0.5",
     "routie": "0.0.1",
-    "sass": "^1.72.0",
+    "sass": "^1.75.0",
     "sass-lint": "^1.13.1",
     "sass-lint-auto-fix": "^0.21.2",
     "sass-lint-fix": "^1.12.1",
-    "sass-loader": "^14.1.1",
+    "sass-loader": "^14.2.1",
     "scheduler": "^0.23.0",
     "shallowequal": "^1.1.0",
     "strip-ansi": "^7.1.0",
-    "style-loader": "^3.3.4",
+    "style-loader": "^4.0.0",
     "sucrase": "^3.35.0",
     "svg-url-loader": "^8.0.0",
     "symbol-observable": "^4.0.0",
@@ -181,7 +181,7 @@
     "url-loader": "^4.1.1",
     "webpack": "^5.91.0",
     "webpack-build-notifications": "^0.3.2",
-    "webpack-bundle-analyzer": "^4.10.1",
+    "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4",
     "webpack-manifest-plugin": "^5.0.0",

public/index.php

@@ -3,7 +3,6 @@
 use SilverStripe\Control\HTTPApplication;
 use SilverStripe\Control\HTTPRequestBuilder;
 use SilverStripe\Core\CoreKernel;
-use SilverStripe\Core\Startup\ErrorControlChainMiddleware;
 
 // Find autoload.php
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
@@ -22,6 +21,5 @@
 // Default application
 $kernel = new CoreKernel(BASE_PATH);
 $app = new HTTPApplication($kernel);
-$app->addMiddleware(new ErrorControlChainMiddleware($app));
 $response = $app->handle($request);
 $response->output();