PNPM update

app/_config/api-captcha.yml

@@ -11,8 +11,8 @@ SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension:
   default_spam_protector: UndefinedOffset\NoCaptcha\Forms\NocaptchaProtector
 
 UndefinedOffset\NoCaptcha\Forms\NocaptchaField:
-  site_key: '6LfKgywaAAAAAH2VuHILbaNoUs0p0YZBNbNGyIsh' #Your site key (required)
+  site_key: '`NOCAPTCHA_SITE_KEY`' #Your site key (required)
-  secret_key: '6LfKgywaAAAAAJ0mxLSg1pZQIqui1gXSp2GGRKbY' #Your secret key (required)
+  secret_key: '`NOCAPTCHA_SECRET_KEY`' #Your secret key (required)
   verify_ssl: true #Allows you to disable php-curl's SSL peer verification by setting this to false (optional, defaults to true)
   default_theme: 'light' #Default theme color (optional, light or dark, defaults to light)
   default_type: 'image' #Default captcha type (optional, image or audio, defaults to image)

app/_config/api-map.yml

@@ -19,10 +19,10 @@ A2nt\ElementalBasics\Elements\MapElement:
 
 BetterBrief\GoogleMapField:
   default_options:
-    api_key: ''
+    api_key: '`GOOGLEMAPS_API_KEY`'
 
 Symbiote\Addressable\MapboxGeocodeService:
-  mapbox_api_key: ''
+  mapbox_api_key: '`MAPBOX_API_KEY`'
 
 SilverStripe\SiteConfig\SiteConfig:
   map_type: "google-maps"

app/_config/cache.yml

@@ -0,0 +1,12 @@
+---
+Name: app-cache
+After:
+  - app-basics
+---
+
+SilverStripe\Core\Injector\Injector:
+  Psr\SimpleCache\CacheInterface.appCache:
+    factory: SilverStripe\Core\Cache\CacheFactory
+    constructor:
+      namespace: "appCache"
+      defaultLifetime: 3600

app/_config/templates-requirements.yml

@@ -10,11 +10,11 @@ A2nt\CMSNiceties\Templates\DeferredRequirements:
   deferred: true
   noreact: true
   nojquery: true
-  jquery_version: '3.4.1'
+  jquery_version: '`JQUERY_VER`'
   fontawesome_svg: false
 
 SilverStripe\FontAwesome\FontAwesomeField:
-  version: '6.4.2'
+  version: '`FONTAWESOME_VER`'
 
 SilverStripe\View\Requirements:
   disable_flush_combined: true

app/client/dist/records.json

@@ -355,18 +355,18 @@
   "modules": {
     "byIdentifier": {
       "./app/client/src/img|sync|nonrecursive|/\\.(png%7Cwebp%7Cjpg%7Cjpeg%7Cgif%7Csvg)$/": 2103,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./app/client/src/js/app.js|eb4107b6469981f1941805b531f96e3b": 6216,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./app/client/src/js/app.js|96aeff5a970a7cc6192560b4746a059f": 9270,
       "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./app/client/src/js/types/SilverShop.Page.CheckoutPageController.js": 90,
       "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./app/client/src/js/types/Site.Controllers.MapElementController.js|7710c2d960b7303acdac06c60f564d3b": 9718,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@0.0.7_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/_events.js": 9200,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@1.0.2_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/_events.js": 893,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@0.0.7_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/graphql.js": 8016,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@1.0.2_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/graphql.js": 2090,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@0.0.7_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/index.js": 2397,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@1.0.2_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/index.js": 4514,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@0.0.7_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/page/index.js": 7806,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@1.0.2_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/page/index.js": 4964,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@0.0.7_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/page/resources.js": 3316,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@1.0.2_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/page/resources.js": 3460,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@0.0.7_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/page/tpl.js": 9370,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@1.0.2_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/page/tpl.js": 2667,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@0.0.7_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/queries/page.js": 3966,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@1.0.2_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/queries/page.js": 6985,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@0.0.7_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/router.js": 9880,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@1.0.2_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/ui/router.js": 5752,
-      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@0.0.7_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/util/getParents.js": 9533,
+      "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+mithril-ui@1.0.2_@popperjs+core@2.11.8/node_modules/@a2nt/mithril-ui/src/js/util/getParents.js": 8023,
       "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/@a2nt+ss-bootstrap-ui-webpack-boilerplate-react@5.0.9_zone.js@0.13.3/node_modules/@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/js/main/funcs.js": 9095,
       "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/fast-deep-equal@3.1.3/node_modules/fast-deep-equal/index.js": 1082,
       "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.23.2_webpack@5.89.0/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/mithril@2.2.2/node_modules/mithril/api/mount-redraw.js": 7481,
@@ -416,6 +416,7 @@
       90,
       499,
       809,
+      893,
       1082,
       1090,
       1225,
@@ -423,49 +424,48 @@
       1545,
       1712,
       1989,
+      2090,
       2103,
       2119,
-      2397,
       2584,
       2597,
+      2667,
       2776,
       2941,
       2982,
-      3316,
+      3460,
       3526,
       3565,
       3665,
-      3966,
       4023,
+      4514,
       4595,
       4782,
       4811,
       4903,
+      4964,
       5334,
       5415,
       5598,
+      5752,
       5954,
-      6216,
       6461,
       6743,
+      6985,
       7464,
       7481,
-      7806,
       7815,
-      8016,
+      8023,
       8392,
       8679,
       8764,
       9095,
       9164,
-      9200,
+      9270,
-      9370,
-      9533,
       9535,
       9718,
       9759,
-      9843,
+      9843
-      9880
     ]
   }
 }

