Skip to content

Commit 529df35

Browse files
committed
fix: deps, redirect, spacing for custom block
1 parent 420ff8a commit 529df35

File tree

5 files changed

+564
-3200
lines changed

5 files changed

+564
-3200
lines changed

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
extends: ['@blockstack/eslint-config'],
2+
extends: ['@stacks/eslint-config'],
33
parser: '@typescript-eslint/parser',
44
parserOptions: {
55
createDefaultProgram: true,

next.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,11 @@ async function redirects() {
783783
destination: '/understand-stacks/installing-memcached',
784784
permanent: true,
785785
},
786+
{
787+
source: '/en-US/:slug*',
788+
destination: '/:slug*',
789+
permanent: true,
790+
},
786791
];
787792
}
788793

package.json

+19-16
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99
"@docsearch/react": "^1.0.0-alpha.27",
1010
"@emotion/babel-plugin": "^11.1.2",
1111
"@emotion/babel-preset-css-prop": "^11.0.0-next.10",
12-
"@emotion/cache": "^11.0.0-next.16",
12+
"@emotion/cache": "^11.1.3",
1313
"@emotion/core": "^11.0.0-next.10",
14-
"@emotion/css": "^11.0.0-next.17",
15-
"@emotion/react": "^11.1.2",
14+
"@emotion/css": "^11.1.3",
15+
"@emotion/react": "^11.1.4",
1616
"@emotion/server": "^11.0.0-next.17",
17-
"@hashicorp/remark-plugins": "^3.0.0",
17+
"@hashicorp/remark-plugins": "^3.1.0",
1818
"@mdx-js/loader": "1.6.22",
1919
"@mdx-js/mdx": "^1.6.22",
2020
"@mdx-js/react": "^1.6.22",
21-
"@next/mdx": "^10.0.3",
21+
"@next/mdx": "^10.0.4",
2222
"@reach/accordion": "^0.12.1",
2323
"@reach/tooltip": "^0.12.1",
24-
"@stacks/ui": "^7.0.0",
24+
"@stacks/ui": "^7.3.0",
2525
"@stacks/ui-core": "^7.0.0",
2626
"@styled-system/theme-get": "^5.1.2",
27-
"@tabler/icons": "^1.37.0",
27+
"@tabler/icons": "^1.38.1",
2828
"@types/mdx-js__react": "^1.5.2",
29-
"@types/node": "^14.10.1",
29+
"@types/node": "^14.14.20",
3030
"@types/nprogress": "^0.2.0",
3131
"@types/reach__tooltip": "^0.2.0",
3232
"algoliasearch": "^4.8.3",
33-
"babel-plugin-macros": "^3.0.0",
33+
"babel-plugin-macros": "^3.0.1",
3434
"cache-manager": "^3.4.0",
3535
"cache-manager-fs-hash": "^0.0.9",
3636
"capsize": "^1.1.0",
@@ -51,12 +51,12 @@
5151
"mdi-react": "7.4.0",
5252
"micro-memoize": "^4.0.9",
5353
"modern-normalize": "^1.0.0",
54-
"next": "^10.0.2-canary.18",
54+
"next": "^10.0.5",
5555
"next-fonts": "^1.4.0",
5656
"next-mdx-remote": "^1.0.0",
5757
"nprogress": "^0.2.0",
5858
"p-all": "^3.0.0",
59-
"preact": "^10.4.8",
59+
"preact": "^10.5.9",
6060
"preact-render-to-string": "^5.1.4",
6161
"preact-ssr-prepass": "^1.1.1",
6262
"prettier": "^2.1.1",
@@ -81,27 +81,27 @@
8181
"remark-vscode": "^1.0.0-beta.2",
8282
"strip-markdown": "^4.0.0",
8383
"stylis": "^4.0.6",
84-
"swr": "^0.3.2",
84+
"swr": "^0.3.11",
8585
"turndown": "^7.0.0",
86-
"typescript": "^4.0.2",
86+
"typescript": "^4.1.3",
8787
"unified-vscode": "^1.0.0-beta.2",
8888
"unist-builder": "^2.0.3",
8989
"unist-util-is": "^4.0.2",
90-
"unist-util-select": "^3.0.3",
90+
"unist-util-select": "^3.0.4",
9191
"unist-util-visit": "^2.0.3",
9292
"use-events": "^1.4.2",
9393
"use-is-in-viewport": "^1.0.9",
9494
"yaml-loader": "^0.6.0"
9595
},
9696
"devDependencies": {
9797
"@babel/preset-react": "^7.10.4",
98-
"@blockstack/eslint-config": "^1.0.5",
9998
"@blockstack/prettier-config": "^0.0.6",
10099
"@next/bundle-analyzer": "^10.0.3",
100+
"@stacks/eslint-config": "^1.0.7",
101101
"@typescript-eslint/eslint-plugin": "^4.1.0",
102102
"@typescript-eslint/parser": "^4.1.0",
103103
"babel-plugin-styled-components": "^1.11.0",
104-
"eslint": "^7.9.0",
104+
"eslint": "^7.17.0",
105105
"eslint-plugin-import": "^2.22.0",
106106
"eslint-plugin-prettier": "^3.1.4",
107107
"husky": "^4.3.0",
@@ -136,5 +136,8 @@
136136
"pre-commit": "yarn lint:prettier"
137137
}
138138
},
139+
"resolutions": {
140+
"eslint": "^7.17.0"
141+
},
139142
"prettier": "@blockstack/prettier-config"
140143
}

src/components/mdx/md-contents.tsx

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { getCapsizeStyles } from '@components/mdx/typography';
1111
import { MDXProvider } from '@mdx-js/react';
1212
import { MDXComponents } from '@components/mdx';
1313
import { css, Theme, ThemeUICSSObject } from '@stacks/ui-core';
14+
1415
export const styleOverwrites: ThemeUICSSObject = {
1516
'& > section': {
1617
'&:nth-child(2)': {
@@ -19,6 +20,9 @@ export const styleOverwrites: ThemeUICSSObject = {
1920
},
2021
},
2122
},
23+
'.custom-block + *': {
24+
mt: space('extra-loose'),
25+
},
2226
section: {
2327
'& > *:not(pre):not(ul):not(ol):not(img):not([data-reach-accordion]):not(section):not(hr)': {
2428
px: space(['extra-loose', 'extra-loose', 'none', 'none']),

0 commit comments

Comments
 (0)