Skip to content

Commit bd18400

Browse files
merging all conflicts
2 parents f4617fe + bbb08a5 commit bd18400

200 files changed

Lines changed: 6959 additions & 2133 deletions

File tree

Some content is hidden

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

.env.development

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

.env.production

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
NEXT_PUBLIC_GA_TRACKING_ID = 'UA-41298772-4'
2-
SANDPACK_BARE_COMPONENTS=true
1+
NEXT_PUBLIC_GA_TRACKING_ID = 'G-B1E83PJ3RT'

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"plugins": ["@typescript-eslint"],
66
"rules": {
77
"no-unused-vars": "off",
8-
"@typescript-eslint/no-unused-vars": "warn"
8+
"@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_" }],
9+
"react-hooks/exhaustive-deps": "error"
910
},
1011
"env": {
1112
"node": true,

.github/workflows/site_lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v1
1818
- name: Use Node.js 20.x
19-
uses: actions/setup-node@v1
19+
uses: actions/setup-node@v3
2020
with:
2121
node-version: 20.x
2222

2323
- name: Install deps and build (with cache)
24-
uses: bahmutov/npm-install@v1.7.10
24+
uses: bahmutov/npm-install@v1.8.32
2525

2626
- name: Lint codebase
2727
run: yarn ci-check

next.config.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ const nextConfig = {
1414
scrollRestoration: true,
1515
legacyBrowsers: false,
1616
},
17-
env: {
18-
SANDPACK_BARE_COMPONENTS: process.env.SANDPACK_BARE_COMPONENTS,
19-
},
17+
env: {},
2018
webpack: (config, {dev, isServer, ...options}) => {
2119
if (process.env.ANALYZE) {
2220
const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer');
@@ -35,10 +33,6 @@ const nextConfig = {
3533

3634
const {IgnorePlugin, NormalModuleReplacementPlugin} = require('webpack');
3735
config.plugins.push(
38-
new NormalModuleReplacementPlugin(
39-
/^@stitches\/core$/,
40-
require.resolve('./src/utils/emptyShim.js')
41-
),
4236
new NormalModuleReplacementPlugin(
4337
/^raf$/,
4438
require.resolve('./src/utils/rafShim.js')

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,20 @@
2323
"prepare": "husky install"
2424
},
2525
"dependencies": {
26-
"@codesandbox/sandpack-react": "1.15.5",
26+
"@codesandbox/sandpack-react": "2.6.0",
2727
"@docsearch/css": "3.0.0-alpha.41",
2828
"@docsearch/react": "3.0.0-alpha.41",
2929
"@headlessui/react": "^1.7.0",
3030
"body-scroll-lock": "^3.1.3",
3131
"classnames": "^2.2.6",
3232
"date-fns": "^2.16.1",
3333
"debounce": "^1.2.1",
34-
"ga-lite": "^2.1.4",
3534
"github-slugger": "^1.3.0",
3635
"next": "^13.4.1",
3736
"next-remote-watch": "^1.0.0",
3837
"parse-numeric-range": "^1.2.0",
3938
"react": "^0.0.0-experimental-16d053d59-20230506",
40-
"react-collapsed": "npm:@gaearon/react-collapsed@3.1.0-forked.1",
39+
"react-collapsed": "4.0.4",
4140
"react-dom": "^0.0.0-experimental-16d053d59-20230506",
4241
"remark-frontmatter": "^4.0.1",
4342
"remark-gfm": "^3.0.1"
@@ -93,7 +92,7 @@
9392
"retext": "^7.0.1",
9493
"retext-smartypants": "^4.0.0",
9594
"rss": "^1.2.2",
96-
"tailwindcss": "^3.0.22",
95+
"tailwindcss": "^3.3.2",
9796
"typescript": "^4.0.2",
9897
"unist-util-visit": "^2.0.3",
9998
"webpack-bundle-analyzer": "^4.5.0"

patches/@codemirror+lang-javascript+0.19.6.patch

Lines changed: 0 additions & 30 deletions
This file was deleted.

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

Lines changed: 0 additions & 62 deletions
This file was deleted.

patches/@lezer+javascript+0.15.2.patch

Lines changed: 0 additions & 345 deletions
This file was deleted.
13.1 KB
Loading

0 commit comments

Comments
 (0)