Skip to content

d11 prep.2 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pingevt merged 5 commits into from
Jul 12, 2025
Merged

d11 prep.2 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58221cd
chore: update better_exposed_filters and devel mods
pingevt Jul 12, 2025
0a3088c
chore: update more contrib modules for d11 prep
pingevt Jul 12, 2025
2155d7a
chore: a few more contrib module updates
pingevt Jul 12, 2025
7032131
chore: upgrade site monitor
pingevt Jul 12, 2025
299c0a7
chore: Upgrading npmm and bldr
pingevt Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .ci/scripts/env/init-env-vars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
#!/usr/bin/env node

var fs = require('fs');
const CONFIG = require('../../../.projectconfig.js');
const CONFIG = require('../../../.projectconfig.cjs');

// Check for required variables.

let errs = [];
if (!CONFIG.TZ) {
errs.push("The 'TZ' variable needs to be set in .projectconfig.js");
errs.push("The 'TZ' variable needs to be set in .projectconfig.cjs");
}
if (!CONFIG.TEMP_DIR) {
errs.push("The 'TEMP_DIR' variable needs to be set in .projectconfig.js");
errs.push("The 'TEMP_DIR' variable needs to be set in .projectconfig.cjs");
}
if (!CONFIG.CMS_PLATFORM) {
errs.push("The 'CMS_PLATFORM' variable needs to be set in .projectconfig.js");
errs.push("The 'CMS_PLATFORM' variable needs to be set in .projectconfig.cjs");
}
if (!CONFIG.DEFAULT_SITE) {
errs.push("The 'DEFAULT_SITE' variable needs to be set in .projectconfig.js");
errs.push("The 'DEFAULT_SITE' variable needs to be set in .projectconfig.cjs");
}
if (!CONFIG.testingPaths) {
errs.push("The 'testingPaths' variable needs to be set in .projectconfig.js");
errs.push("The 'testingPaths' variable needs to be set in .projectconfig.cjs");
}

