Skip to content

Commit

Permalink
Merge pull request #81 from agilesix/cfelix/feature-20250122
Browse files Browse the repository at this point in the history
Candidate features merge 20250122
  • Loading branch information
neilmb authored Jan 23, 2025
2 parents 763572d + 723d951 commit b65d827
Show file tree
Hide file tree
Showing 23 changed files with 21,925 additions and 13,204 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy_frontend_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
working-directory: client
strategy:
matrix:
node-version: [14.x]
node-version: [18.x]
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
Expand Down Expand Up @@ -84,4 +84,4 @@ jobs:
PATHS: "/*"
AWS_REGION: "us-east-1"
AWS_ACCESS_KEY_ID: ${{ secrets.CLIENT_DEV_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.CLIENT_DEV_AWS_SECRET_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.CLIENT_DEV_AWS_SECRET_ACCESS_KEY }}
4 changes: 2 additions & 2 deletions .github/workflows/pr_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
cancel-in-progress: true
env:
node-version: 14.x
node-version: 18.x
jobs:
# JOB to run change detection
detect-fe-changes:
Expand Down Expand Up @@ -62,4 +62,4 @@ jobs:
- name: Spanish translation test
run: npm run test:intl-translations
# - name: Check for security vulnerabilities
# run: npm audit --production
# run: npm audit --production
2 changes: 1 addition & 1 deletion client/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14.17.1
v18.20.6
7 changes: 5 additions & 2 deletions client/cypress/support/step_definitions/commonSteps.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,14 @@ When(`I click on the {string} button in the navigation`, (page) => {

When(`I look for the {string} CTA`, (ctaString) => {
cy.get(`[data-cy="${hyphenizeString(ctaString)}-block"]`).as('CTA_block');
cy.get('@CTA_block').scrollIntoView().should('be.visible');
cy.get('@CTA_block').scrollIntoView();
cy.get('@CTA_block').should('be.visible');
});

When(`I look for the {string}`, (footer) => {
cy.get(`[data-cy="${hyphenizeString(footer)}-primary-block"]`).scrollIntoView().should('be.visible');
cy.get(`[data-cy="${hyphenizeString(footer)}-primary-block"]`).as('string_block');
cy.get('@string_block').scrollIntoView();
cy.get('@string_block').should('be.visible');
});

// Common Thens:
Expand Down
16 changes: 15 additions & 1 deletion client/gatsby-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ path = require('path');
//
// In react-map-gl 7.x this is no longer needed: https://visgl.github.io/react-map-gl/docs/get-started
//
exports.onCreateWebpackConfig = ({stage, loaders, actions}) => {
exports.onCreateWebpackConfig = ({stage, loaders, actions, getConfig}) => {
actions.setWebpackConfig({
devtool: 'eval-source-map',
resolve: {
Expand All @@ -14,4 +14,18 @@ exports.onCreateWebpackConfig = ({stage, loaders, actions}) => {
},
},
});

if (stage === 'develop') {
const config = getConfig();

// Silence CSS ordering warnings, which aren't a risk with CSS Modules
const miniCssExtractPlugin = config.plugins.find(
(plugin) => plugin.constructor.name === 'MiniCssExtractPlugin',
);
if (miniCssExtractPlugin) {
miniCssExtractPlugin.options.ignoreOrder = true;
}

actions.replaceWebpackConfig(config);
}
};
Loading

0 comments on commit b65d827

Please sign in to comment.