Skip to content
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/check-compact-connect-ui-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v6
with:
node-version: '24.11.1'
node-version: '24.14.0'

# Use any cached yarn dependencies (saves build time)
- uses: actions/cache@v4
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v6
with:
node-version: '24.11.1'
node-version: '24.14.0'

# Use any cached yarn dependencies (saves build time)
- uses: actions/cache@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/check-webroot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,22 @@ jobs:
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."

# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v5

- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
- run: echo "🖥️ The workflow is now ready to test your code on the runner."

# Setup Node
- name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v6
with:
node-version: '22.1.0'
node-version: '24.14.0'

# Use any cached yarn dependencies (saves build time)
- uses: actions/cache@v4
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
key: ${{ runner.os }}-node-24.14.0-modules-${{ hashFiles('**/yarn.lock') }}

# Install Yarn Dependencies
- name: Install JS dependencies
Expand Down
2 changes: 1 addition & 1 deletion backend/compact-connect-ui-app/lambdas/nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
"zod": "^3.23.8"
},
"resolutions": {
"fast-xml-parser": "5.3.6"
"fast-xml-parser": "^5.5.7"
}
}
32 changes: 23 additions & 9 deletions backend/compact-connect-ui-app/lambdas/nodejs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2143,12 +2143,21 @@ fast-levenshtein@^2.0.6:
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==

fast-xml-parser@4.4.1, fast-xml-parser@5.3.6:
version "5.3.6"
resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.3.6.tgz#85a69117ca156b1b3c52e426495b6de266cb6a4b"
integrity sha512-QNI3sAvSvaOiaMl8FYU4trnEzCwiRr8XMWgAHzlrWpTSj+QaCSvOf1h82OEP1s4hiAXhnbXSyFWCf4ldZzZRVA==
fast-xml-builder@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/fast-xml-builder/-/fast-xml-builder-1.1.4.tgz#0c407a1d9d5996336c0cd76f7ff785cac6413017"
integrity sha512-f2jhpN4Eccy0/Uz9csxh3Nu6q4ErKxf0XIsasomfOihuSUa3/xw6w8dnOtCDgEItQFJG8KyXPzQXzcODDrrbOg==
dependencies:
path-expression-matcher "^1.1.3"

fast-xml-parser@4.4.1, fast-xml-parser@^5.5.7:
version "5.5.11"
resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.5.11.tgz#406a888587aed0ba6b3e60382dfbb3b1f80692ad"
integrity sha512-QL0eb0YbSTVWF6tTf1+LEMSgtCEjBYPpnAjoLC8SscESlAjXEIRJ7cHtLG0pLeDFaZLa4VKZLArtA/60ZS7vyA==
dependencies:
strnum "^2.1.2"
fast-xml-builder "^1.1.4"
path-expression-matcher "^1.4.0"
strnum "^2.2.3"

fecha@^4.2.0:
version "4.2.3"
Expand Down Expand Up @@ -2692,6 +2701,11 @@ path-exists@^4.0.0:
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==

path-expression-matcher@^1.1.3, path-expression-matcher@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/path-expression-matcher/-/path-expression-matcher-1.4.0.tgz#275730c9c21bbf2e124eba6d4c6453f02f3d331d"
integrity sha512-s4DQMxIdhj3jLFWd9LxHOplj4p9yQ4ffMGowFf3cpEgrrJjEhN0V5nxw4Ye1EViAGDoL4/1AeO6qHpqYPOzE4Q==

path-key@^3.1.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
Expand Down Expand Up @@ -2917,10 +2931,10 @@ strip-json-comments@^3.1.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==

strnum@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.1.2.tgz#a5e00ba66ab25f9cafa3726b567ce7a49170937a"
integrity sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==
strnum@^2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.2.3.tgz#0119fce02749a11bb126a4d686ac5dbdf6e57586"
integrity sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==

