Skip to content

Commit

Permalink
Merge pull request #10 from cfpb/cjs-fix
Browse files Browse the repository at this point in the history
Fix build and test processes
  • Loading branch information
contolini authored Aug 2, 2023
2 parents dc4a402 + 8fd72e1 commit 7999f01
Show file tree
Hide file tree
Showing 16 changed files with 554 additions and 641 deletions.
11 changes: 3 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,14 @@
"@typescript-eslint/member-ordering": "off",
"@typescript-eslint/prefer-includes": "off",
"@typescript-eslint/no-restricted-imports": "off",
"@typescript-eslint/no-misused-promises": [
"error",
{
"checksVoidReturn": false
}
],

"import/no-deprecated": "error",
"import/order": "off",
"import/no-extraneous-dependencies": [
"error",
{
"devDependencies": [
"cypress.config.ts",
"cypress.config.js",
"vite.config.ts",
"src/setupTests.ts",
"src/testUtils.tsx",
Expand Down Expand Up @@ -175,7 +170,7 @@
}
},
{
"files": ["vite.config.ts", "cypress.config.ts"],
"files": ["vite.config.ts"],
"parserOptions": {
"project": ["./tsconfig.node.json"]
}
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @wtchnm
* @contolini @meissadia @shindigira
53 changes: 1 addition & 52 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
[Short description explaining the high-level reason for the pull request]

## Additions

-

## Removals

-

## Changes

-

## Testing
## How to test this PR

1.

Expand All @@ -21,46 +13,3 @@
## Notes

-

## Todos

-

## Checklist

- [ ] PR has an informative and human-readable title
- [ ] Changes are limited to a single goal (no scope creep)
- [ ] Code can be automatically merged (no conflicts)
- [ ] Code follows the standards laid out in the [development playbook](https://github.com/cfpb/development)
- [ ] Passes all existing automated tests
- [ ] Any _change_ in functionality is tested
- [ ] New functions are documented (with a description, list of inputs, and expected output)
- [ ] Placeholder code is flagged / future todos are captured in comments
- [ ] Visually tested in supported browsers and devices (see checklist below :point_down:)
- [ ] Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)
- [ ] Reviewers requested with the [Reviewers tool](https://help.github.com/articles/requesting-a-pull-request-review/) :arrow_right:

## Testing checklist

### Browsers

- [ ] Chrome
- [ ] Firefox
- [ ] Safari
- [ ] Internet Explorer 8, 9, 10, and 11
- [ ] Edge
- [ ] iOS Safari
- [ ] Chrome for Android

### Accessibility

- [ ] Keyboard friendly
- [ ] Screen reader friendly

### Other

- [ ] Is useable without CSS
- [ ] Is useable without JS
- [ ] Flexible from small to large screens
- [ ] No linting errors or warnings
- [ ] JavaScript tests are passing
15 changes: 15 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,18 @@ jobs:

- name: Run React tests
run: yarn test:ci
Cypress:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: '16'

- name: Install dependencies
run: yarn

- name: Run React tests
run: yarn test:e2e:headless
432 changes: 192 additions & 240 deletions .pnp.cjs

Large diffs are not rendered by default.

81 changes: 43 additions & 38 deletions .pnp.loader.mjs

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

Binary file not shown.
Binary file not shown.
Binary file not shown.
559 changes: 280 additions & 279 deletions .yarn/releases/yarn-3.5.0.cjs → .yarn/releases/yarn-3.6.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ supportedArchitectures:
- darwin
- linux

yarnPath: .yarn/releases/yarn-3.5.0.cjs
yarnPath: .yarn/releases/yarn-3.6.1.cjs
4 changes: 2 additions & 2 deletions cypress.config.ts → cypress.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defineConfig } from 'cypress';
const { defineConfig } = require('cypress');

export default defineConfig({
module.exports = defineConfig({
fileServerFolder: 'dist',
fixturesFolder: false,
projectId: 'etow1b',
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"autoprefixer": "^10.4.14",
"commitizen": "4.3.0",
"css-mediaquery": "0.1.2",
"cypress": "12.12.0",
"cypress": "12.17.2",
"cz-conventional-changelog": "3.3.0",
"debug": "^4.3.4",
"eslint": "^8.45.0",
Expand Down Expand Up @@ -117,5 +117,5 @@
"vitest related --run --coverage=false"
]
},
"packageManager": "yarn@3.5.0"
"packageManager": "yarn@3.6.1"
}
3 changes: 2 additions & 1 deletion tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"baseUrl": "./.yarn/cache",
"composite": true,
"forceConsistentCasingInFileNames": true,
"isolatedModules": true,
Expand All @@ -10,5 +11,5 @@
"strict": true,
"target": "ESNext"
},
"include": ["vite.config.ts", "cypress.config.ts"]
"include": ["vite.config.ts"]
}
5 changes: 0 additions & 5 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ export default defineConfig(({ mode }) => ({
optimizeDeps: {
exclude: []
},
build: {
commonjsOptions: {
include: []
}
},
test: {
css: false,
include: ['src/**/__tests__/*'],
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1812,7 +1812,7 @@ __metadata:
languageName: node
linkType: hard

"@cypress/request@npm:^2.88.10":
"@cypress/request@npm:^2.88.11":
version: 2.88.11
resolution: "@cypress/request@npm:2.88.11"
dependencies:
Expand Down Expand Up @@ -4382,7 +4382,7 @@ __metadata:
autoprefixer: ^10.4.14
commitizen: 4.3.0
css-mediaquery: 0.1.2
cypress: 12.12.0
cypress: 12.17.2
cz-conventional-changelog: 3.3.0
debug: ^4.3.4
design-stories: "cfpb/design-stories#0.0.1"
Expand Down Expand Up @@ -4993,11 +4993,11 @@ __metadata:
languageName: node
linkType: hard

"cypress@npm:12.12.0":
version: 12.12.0
resolution: "cypress@npm:12.12.0"
"cypress@npm:12.17.2":
version: 12.17.2
resolution: "cypress@npm:12.17.2"
dependencies:
"@cypress/request": ^2.88.10
"@cypress/request": ^2.88.11
"@cypress/xvfb": ^1.2.4
"@types/node": ^14.14.31
"@types/sinonjs__fake-timers": 8.1.1
Expand Down Expand Up @@ -5034,14 +5034,14 @@ __metadata:
pretty-bytes: ^5.6.0
proxy-from-env: 1.0.0
request-progress: ^3.0.0
semver: ^7.3.2
semver: ^7.5.3
supports-color: ^8.1.1
tmp: ~0.2.1
untildify: ^4.0.0
yauzl: ^2.10.0
bin:
cypress: bin/cypress
checksum: 5ab0a8bc58c8af90cdb5fea93692422e6e74436ffdaeb41853e91a3fcfcdb7a39ad6ae512537bf0edf25cc3bc3732248a32e8ad3bec3440d5f527f3a3b4650b7
checksum: 19144db1fe02d92270de71f69ece324affd2f60bafa2f7018440c00907f837b1f8556926206df8b6e7b1c9890d250435730656ccb4a5a31e7872b24dd79c0af8
languageName: node
linkType: hard

Expand Down Expand Up @@ -12009,21 +12009,21 @@ __metadata:

"typescript@patch:typescript@5.0.4#~builtin<compat/typescript>":
version: 5.0.4
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=85af82"
resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=b5f058"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: bb309d320c59a26565fb3793dba550576ab861018ff3fd1b7fccabbe46ae4a35546bc45f342c0a0b6f265c801ccdf64ffd68f548f117ceb7f0eac4b805cd52a9
checksum: d26b6ba97b6d163c55dbdffd9bbb4c211667ebebc743accfeb2c8c0154aace7afd097b51165a72a5bad2cf65a4612259344ff60f8e642362aa1695c760d303ac
languageName: node
linkType: hard

"typescript@patch:typescript@^4.6.4 || ^5.0.0#~builtin<compat/typescript>":
version: 5.1.6
resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin<compat/typescript>::version=5.1.6&hash=85af82"
resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin<compat/typescript>::version=5.1.6&hash=5da071"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 21e88b0a0c0226f9cb9fd25b9626fb05b4c0f3fddac521844a13e1f30beb8f14e90bd409a9ac43c812c5946d714d6e0dee12d5d02dfc1c562c5aacfa1f49b606
checksum: f53bfe97f7c8b2b6d23cf572750d4e7d1e0c5fff1c36d859d0ec84556a827b8785077bc27676bf7e71fae538e517c3ecc0f37e7f593be913d884805d931bc8be
languageName: node
linkType: hard

Expand Down

0 comments on commit 7999f01

Please sign in to comment.