Skip to content

Commit

Permalink
Cosmos 6 (#818)
Browse files Browse the repository at this point in the history
* Restore default `yarn serve` package script.

* Lint esbuild and tidy up.

* Lint config and cypress

* Upgrade esbuild to 0.16.17, the last build before serve changes in 0.17.

* Start migration to cosmos 6

* Cosmos 6 working. Actually use esubild 0.16.17.

* Restore mkdir -p docs to cosmos build script

* Rebuild yarn.lock after merge.

---------

Signed-off-by: Pablo Mayrgundter <pablo.mayrgundter@gmail.com>
  • Loading branch information
pablo-mayrgundter committed Oct 23, 2023
1 parent 1aed6b7 commit aa93cc7
Show file tree
Hide file tree
Showing 4 changed files with 1,093 additions and 1,207 deletions.
3 changes: 2 additions & 1 deletion .cosmos.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"publicUrl": "./",
"webpack": {
"configPath": ".cosmos.webpack.js"
}
},
"plugins": ["react-cosmos-plugin-webpack"]
}
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bldrs",
"version": "1.0.0-r743",
"version": "1.0.0-r745",
"main": "src/index.jsx",
"license": "MIT",
"homepage": "https://github.com/bldrs-ai/Share",
Expand Down Expand Up @@ -59,6 +59,7 @@
"postprocessing": "^6.29.3",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-cosmos-plugin-webpack": "^6.0.0-beta.6",
"react-dom": "^18.2.0",
"react-feature-flags": "^1.0.0",
"react-helmet-async": "^1.3.0",
Expand All @@ -82,8 +83,9 @@
"@bahmutov/cypress-esbuild-preprocessor": "^2.1.3",
"@mui/types": "^7.2.3",
"@pablo-mayrgundter/cookies.js": "^1.0.0",
"@svgr/plugin-jsx": "^8.0.1",
"@svgr/webpack": "^8.0.1",
"@svgr/core": "^8.1.0",
"@svgr/plugin-jsx": "^8.1.0",
"@svgr/webpack": "^8.1.0",
"@testing-library/cypress": "^10.0.1",
"@testing-library/dom": "^8.19.1",
"@testing-library/jest-dom": "^5.16.5",
Expand Down Expand Up @@ -120,7 +122,7 @@
"jest-environment-jsdom": "^29.3.1",
"jsdom": "^20.0.3",
"msw": "^0.47.4",
"react-cosmos": "^5.7.2",
"react-cosmos": "^6.0.0-beta.6",
"shx": "^0.3.4",
"webpack": "^5.75.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Toast.fixture.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import {useSelect, useValue} from 'react-cosmos/fixture'
import {useSelect, useValue} from 'react-cosmos/client'
import FixtureContext from '../FixtureContext'
import Toast from './Toast'

Expand Down
Loading

0 comments on commit aa93cc7

Please sign in to comment.