Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/composer/drupal/message_ui-1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
edmund-dunn authored Jan 30, 2024
2 parents a705cca + 6ce87f8 commit 94ac815
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions .tugboat/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ services:

# Create symlink between vets-website assets and next-build
# - ln -snf "${DOCROOT}/vendor/va-gov/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"
- mkdir -p "${TUGBOAT_ROOT}/next/public"
- ln -snf "${TUGBOAT_ROOT}/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"


Expand Down
4 changes: 2 additions & 2 deletions .tugboat/vhost-next.conf
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
# Ignore redirecting error doc directory
ProxyPass /.next/ !
# Redirect requests to the running node server from next-build
ProxyPass / http://localhost:3000/
ProxyPassReverse / http://localhost:3000/
ProxyPass / http://localhost:3999/
ProxyPassReverse / http://localhost:3999/

# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^6.3",
"symfony/routing": "^6.3",
"va-gov/content-build": "^0.0.3429",
"va-gov/content-build": "^0.0.3430",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down
14 changes: 7 additions & 7 deletions composer.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "2a14b89505286f392810a66b8939a15a",
"content-hash": "d363c8a38ec5069abe2023fd6c503a3a",
"packages": [
{
"name": "asm89/stack-cors",
Expand Down Expand Up @@ -25809,16 +25809,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3429",
"version": "v0.0.3430",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "71a9793c894ecfa39c9c5b8e0951899fae917b50"
"reference": "00d80d0bdb96b1de83f6ec807eb29c876cd91797"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/71a9793c894ecfa39c9c5b8e0951899fae917b50",
"reference": "71a9793c894ecfa39c9c5b8e0951899fae917b50",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/00d80d0bdb96b1de83f6ec807eb29c876cd91797",
"reference": "00d80d0bdb96b1de83f6ec807eb29c876cd91797",
"shasum": ""
},
"type": "node-project",
Expand All @@ -25845,9 +25845,9 @@
"description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
"support": {
"issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3429"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3430"
},
"time": "2024-01-26T14:50:21+00:00"
"time": "2024-01-29T17:44:09+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down

0 comments on commit 94ac815

Please sign in to comment.