env-dist

@@ -7,3 +7,15 @@ SS_DEFAULT_ADMIN_USERNAME=''
 SS_DEFAULT_ADMIN_PASSWORD=''
 
 SS_ENVIRONMENT_TYPE='dev'
+
+NOCAPTCHA_SITE_KEY=''
+NOCAPTCHA_SECRET_KEY=''
+
+GOOGLEMAPS_API_KEY=''
+MAPBOX_API_KEY=''
+
+APP_SMTP_USERNAME=''
+APP_SMTP_PASSWORD=''
+
+FONTAWESOME_VER='6.4.2'
+JQUERY_VER='3.4.1'

package.json

@@ -34,8 +34,8 @@
     "ie>=11"
   ],
   "dependencies": {
-    "@a2nt/meta-lightbox-js": "^4.2.7",
+    "@a2nt/meta-lightbox-js": "^4.2.8",
-    "@a2nt/mithril-ui": "^0.0.7",
+    "@a2nt/mithril-ui": "^1.0.2",
     "@a2nt/ss-bootstrap-ui-webpack-boilerplate-react": "^5.0.9",
     "@angular/common": "^16.2.11",
     "@angular/core": "^16.2.11",
@@ -51,10 +51,10 @@
     "@turf/meta": "^6.5.0",
     "aos": "^2.3.4",
     "apollo3-cache-persist": "^0.14.1",
-    "balanced-match": "^2.0.0",
+    "balanced-match": "^3.0.1",
     "bootbox": "^6.0.0",
     "bootstrap": "^5.3.2",
-    "brace-expansion": "^2.0.1",
+    "brace-expansion": "^3.0.0",
     "charming": "^3.0.2",
     "density-clustering": "^1.3.0",
     "eslint-scope": "^7.2.2",
@@ -107,7 +107,7 @@
     "@ungap/global-this": "^0.4.4",
     "@wry/context": "^0.7.4",
     "@wry/equality": "^0.5.7",
-    "@wry/trie": "^0.4.3",
+    "@wry/trie": "^0.5.0",
     "animate.css": "^4.1.1",
     "ansi-html": "^0.0.9",
     "ansi-html-community": "^0.0.8",
@@ -136,23 +136,23 @@
     "file-loader": "^6.2.0",
     "graphql-tag": "^2.12.6",
     "hoist-non-react-statics": "^3.3.2",
-    "html-dom-parser": "^4.0.1",
+    "html-dom-parser": "^5.0.4",
     "html-entities": "^2.4.0",
     "html-loader": "^4.2.0",
-    "html-react-parser": "^4.2.9",
+    "html-react-parser": "^5.0.3",
     "html-webpack-plugin": "^5.5.3",
     "img-optimize-loader": "^1.0.7",
     "js-yaml": "^4.1.0",
     "loglevel": "^1.8.1",
     "mini-css-extract-plugin": "^2.7.6",
-    "msw": "^1.3.2",
+    "msw": "^2.0.1",
     "node-fetch": "^3.3.2",
     "object-assign": "^4.1.1",
     "optimism": "^0.17.5",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
     "postcss-loader": "^7.3.3",
     "prop-types": "^15.8.1",
-    "punycode": "^2.3.0",
+    "punycode": "^2.3.1",
     "querystring": "^0.2.1",
     "raw-loader": "^4.0.2",
     "react-hot-loader": "^4.13.1",