Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joshwooding committed Nov 11, 2024
1 parent d3d17f3 commit 57d4537
Show file tree
Hide file tree
Showing 4 changed files with 193 additions and 69 deletions.
10 changes: 1 addition & 9 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// @ts-ignore
import { defineConfig } from "cypress";
import { devServer } from "cypress-rspack-dev-server";
import { version as reactVersion } from "react";
import { merge } from "webpack-merge";
// import installCoverageTask from "@cypress/code-coverage/task";

Expand All @@ -28,15 +27,8 @@ export default defineConfig({
...devServerConfig,
framework: "react",
rspackConfig: merge(require("./rspack.config").default, {
resolve: {
alias: {
"cypress/react18": reactVersion.startsWith("18")
? "cypress/react18"
: "cypress/react",
},
},
experiments: {
lazyCompilation: !devServerConfig.cypressConfig.isTextTerminal,
incremental: !devServerConfig.cypressConfig.isTextTerminal,
},
}),
});
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@fontsource/open-sans": "^4.5.13",
"@fontsource/pt-mono": "^5.0.12",
"@mswjs/data": "^0.16.1",
"@rspack/core": "1.0.0",
"@rspack/core": "^1.1.0",
"@storybook/addon-a11y": "^8.3.0",
"@storybook/addon-actions": "^8.3.0",
"@storybook/addon-docs": "^8.3.0",
Expand All @@ -66,7 +66,7 @@
"@storybook/test": "^8.3.0",
"@storybook/theming": "^8.3.0",
"@storybook/types": "^8.3.0",
"@swc/helpers": "^0.5.12",
"@swc/helpers": "^0.5.0",
"@tanstack/react-query": "^5.0.0",
"@testing-library/cypress": "^10.0.0",
"@testing-library/dom": "^10.0.0",
Expand All @@ -85,6 +85,7 @@
"chromatic": "^11.10.1",
"ci-info": "^4.0.0",
"clsx": "^2.0.0",
"css-loader": "^7.0.0",
"cypress": "^13.15.2",
"cypress-axe": "^1.5.0",
"cypress-real-events": "^1.13.0",
Expand All @@ -94,12 +95,14 @@
"mockdate": "^3.0.5",
"msw": "^2.3.5",
"msw-storybook-addon": "^2.0.3",
"postcss-loader": "^8.0.0",
"prettier": "^3.3.3",
"react": "^18.3.1",
"react-docgen-typescript": "2.2.2",
"react-dom": "^18.3.1",
"rifm": "^0.12.0",
"storybook": "^8.3.0",
"style-loader": "^4.0.0",
"stylelint": "^16.0.0",
"typescript": "4.6.4",
"vite": "^5.0.0",
Expand Down
9 changes: 6 additions & 3 deletions rspack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,12 @@ export default defineConfig({
references: "auto",
},
alias: {
"cypress/react18": reactVersion.startsWith("18")
? "cypress/react18"
: "cypress/react",
react: path.resolve(__dirname, "node_modules/react"),
"react-dom": path.resolve(__dirname, "node_modules/react-dom"),
"cypress/react18":
reactVersion.startsWith("16") || reactVersion.startsWith("17")
? "cypress/react"
: "cypress/react18",
"@storybook/react-dom-shim":
reactVersion.startsWith("16") || reactVersion.startsWith("17")
? "@storybook/react-dom-shim/dist/react-16"
Expand Down
Loading

0 comments on commit 57d4537

Please sign in to comment.