Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
merging all conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
react-translations-bot committed Apr 25, 2022
2 parents dbfe948 + 1d21630 commit 5120e70
Show file tree
Hide file tree
Showing 185 changed files with 7,793 additions and 2,984 deletions.
7 changes: 5 additions & 2 deletions beta/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"root": true,
"extends": "next",
"extends": "next/core-web-vitals",
"rules": {
"no-unused-vars": "warn"
},
"env": {
"node": true,
"commonjs": true,
"browser": true,
"es6": true
}
}
}
8 changes: 4 additions & 4 deletions beta/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"check-all": "npm-run-all prettier lint:fix tsc"
},
"dependencies": {
"@codesandbox/sandpack-react": "0.13.16-experimental.0",
"@codesandbox/sandpack-react": "v0.14.3-experimental.1",
"@docsearch/css": "3.0.0-alpha.41",
"@docsearch/react": "3.0.0-alpha.41",
"@headlessui/react": "^1.3.0",
Expand Down Expand Up @@ -53,7 +53,7 @@
"@typescript-eslint/eslint-plugin": "2.x",
"@typescript-eslint/parser": "2.x",
"asyncro": "^3.0.0",
"autoprefixer": "^10.3.1",
"autoprefixer": "^10.4.2",
"babel-eslint": "10.x",
"eslint": "7.x",
"eslint-config-next": "12.0.3",
Expand All @@ -72,7 +72,7 @@
"mdast-util-to-string": "^1.1.0",
"npm-run-all": "^4.1.5",
"patch-package": "^6.2.2",
"postcss": "^8.3.6",
"postcss": "^8.4.5",
"postcss-flexbugs-fixes": "4.2.1",
"postcss-preset-env": "^6.7.0",
"prettier": "^2.5.1",
Expand All @@ -86,7 +86,7 @@
"retext": "^7.0.1",
"retext-smartypants": "^4.0.0",
"rss": "^1.2.2",
"tailwindcss": "^2.2.7",
"tailwindcss": "^3.0.22",
"typescript": "^4.0.2",
"unist-util-visit": "^2.0.3",
"webpack-bundle-analyzer": "^4.5.0"
Expand Down
6 changes: 3 additions & 3 deletions beta/public/html/single-file-example.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<head>
<meta charset="UTF-8" />
<title>Hello World</title>
<script src="https://unpkg.com/react@17/umd/react.development.js"></script>
<script src="https://unpkg.com/react-dom@17/umd/react-dom.development.js"></script>
<script src="https://unpkg.com/react@18/umd/react.development.js"></script>
<script src="https://unpkg.com/react-dom@18/umd/react-dom.development.js"></script>

<!-- Don't use this in production—do this: https://reactjs.org/docs/add-react-to-a-website#add-jsx-to-a-project -->
<script src="https://unpkg.com/babel-standalone@6/babel.min.js"></script>
</head>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions beta/public/images/docs/diagrams/passing_data_context_close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5120e70

Please sign in to comment.