Skip to content

Commit 36c6fe3

Browse files
authored
Merge branch 'main' into sacaling-up-with-reducer-and-context
2 parents 09378f8 + 0311a73 commit 36c6fe3

File tree

275 files changed

+28746
-7164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+28746
-7164
lines changed

README.md

Lines changed: 1 addition & 1 deletion

TRANSLATION.md

Lines changed: 58 additions & 4 deletions

beta/.env.development

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
SANDPACK_BARE_COMPONENTS=true

beta/.env.production

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
NEXT_PUBLIC_GA_TRACKING_ID = 'UA-41298772-4'
1+
NEXT_PUBLIC_GA_TRACKING_ID = 'UA-41298772-4'
2+
SANDPACK_BARE_COMPONENTS=true

beta/next.config.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* Copyright (c) Facebook, Inc. and its affiliates.
33
*/
44

5-
const path = require('path');
65
const redirects = require('./src/redirects.json');
76

87
/**
@@ -17,6 +16,9 @@ const nextConfig = {
1716
legacyBrowsers: false,
1817
browsersListForSwc: true,
1918
},
19+
env: {
20+
SANDPACK_BARE_COMPONENTS: process.env.SANDPACK_BARE_COMPONENTS,
21+
},
2022
async redirects() {
2123
return redirects.redirects;
2224
},
@@ -49,8 +51,16 @@ const nextConfig = {
4951
const {IgnorePlugin, NormalModuleReplacementPlugin} = require('webpack');
5052
config.plugins.push(
5153
new NormalModuleReplacementPlugin(
52-
/@codemirror\/lang-markdown/,
53-
require.resolve('./src/utils/codemirrorMarkdownShim.js')
54+
/^@stitches\/core$/,
55+
require.resolve('./src/utils/emptyShim.js')
56+
),
57+
new NormalModuleReplacementPlugin(
58+
/^raf$/,
59+
require.resolve('./src/utils/rafShim.js')
60+
),
61+
new NormalModuleReplacementPlugin(
62+
/^process$/,
63+
require.resolve('./src/utils/processShim.js')
5464
),
5565
new IgnorePlugin({
5666
checkResource(resource, context) {

beta/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"check-all": "npm-run-all prettier lint:fix tsc"
2323
},
2424
"dependencies": {
25-
"@codesandbox/sandpack-react": "1.7.2",
25+
"@codesandbox/sandpack-react": "1.15.5",
2626
"@docsearch/css": "3.0.0-alpha.41",
2727
"@docsearch/react": "3.0.0-alpha.41",
2828
"@headlessui/react": "^1.7.0",
@@ -38,6 +38,7 @@
3838
"react": "0.0.0-experimental-cb5084d1c-20220924",
3939
"react-collapsed": "npm:@gaearon/[email protected]",
4040
"react-dom": "0.0.0-experimental-cb5084d1c-20220924",
41+
"remark-frontmatter": "^4.0.1",
4142
"remark-gfm": "^3.0.1"
4243
},
4344
"devDependencies": {
@@ -66,7 +67,7 @@
6667
"eslint-plugin-import": "2.x",
6768
"eslint-plugin-jsx-a11y": "6.x",
6869
"eslint-plugin-react": "7.x",
69-
"eslint-plugin-react-hooks": "experimental",
70+
"eslint-plugin-react-hooks": "^0.0.0-experimental-fabef7a6b-20221215",
7071
"fs-extra": "^9.0.1",
7172
"globby": "^11.0.1",
7273
"gray-matter": "^4.0.2",
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/node_modules/@codemirror/lang-javascript/dist/index.cjs b/node_modules/@codemirror/lang-javascript/dist/index.cjs
2+
index 4475e4f..e1255c9 100644
3+
--- a/node_modules/@codemirror/lang-javascript/dist/index.cjs
4+
+++ b/node_modules/@codemirror/lang-javascript/dist/index.cjs
5+
@@ -135,7 +135,9 @@ const javascriptLanguage = language.LRLanguage.define({
6+
JSXText: highlight.tags.content,
7+
"JSXStartTag JSXStartCloseTag JSXSelfCloseEndTag JSXEndTag": highlight.tags.angleBracket,
8+
"JSXIdentifier JSXNameSpacedName": highlight.tags.tagName,
9+
- "JSXAttribute/JSXIdentifier JSXAttribute/JSXNameSpacedName": highlight.tags.attributeName
10+
+ "JSXAttribute/JSXIdentifier JSXAttribute/JSXNameSpacedName": highlight.tags.attributeName,
11+
+ "JSXAttribute/JSXLowerIdentifier JSXAttribute/JSXNameSpacedName": highlight.tags.attributeName,
12+
+ "JSXBuiltin/JSXIdentifier": highlight.tags.standard(highlight.tags.tagName)
13+
})
14+
]
15+
}),
16+
diff --git a/node_modules/@codemirror/lang-javascript/dist/index.js b/node_modules/@codemirror/lang-javascript/dist/index.js
17+
index d089f6b..db09ea6 100644
18+
--- a/node_modules/@codemirror/lang-javascript/dist/index.js
19+
+++ b/node_modules/@codemirror/lang-javascript/dist/index.js
20+
@@ -131,7 +131,9 @@ const javascriptLanguage = /*@__PURE__*/LRLanguage.define({
21+
JSXText: tags.content,
22+
"JSXStartTag JSXStartCloseTag JSXSelfCloseEndTag JSXEndTag": tags.angleBracket,
23+
"JSXIdentifier JSXNameSpacedName": tags.tagName,
24+
- "JSXAttribute/JSXIdentifier JSXAttribute/JSXNameSpacedName": tags.attributeName
25+
+ "JSXAttribute/JSXIdentifier JSXAttribute/JSXNameSpacedName": tags.attributeName,
26+
+ "JSXAttribute/JSXLowerIdentifier JSXAttribute/JSXNameSpacedName": tags.attributeName,
27+
+ "JSXBuiltin/JSXIdentifier": tags.standard(tags.tagName),
28+
})
29+
]
30+
}),

beta/patches/@codesandbox+sandpack-react+1.15.5.patch

Lines changed: 26 additions & 0 deletions
Large diffs are not rendered by default.

beta/patches/@lezer+javascript+0.15.2.patch

Lines changed: 345 additions & 0 deletions
Large diffs are not rendered by default.
116 KB

0 commit comments

Comments
 (0)