Browse Source

fix: deps, redirect, spacing for custom block

feat/build-apps-rebase
Thomas Osmonson 4 years ago
parent
commit
529df3502f
  1. 2
      .eslintrc.js
  2. 5
      next.config.js
  3. 35
      package.json
  4. 4
      src/components/mdx/md-contents.tsx
  5. 3718
      yarn.lock

2
.eslintrc.js

@ -1,5 +1,5 @@
module.exports = { module.exports = {
extends: ['@blockstack/eslint-config'], extends: ['@stacks/eslint-config'],
parser: '@typescript-eslint/parser', parser: '@typescript-eslint/parser',
parserOptions: { parserOptions: {
createDefaultProgram: true, createDefaultProgram: true,

5
next.config.js

@ -783,6 +783,11 @@ async function redirects() {
destination: '/understand-stacks/installing-memcached', destination: '/understand-stacks/installing-memcached',
permanent: true, permanent: true,
}, },
{
source: '/en-US/:slug*',
destination: '/:slug*',
permanent: true,
},
]; ];
} }

35
package.json

@ -9,28 +9,28 @@
"@docsearch/react": "^1.0.0-alpha.27", "@docsearch/react": "^1.0.0-alpha.27",
"@emotion/babel-plugin": "^11.1.2", "@emotion/babel-plugin": "^11.1.2",
"@emotion/babel-preset-css-prop": "^11.0.0-next.10", "@emotion/babel-preset-css-prop": "^11.0.0-next.10",
"@emotion/cache": "^11.0.0-next.16", "@emotion/cache": "^11.1.3",
"@emotion/core": "^11.0.0-next.10", "@emotion/core": "^11.0.0-next.10",
"@emotion/css": "^11.0.0-next.17", "@emotion/css": "^11.1.3",
"@emotion/react": "^11.1.2", "@emotion/react": "^11.1.4",
"@emotion/server": "^11.0.0-next.17", "@emotion/server": "^11.0.0-next.17",
"@hashicorp/remark-plugins": "^3.0.0", "@hashicorp/remark-plugins": "^3.1.0",
"@mdx-js/loader": "1.6.22", "@mdx-js/loader": "1.6.22",
"@mdx-js/mdx": "^1.6.22", "@mdx-js/mdx": "^1.6.22",
"@mdx-js/react": "^1.6.22", "@mdx-js/react": "^1.6.22",
"@next/mdx": "^10.0.3", "@next/mdx": "^10.0.4",
"@reach/accordion": "^0.12.1", "@reach/accordion": "^0.12.1",
"@reach/tooltip": "^0.12.1", "@reach/tooltip": "^0.12.1",
"@stacks/ui": "^7.0.0", "@stacks/ui": "^7.3.0",
"@stacks/ui-core": "^7.0.0", "@stacks/ui-core": "^7.0.0",
"@styled-system/theme-get": "^5.1.2", "@styled-system/theme-get": "^5.1.2",
"@tabler/icons": "^1.37.0", "@tabler/icons": "^1.38.1",
"@types/mdx-js__react": "^1.5.2", "@types/mdx-js__react": "^1.5.2",
"@types/node": "^14.10.1", "@types/node": "^14.14.20",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/reach__tooltip": "^0.2.0", "@types/reach__tooltip": "^0.2.0",
"algoliasearch": "^4.8.3", "algoliasearch": "^4.8.3",
"babel-plugin-macros": "^3.0.0", "babel-plugin-macros": "^3.0.1",
"cache-manager": "^3.4.0", "cache-manager": "^3.4.0",
"cache-manager-fs-hash": "^0.0.9", "cache-manager-fs-hash": "^0.0.9",
"capsize": "^1.1.0", "capsize": "^1.1.0",
@ -51,12 +51,12 @@
"mdi-react": "7.4.0", "mdi-react": "7.4.0",
"micro-memoize": "^4.0.9", "micro-memoize": "^4.0.9",
"modern-normalize": "^1.0.0", "modern-normalize": "^1.0.0",
"next": "^10.0.2-canary.18", "next": "^10.0.5",
"next-fonts": "^1.4.0", "next-fonts": "^1.4.0",
"next-mdx-remote": "^1.0.0", "next-mdx-remote": "^1.0.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"p-all": "^3.0.0", "p-all": "^3.0.0",
"preact": "^10.4.8", "preact": "^10.5.9",
"preact-render-to-string": "^5.1.4", "preact-render-to-string": "^5.1.4",
"preact-ssr-prepass": "^1.1.1", "preact-ssr-prepass": "^1.1.1",
"prettier": "^2.1.1", "prettier": "^2.1.1",
@ -81,13 +81,13 @@
"remark-vscode": "^1.0.0-beta.2", "remark-vscode": "^1.0.0-beta.2",
"strip-markdown": "^4.0.0", "strip-markdown": "^4.0.0",
"stylis": "^4.0.6", "stylis": "^4.0.6",
"swr": "^0.3.2", "swr": "^0.3.11",
"turndown": "^7.0.0", "turndown": "^7.0.0",
"typescript": "^4.0.2", "typescript": "^4.1.3",
"unified-vscode": "^1.0.0-beta.2", "unified-vscode": "^1.0.0-beta.2",
"unist-builder": "^2.0.3", "unist-builder": "^2.0.3",
"unist-util-is": "^4.0.2", "unist-util-is": "^4.0.2",
"unist-util-select": "^3.0.3", "unist-util-select": "^3.0.4",
"unist-util-visit": "^2.0.3", "unist-util-visit": "^2.0.3",
"use-events": "^1.4.2", "use-events": "^1.4.2",
"use-is-in-viewport": "^1.0.9", "use-is-in-viewport": "^1.0.9",
@ -95,13 +95,13 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/preset-react": "^7.10.4", "@babel/preset-react": "^7.10.4",
"@blockstack/eslint-config": "^1.0.5",
"@blockstack/prettier-config": "^0.0.6", "@blockstack/prettier-config": "^0.0.6",
"@next/bundle-analyzer": "^10.0.3", "@next/bundle-analyzer": "^10.0.3",
"@stacks/eslint-config": "^1.0.7",
"@typescript-eslint/eslint-plugin": "^4.1.0", "@typescript-eslint/eslint-plugin": "^4.1.0",
"@typescript-eslint/parser": "^4.1.0", "@typescript-eslint/parser": "^4.1.0",
"babel-plugin-styled-components": "^1.11.0", "babel-plugin-styled-components": "^1.11.0",
"eslint": "^7.9.0", "eslint": "^7.17.0",
"eslint-plugin-import": "^2.22.0", "eslint-plugin-import": "^2.22.0",
"eslint-plugin-prettier": "^3.1.4", "eslint-plugin-prettier": "^3.1.4",
"husky": "^4.3.0", "husky": "^4.3.0",
@ -136,5 +136,8 @@
"pre-commit": "yarn lint:prettier" "pre-commit": "yarn lint:prettier"
} }
}, },
"resolutions": {
"eslint": "^7.17.0"
},
"prettier": "@blockstack/prettier-config" "prettier": "@blockstack/prettier-config"
} }