if (errs.length > 0) {
Expand All @@ -30,4 +30,4 @@ if (errs.length > 0) {


// Save Config as settings.
fs.writeFileSync('.projectconfig.json', JSON.stringify(CONFIG, null, 2));
fs.writeFileSync('.projectconfig.cjson', JSON.stringify(CONFIG, null, 2));
10 changes: 5 additions & 5 deletions .ci/scripts/env/init-env-vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,28 @@ node ./.ci/scripts/env/init-env-vars.js


# TZ: "/usr/share/zoneinfo/America/New_York"
TZ=$(cat .projectconfig.json | jq -r '.TZ')
TZ=$(cat .projectconfig.cjson | jq -r '.TZ')
if [ "$TZ" == "null" ]
then
TZ="/usr/share/zoneinfo/America/New_York"
fi

# TEMP_DIR: "../"
TEMP_DIR=$(cat .projectconfig.json | jq -r '.TEMP_DIR')
TEMP_DIR=$(cat .projectconfig.cjson | jq -r '.TEMP_DIR')
if [ "$TEMP_DIR" == "null" ]
then
TEMP_DIR="../"
fi

# CMS_PLATFORM: D9
CMS_PLATFORM=$(cat .projectconfig.json | jq -r '.CMS_PLATFORM')
CMS_PLATFORM=$(cat .projectconfig.cjson | jq -r '.CMS_PLATFORM')
if [ "$CMS_PLATFORM" == "null" ]
then
CMS_PLATFORM="D9"
fi

# DEFAULT_SITE: ""
DEFAULT_SITE=$(cat .projectconfig.json | jq -r '.DEFAULT_SITE')
DEFAULT_SITE=$(cat .projectconfig.cjson | jq -r '.DEFAULT_SITE')
if [ "$DEFAULT_SITE" == "null" ]
then
DEFAULT_SITE=""
Expand Down Expand Up @@ -169,7 +169,7 @@ fi

# BackstopJS Vars
# Reference Defaults to LIVE.
BACKSTOP_REF_ENV=$(cat .projectconfig.json | jq -r '.backstopjsReferenceEnv')
BACKSTOP_REF_ENV=$(cat .projectconfig.cjson | jq -r '.backstopjsReferenceEnv')
if [ "$BACKSTOP_REF_ENV" == "null" ]
then
BACKSTOP_REF_ENV="live"
Expand Down
2 changes: 1 addition & 1 deletion .ddev/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ corepack_enable: false
# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
# To reinstall Composer after the image was built, run "ddev debug rebuild".

# nodejs_version: "20"
nodejs_version: "22.8.0"
# change from the default system Node.js version to any other version.
# See https://ddev.readthedocs.io/en/stable/users/configuration/config/#nodejs_version for more information
# and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation,
Expand Down
34 changes: 34 additions & 0 deletions .ddev/mutagen/mutagen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# To override this file remove the line above
# and add your own configuration. If you override it you will
# probably want to check it in.
# Please do `ddev mutagen reset` after changing the file.
# See DDEV Mutagen docs at
# https://ddev.readthedocs.io/en/stable/users/install/performance/#mutagen
# For detailed information about mutagen configuration options, see
# https://mutagen.io/documentation/introduction/configuration
sync:
defaults:
mode: "two-way-resolved"
stageMode: "neighboring"
ignore:
paths:
# The top-level .git directory is ignored because where possible it's
# mounted into the container with a traditional docker bind-mount
- "/.git"
- "/.tarballs"
- "/.ddev/db_snapshots"
- "/.ddev/.importdb*"
- "/.ddev/.downloads"
- ".DS_Store"
- ".idea"
- "/web/sites/default/files"

# You can also exclude other directories from mutagen-syncing
# For example /var/www/html/var does not need to sync in TYPO3
# so you can add:
# - "/var"
# vcs like .git can be ignored for safety, but then some
# composer operations may fail if they use dev versions/git.
# vcs: true
symlink:
mode: "posix-raw"
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.16
v22.8.0
0 .projectconfig.js → .projectconfig.cjs
View file
Open in desktop
File renamed without changes.
71 changes: 71 additions & 0 deletions bldr.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import { bldrConfig } from '@bluecadet/bldr/config';

/**
* Config vars for standard builds
*/
let full_css_config = [];
let full_js_config = [];
let full_sdc_config = {
directory: [
// './web/themes/custom/uva/components',
// './web/modules/custom/uva_utility/components',
],
assetSubDirectory: 'assets',
};

let drupal_modules = [
'./web/themes/custom/pai',
'./web/themes/custom/pai_admin',
'./web/modules/custom/img_processor',
'./web/modules/custom/pai_admin_mod',
'./web/modules/custom/pai_quick_edit',
'./web/modules/custom/pai_redirect',
'./web/modules/custom/pai_utility',
];

let watch_paths = [];

drupal_modules.forEach((val, i) => {
full_css_config.push({
src: val + '/assets/src/css/**/*.css',
dest: val + '/assets/dist/css',
watch: [val + '/assets/src/css/**/*.css'],
});

full_js_config.push({
src: val + '/assets/src/js/**/*.js',
dest: val + '/assets/dist/js',
watch: [val + '/assets/src/js/**/*.js'],
});

watch_paths.push(val);
});

export default bldrConfig({
css: full_css_config,
js: full_js_config,
sdc: full_sdc_config,
watchPaths: watch_paths,
eslint: {
useEslint: false,
options: {},
forceBuildIfError: true,
},
stylelint: {
useStyleLint: true,
forceBuildIfError: true,
},
rollup: {
useRollup: true,
useTerser: false,
sdcOptions: {
bundle: true,
minify: false,
format: 'es'
},
},
browsersync: {
disable: true,
instanceName: null,
},
});
156 changes: 0 additions & 156 deletions bldrConfig.js
View file
Open in desktop

This file was deleted.

Loading
Loading