supports-color@^7, supports-color@^7.1.0:
version "7.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def __init__(
{
'phases': {
'install': {
'runtime-versions': {'python': '3.13', 'nodejs': '22.x'},
'runtime-versions': {'python': '3.13', 'nodejs': '24.x'},
}
}
}
Expand Down
40 changes: 20 additions & 20 deletions backend/compact-connect-ui-app/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
#
# This file is autogenerated by pip-compile with Python 3.14
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --no-emit-index-url --no-strip-extras requirements-dev.in
#
boolean-py==5.0
# via license-expression
build==1.4.0
build==1.4.2
# via pip-tools
cachecontrol[filecache]==0.14.4
# via
# cachecontrol
# pip-audit
certifi==2026.1.4
# via pip-audit
certifi==2026.2.25
# via requests
charset-normalizer==3.4.4
charset-normalizer==3.4.7
# via requests
click==8.3.1
click==8.3.2
# via pip-tools
coverage[toml]==7.13.2
coverage[toml]==7.13.5
# via
# -r requirements-dev.in
# pytest-cov
cyclonedx-python-lib==11.6.0
cyclonedx-python-lib==11.7.0
# via pip-audit
defusedxml==0.7.1
# via py-serializable
filelock==3.20.3
filelock==3.25.2
# via cachecontrol
idna==3.11
# via requests
Expand Down Expand Up @@ -55,17 +53,17 @@ pip-audit==2.10.0
# via -r requirements-dev.in
pip-requirements-parser==32.0.1
# via pip-audit
pip-tools==7.5.2
pip-tools==7.5.3
# via -r requirements-dev.in
platformdirs==4.5.1
platformdirs==4.9.4
# via pip-audit
pluggy==1.6.0
# via
# pytest
# pytest-cov
py-serializable==2.1.0
# via cyclonedx-python-lib
pygments==2.19.2
pygments==2.20.0
# via
# pytest
# rich
Expand All @@ -75,26 +73,28 @@ pyproject-hooks==1.2.0
# via
# build
# pip-tools
pytest==9.0.2
pytest==9.0.3
# via
# -r requirements-dev.in
# pytest-cov
pytest-cov==7.0.0
pytest-cov==7.1.0
# via -r requirements-dev.in
requests==2.32.5
requests==2.33.1
# via
# cachecontrol
# pip-audit
rich==14.3.1
rich==14.3.3
# via pip-audit
ruff==0.14.14
ruff==0.15.9
# via -r requirements-dev.in
sortedcontainers==2.4.0
# via cyclonedx-python-lib
tomli==2.4.0
tomli==2.4.1
# via pip-audit
tomli-w==1.2.0
# via pip-audit
typing-extensions==4.15.0
# via cyclonedx-python-lib
urllib3==2.6.3
# via requests
wheel==0.46.3
Expand Down
16 changes: 8 additions & 8 deletions backend/compact-connect-ui-app/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.14
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile --no-emit-index-url --no-strip-extras requirements.in
Expand All @@ -8,15 +8,15 @@ attrs==25.4.0
# via
# cattrs
# jsii
aws-cdk-asset-awscli-v1==2.2.263
aws-cdk-asset-awscli-v1==2.2.273
# via aws-cdk-lib
aws-cdk-asset-node-proxy-agent-v6==2.1.0
aws-cdk-asset-node-proxy-agent-v6==2.1.1
# via aws-cdk-lib
aws-cdk-aws-lambda-python-alpha==2.236.0a0
aws-cdk-aws-lambda-python-alpha==2.248.0a0
# via -r requirements.in
aws-cdk-cloud-assembly-schema==48.20.0
aws-cdk-cloud-assembly-schema==53.14.0
# via aws-cdk-lib
aws-cdk-lib==2.236.0
aws-cdk-lib==2.248.0
# via
# -r requirements.in
# aws-cdk-aws-lambda-python-alpha
Expand All @@ -25,15 +25,15 @@ cattrs==25.3.0
# via jsii
cdk-nag==2.37.55
# via -r requirements.in
constructs==10.4.5
constructs==10.6.0
# via
# -r requirements.in
# aws-cdk-aws-lambda-python-alpha
# aws-cdk-lib
# cdk-nag
importlib-resources==6.5.2
# via jsii
jsii==1.126.0
jsii==1.127.0
# via
# aws-cdk-asset-awscli-v1
# aws-cdk-asset-node-proxy-agent-v6
Expand Down
2 changes: 1 addition & 1 deletion webroot/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

