Skip to content

Commit

Permalink
Merge pull request #4493 from coralproject/develop
Browse files Browse the repository at this point in the history
[8.7.1] Merge `develop` into `main`
  • Loading branch information
nick-funk authored Jan 22, 2024
2 parents 4766f04 + 8a4f02b commit 48e89dd
Show file tree
Hide file tree
Showing 363 changed files with 11,635 additions and 23,699 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@ jobs:
run: cd server && npm run test:server -- --ci --reporters=default --reporters=jest-junit
-
name: Run Client Stream Unit Tests
run: cd client && npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
run: cd client && npm run test:client:stream -- --ci --reporters=default --reporters=jest-junit
-
name: Run Client Admin Unit Tests
run: cd client && npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
run: cd client && npm run test:client:admin -- --ci --reporters=default --reporters=jest-junit
-
name: Run Client Other Unit Tests
run: cd client && npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
run: cd client && npm run test:client:other -- --ci --reporters=default --reporters=jest-junit
-
name: Build
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,16 @@ jobs:
npx @coralproject/package-version-lint
-
name: Run Server Unit Tests
run: cd server && npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
run: cd server && npm run test:server -- --ci --reporters=default --reporters=jest-junit
-
name: Run Client Stream Unit Tests
run: cd client && npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
run: cd client && npm run test:client:stream -- --ci --reporters=default --reporters=jest-junit
-
name: Run Client Admin Unit Tests
run: cd client && npm run test:client:admin -- --ci --runInBand --reporters=default --reporters=jest-junit
run: cd client && npm run test:client:admin -- --ci --reporters=default --reporters=jest-junit
-
name: Run Client Other Unit Tests
run: cd client && npm run test:client:other -- --ci --runInBand --reporters=default --reporters=jest-junit
run: cd client && npm run test:client:other -- --ci --reporters=default --reporters=jest-junit
-
name: Build
env:
Expand Down
3 changes: 3 additions & 0 deletions client/config/webpackDevServer.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,18 @@ export default function ({
],
before(app, server) {
// This lets us fetch source contents from webpack for the error overlay
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
app.use(evalSourceMapMiddleware(server));

// This lets us open files from the runtime error overlay.
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
app.use(errorOverlayMiddleware());
// This service worker file is effectively a 'no-op' that will reset any
// previous service worker registered for the same host:port combination.
// We do this in development to avoid hitting the production cache if
// it used the same host and port.
// https://github.com/facebookincubator/create-react-app/issues/2272#issuecomment-302832432
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
app.use(noopServiceWorkerMiddleware());
},
};
Expand Down
Loading

0 comments on commit 48e89dd

Please sign in to comment.