Skip to content

Commit

Permalink
Merge pull request #2012 from GSA/update-prettier-eslint
Browse files Browse the repository at this point in the history
Update prettier eslint
  • Loading branch information
scottqueen-bixal authored Dec 16, 2024
2 parents 978522e + 5cea34f commit 6868b1f
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 18 deletions.
4 changes: 1 addition & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"recommendations": [
"rvest.vs-code-prettier-eslint"
],
"recommendations": ["github.vscode-github-actions", "esbenp.prettier-vscode"]
}
15 changes: 7 additions & 8 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"debug.javascript.autoAttachFilter": "onlyWithFlag",
"editor.renderWhitespace": "none",
"diffEditor.ignoreTrimWhitespace": false,
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
"editor.formatOnType": false,
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "file",
"vs-code-prettier-eslint.prettierLast": true,
"debug.javascript.autoAttachFilter": "onlyWithFlag",
"editor.renderWhitespace": "none",
"diffEditor.ignoreTrimWhitespace": false,
"editor.formatOnType": false,
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "file",
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
11 changes: 6 additions & 5 deletions benefit-finder/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@ const config = {
viteFinal(config) {
return mergeConfig(config, {
build: {
chunkSizeWarningLimit: '1000',
rollupOptions: {
chunkSizeWarningLimit: '1000',
rollupOptions: {
output: {
manualChunks: (id) => id.includes('src/App/index.jsx') ? 'app-chunk' : false,
manualChunks: id =>
id.includes('src/App/index.jsx') ? 'app-chunk' : false,
},
},
},
});
})
},
};
}

export default config
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ describe('Validate correct eligibility benefits display based on selected criter
})

it('QA scenario 3 Coal Miner EN - Verify correct benefit results for query values that includes Coal Miner in search parameter of URL', () => {
const selectedData = BENEFITS_ELIGIBILITY_DATA.scenario_3_coal_miner.en.param
const selectedData =
BENEFITS_ELIGIBILITY_DATA.scenario_3_coal_miner.en.param
const enResults = BENEFITS_ELIGIBILITY_DATA.scenario_3_coal_miner.en.results
const scenario = utils.encodeURIFromObject(selectedData)

Expand Down
1 change: 0 additions & 1 deletion benefit-finder/cypress/e2e/usagov-public-site/links.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ describe('Verify correct status code handling', () => {
// negate validation on our functional code
Cypress.on('fail', error => {
if (JSON.stringify(error).includes('httpstat')) {

expect(error).to.not.be.undefined
} else {
throw error
Expand Down
2 changes: 2 additions & 0 deletions benefit-finder/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import pluginCypress from 'eslint-plugin-cypress/flat'
import storybook from 'eslint-plugin-storybook'
import reactPlugin from 'eslint-plugin-react'
import eslintConfigPrettier from 'eslint-config-prettier'
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
import jsxA11y from 'eslint-plugin-jsx-a11y'

// error when starting dev server:
Expand All @@ -19,6 +20,7 @@ export default [
js.configs.recommended,
json.configs.recommended,
eslintConfigPrettier,
eslintPluginPrettierRecommended,
...storybook.configs['flat/recommended'],
pluginCypress.configs.recommended,
reactPlugin.configs.flat.all,
Expand Down
82 changes: 82 additions & 0 deletions benefit-finder/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions benefit-finder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"eslint-plugin-cypress": "^3.6.0",
"eslint-plugin-json": "^4.0.1",
"eslint-plugin-jsx-a11y": "^6.10.2",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-storybook": "^0.10.0",
"http-server": "^14.1.1",
Expand Down

0 comments on commit 6868b1f

Please sign in to comment.