Skip to content

Commit ec2e98c

Browse files
merging all conflicts
2 parents 2307b3a + 6bd09fe commit ec2e98c

Some content is hidden

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

50 files changed

+2911
-516
lines changed

beta/.eslintrc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"root": true,
3-
"extends": "next",
3+
"extends": "next/core-web-vitals",
4+
"rules": {
5+
"no-unused-vars": "warn"
6+
},
47
"env": {
58
"node": true,
69
"commonjs": true,
710
"browser": true,
811
"es6": true
912
}
10-
}
13+
}

beta/package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
"check-all": "npm-run-all prettier lint:fix tsc"
2323
},
2424
"dependencies": {
25+
<<<<<<< HEAD
2526
"@codesandbox/sandpack-react": "0.13.16-experimental.0",
27+
=======
28+
"@codesandbox/sandpack-react": "v0.14.3-experimental.1",
29+
>>>>>>> 6bd09fe682e18ccd7747fcd7798fa8fb4d3edc42
2630
"@docsearch/css": "3.0.0-alpha.41",
2731
"@docsearch/react": "3.0.0-alpha.41",
2832
"@headlessui/react": "^1.3.0",
@@ -53,7 +57,7 @@
5357
"@typescript-eslint/eslint-plugin": "2.x",
5458
"@typescript-eslint/parser": "2.x",
5559
"asyncro": "^3.0.0",
56-
"autoprefixer": "^10.3.1",
60+
"autoprefixer": "^10.4.2",
5761
"babel-eslint": "10.x",
5862
"eslint": "7.x",
5963
"eslint-config-next": "12.0.3",
@@ -72,7 +76,7 @@
7276
"mdast-util-to-string": "^1.1.0",
7377
"npm-run-all": "^4.1.5",
7478
"patch-package": "^6.2.2",
75-
"postcss": "^8.3.6",
79+
"postcss": "^8.4.5",
7680
"postcss-flexbugs-fixes": "4.2.1",
7781
"postcss-preset-env": "^6.7.0",
7882
"prettier": "^2.5.1",
@@ -86,7 +90,7 @@
8690
"retext": "^7.0.1",
8791
"retext-smartypants": "^4.0.0",
8892
"rss": "^1.2.2",
89-
"tailwindcss": "^2.2.7",
93+
"tailwindcss": "^3.0.22",
9094
"typescript": "^4.0.2",
9195
"unist-util-visit": "^2.0.3",
9296
"webpack-bundle-analyzer": "^4.5.0"

beta/public/images/docs/diagrams/sharing_data_child.dark.svg

Lines changed: 60 additions & 0 deletions
Loading

beta/public/images/docs/diagrams/sharing_data_child.svg

Lines changed: 60 additions & 0 deletions
Loading

beta/public/images/docs/diagrams/sharing_data_child_clicked.dark.svg

Lines changed: 64 additions & 0 deletions
Loading

beta/public/images/docs/diagrams/sharing_data_child_clicked.svg

Lines changed: 64 additions & 0 deletions
Loading

beta/public/images/docs/diagrams/sharing_data_parent.dark.svg

Lines changed: 57 additions & 0 deletions
Loading

beta/public/images/docs/diagrams/sharing_data_parent.svg

Lines changed: 57 additions & 0 deletions
Loading

beta/public/images/docs/diagrams/sharing_data_parent_clicked.dark.svg

Lines changed: 75 additions & 0 deletions
Loading

beta/public/images/docs/diagrams/sharing_data_parent_clicked.svg

Lines changed: 75 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)