Skip to content
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.

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

YSP-559: Update NPM Packages on Drupal 10.3 #772

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/build_deploy_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defaults:
run:
shell: bash
env:
TZ: "/usr/share/zoneinfo/America/Los_Angeles"
TZ: '/usr/share/zoneinfo/America/Los_Angeles'
TERM: dumb
ADMIN_EMAIL: ${{ secrets.ADMIN_EMAIL }}
ADMIN_PASSWORD: ${{ secrets.ADMIN_PASSWORD }}
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
options: --user root
runs-on: ubuntu-latest
env:
YALESITES_BUILD_TOKEN: ${{ secrets.YALESITES_BUILD_TOKEN }}
YALESITES_BUILD_TOKEN: ${{ secrets.YALESITES_BUILD_TOKEN }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
# Workaround for https://github.com/actions/runner/issues/2033
- name: Set git safe.directory
run: |
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git config --global --add safe.directory "$GITHUB_WORKSPACE"

- name: Set bash_env env var
run: echo BASH_ENV=${RUNNER_TEMP}/bash_env.txt >> $GITHUB_ENV
Expand Down Expand Up @@ -194,11 +194,11 @@ jobs:
# https://github.com/pantheon-systems/docker-build-tools-ci/blob/6.x/scripts/set-environment
- name: setup-environment-vars
run: /build-tools-ci/scripts/set-environment

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '16.13'
node-version: '20'

- name: build frontend components
env:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13
20.14.0
17 changes: 10 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@
"[project-root]/.gitattributes": false
}
},
"installer-types": ["npm-asset"],
"installer-types": [
"npm-asset"
],
"installer-paths": {
"web/core": [
"type:drupal-core"
Expand Down Expand Up @@ -127,7 +129,8 @@
"drupal/core-project-message": true,
"phpstan/extension-installer": true,
"drupal/console-extend-plugin": true,
"php-http/discovery": true
"php-http/discovery": true,
"tbachert/spi": true
}
},
"scripts": {
Expand All @@ -138,14 +141,14 @@
"prepare-for-pantheon": "DrupalProject\\composer\\ScriptHandler::prepareForPantheon",
"unit-test": "echo 'No unit test step defined.'",
"code-sniff": [
".\/vendor\/bin\/phpcs --standard=Drupal --extensions=php,module,inc,install,test,profile,theme,info,txt --colors --ignore=node_modules,bower_components,vendor .\/web\/modules\/custom .\/web\/themes\/custom .\/web\/profiles\/custom",
".\/vendor\/bin\/phpcs --standard=DrupalPractice --extensions=php,module,inc,install,test,profile,theme,info,txt --colors --ignore=node_modules,bower_components,vendor .\/web\/modules\/custom .\/web\/themes\/custom .\/web\/profiles\/custom"
"./vendor/bin/phpcs --standard=Drupal --extensions=php,module,inc,install,test,profile,theme,info,txt --colors --ignore=node_modules,bower_components,vendor ./web/modules/custom ./web/themes/custom ./web/profiles/custom",
"./vendor/bin/phpcs --standard=DrupalPractice --extensions=php,module,inc,install,test,profile,theme,info,txt --colors --ignore=node_modules,bower_components,vendor ./web/modules/custom ./web/themes/custom ./web/profiles/custom"
],
"code-fix": [
".\/vendor\/bin\/phpcbf --standard=Drupal --extensions=php,module,inc,install,test,profile,theme,info,txt --colors --ignore=node_modules,bower_components,vendor .\/web\/modules\/custom .\/web\/themes\/custom .\/web\/profiles\/custom",
".\/vendor\/bin\/phpcbf --standard=DrupalPractice --extensions=php,module,inc,install,test,profile,theme,info,txt --colors --ignore=node_modules,bower_components,vendor .\/web\/modules\/custom .\/web\/themes\/custom .\/web\/profiles\/custom"
"./vendor/bin/phpcbf --standard=Drupal --extensions=php,module,inc,install,test,profile,theme,info,txt --colors --ignore=node_modules,bower_components,vendor ./web/modules/custom ./web/themes/custom ./web/profiles/custom",
"./vendor/bin/phpcbf --standard=DrupalPractice --extensions=php,module,inc,install,test,profile,theme,info,txt --colors --ignore=node_modules,bower_components,vendor ./web/modules/custom ./web/themes/custom ./web/profiles/custom"
],
"lint:php": ".\/.ci/test/static/lint_php",
"lint:php": "./.ci/test/static/lint_php",
"post-install-cmd": [
"DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
],
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@saithodev/semantic-release-backmerge": "^4.0.1",
"@semantic-release/git": "^10.0.1",
"@yalesites-org/eslint-config-and-other-formatting": "^1.5.0",
"@yalesites-org/eslint-config-and-other-formatting": "^1.20.0",
"eslint-config-drupal": "^5.0.2",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.29.4",
Expand Down Expand Up @@ -92,7 +92,9 @@
[
"@saithodev/semantic-release-backmerge",
{
"backmergeBranches": ["develop"],
"backmergeBranches": [
"develop"
],
"backmergeStrategy": "merge"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ ignored_config_entities:
- 'ys_alert.settings:alert'
- 'ys_core*'
- 'ys_localist*'
- 'ai_engine*'
- 'ys_servicenow*'
- ys_themes.theme_settings
- 'ys_servicenow*'
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ configure: ys_alert.settings
dependencies:
- drupal:block
- ys_core
- maxlength
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ package: YaleSites
dependencies:
- multivalue_form_element
- media_library_form_element
- role_delegation
Original file line number Diff line number Diff line change
Expand Up @@ -446,10 +446,12 @@ public function getView($type, $params) {
// This ensures that if the options for showing categories, tags,
// or thumbnails change, the cache will be invalidated,
// and the view will be re-rendered with the new options.
foreach ($view['#rows']['#rows'] as &$resultRow) {
$resultRow['#cache']['keys'][] = $field_display_options['show_categories'];
$resultRow['#cache']['keys'][] = $field_display_options['show_tags'];
$resultRow['#cache']['keys'][] = $field_display_options['show_thumbnail'];
if ($view['#rows'] && $view['#rows']['#rows']) {
foreach ($view['#rows']['#rows'] as &$resultRow) {
$resultRow['#cache']['keys'][] = $field_display_options['show_categories'];
$resultRow['#cache']['keys'][] = $field_display_options['show_tags'];
$resultRow['#cache']['keys'][] = $field_display_options['show_thumbnail'];
}
}
break;

Expand Down