4
src/components/mdx/md-contents.tsx

@ -11,6 +11,7 @@ import { getCapsizeStyles } from '@components/mdx/typography';
import { MDXProvider } from '@mdx-js/react'; import { MDXProvider } from '@mdx-js/react';
import { MDXComponents } from '@components/mdx'; import { MDXComponents } from '@components/mdx';
import { css, Theme, ThemeUICSSObject } from '@stacks/ui-core'; import { css, Theme, ThemeUICSSObject } from '@stacks/ui-core';
export const styleOverwrites: ThemeUICSSObject = { export const styleOverwrites: ThemeUICSSObject = {
'& > section': { '& > section': {
'&:nth-child(2)': { '&:nth-child(2)': {
@ -19,6 +20,9 @@ export const styleOverwrites: ThemeUICSSObject = {
}, },
}, },
}, },
'.custom-block + *': {
mt: space('extra-loose'),
},
section: { section: {
'& > *:not(pre):not(ul):not(ol):not(img):not([data-reach-accordion]):not(section):not(hr)': { '& > *:not(pre):not(ul):not(ol):not(img):not([data-reach-accordion]):not(section):not(hr)': {
px: space(['extra-loose', 'extra-loose', 'none', 'none']), px: space(['extra-loose', 'extra-loose', 'none', 'none']),

3718
yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save