---
## Prerequisites
- **[Node](https://nodejs.org/) `22.1.0`**
- **[Node](https://nodejs.org/) `24.14.0`**
* Use **[NVM](https://github.com/creationix/nvm#installation)** to manage Node versions
* The `curl`-based install script is typically all that's required
* A brief overview of the [NVM Usage commands](https://github.com/nvm-sh/nvm#usage) is typically helpful
Expand Down
2 changes: 1 addition & 1 deletion webroot/bin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || pr
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm


nvm install 22.3.0
nvm install 24.14.0
npm install -g yarn
yarn install --ignore-engines
yarn build --dest dist --ignore-engines
Expand Down
3 changes: 2 additions & 1 deletion webroot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@
"eslint-plugin-vue": "^8.0.3",
"eslint-plugin-vue-a11y": "^0.0.31",
"eslint-plugin-vuejs-accessibility": "^1.1.0",
"express": "^4.22.1",
"favicons": "^7.2.0",
"favicons-webpack-plugin": "6.0.1",
"favicons-webpack-plugin": "^6.0.1",
"flush-promises": "^1.0.2",
"inquirer": "7.1.0",
"less": "^3.0.4",
Expand Down
50 changes: 15 additions & 35 deletions webroot/vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,15 @@
//

const path = require('path');
const fs = require('fs');
const FaviconsWebpackPlugin = require('favicons-webpack-plugin');
const StyleLintPlugin = require('stylelint-webpack-plugin');
const express = require('express');

const env = process.env.NODE_ENV;
const ENV_PRODUCTION = 'production';
const ENV_TEST = 'test';
const baseUrl = process.env.BASE_URL;
const localDevPort = process.env.LOCAL_DEV_PORT;
const localDevProxy = {};
const shouldMockApi = (process.env.VUE_APP_MOCK_API === 'true');

const appName = 'TODO';
Expand All @@ -28,36 +27,6 @@ const developerName = 'TODO';
const themeColor = '#1C7CB0'; // @TODO
const backgroundColor = '#FFFFFF'; // @TODO

// ============================================================================
// = LOCAL PROXY CONFIG =
// ============================================================================
// Configure the local dev server proxy rules
// https://webpack.js.org/configuration/dev-server/#devserverproxy
// localDevProxy[process.env.VUE_APP_API_EXAMPLE_ROOT] = { target: process.env.LOCAL_DEV_PROXY_EXAMPLE };
localDevProxy['/img'] = {
// Proxy images that are created during build that we'd still like to see in the local `yarn serve` app
// Requires that `yarn build` has been run at least once for the built images to exist in /dist
target: `http://localhost:${localDevPort}`,
selfHandleResponse: true,
bypass: (req, res) => {
if (req.url.includes('/img')) {
const proxyImage = `${__dirname}/dist${req.url}`;
const fileStream = fs.createReadStream(proxyImage);

fileStream.on('open', () => {
fileStream.pipe(res);
});

fileStream.on('error', (err) => {
res.status((err.code === 'ENOENT') ? 404 : 500);
res.send(err);
});
}

return null; // Ignores bypass
},
};

// ============================================================================
// = WEBPACK PLUGIN CUSTOMIZATION =
// ============================================================================
Expand Down Expand Up @@ -190,6 +159,20 @@ module.exports = {
client: {
overlay: true,
},
setupMiddlewares(middlewares, devServer) { // During local yarn serve, proxy image requests: /img/... → <project>/dist/img/...
const { app } = devServer;
const distImgDir = path.join(__dirname, 'dist', 'img');

app.use(
'/img',
express.static(distImgDir, {
fallthrough: false,
index: false,
})
);

return middlewares;
},
},
pwa: {
// Overlaps w/ faviconsPlugin; setting here in case of ordering conflict
Expand Down Expand Up @@ -336,9 +319,6 @@ module.exports = {
'@tests': path.join(__dirname, '/tests'),
},
},
devServer: {
proxy: localDevProxy,
},
devtool: (env === ENV_PRODUCTION) ? false : 'eval-cheap-source-map',
},
};
Loading
Loading