Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
steps:
- uses: actions/checkout@v1

- name: Use Node.js 10
- name: Use Node.js 12.13
uses: actions/setup-node@v1
with:
node-version: 10
node-version: 12.13

- name: Restore yarn cache
id: yarn-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
steps:
- uses: actions/checkout@v1

- name: Use Node.js 10
- name: Use Node.js 12.13
uses: actions/setup-node@v1
with:
node-version: 10
node-version: 12.13

- name: Restore yarn cache
id: yarn-cache
Expand Down
4 changes: 2 additions & 2 deletions docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ module.exports = {
'@docusaurus/preset-classic',
{
docs: {
docLayoutComponent: require.resolve('./src/layouts/DocPage.js'),
docItemComponent: require.resolve('./src/layouts/DocItem.js'),
docLayoutComponent: require.resolve('./src/pages/layouts/DocPage.js'),
docItemComponent: require.resolve('./src/pages/layouts/DocItem.js'),
editUrl:
'https://github.com/react-navigation/react-navigation.github.io/edit/main/',
remarkPlugins: [require('./src/plugins/remark-npm2yarn')],
Expand Down
3 changes: 3 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
base = "/"
publish = "build"
command = "yarn install && yarn build"

[build.environment]
NODE_VERSION = "12.13"
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"fetch-sponsors": "node scripts/fetch-sponsors.js"
},
"dependencies": {
"@docusaurus/core": "^2.0.0-alpha.66",
"@docusaurus/core": "^2.0.0-alpha.72",
"@docusaurus/plugin-google-analytics": "^2.0.0-alpha.66",
"@docusaurus/preset-classic": "2.0.0-alpha.66",
"@docusaurus/preset-classic": "^2.0.0-alpha.72",
"@octokit/graphql": "^4.5.7",
"@react-navigation/core": "^5.14.3",
"classnames": "^2.2.6",
Expand Down
2 changes: 1 addition & 1 deletion src/SnackHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function findNearestCodeBlock(node) {
while (nextElement) {
if (
nextElement.tagName === 'DIV' &&
nextElement.className.includes('mdxCodeBlock')
( nextElement.className.includes('mdxCodeBlock') || nextElement.className.includes('codeBlockContainer'))
) {
return nextElement;
} else {
Expand Down
8 changes: 0 additions & 8 deletions src/layouts/DocItem.js

This file was deleted.

13 changes: 13 additions & 0 deletions src/pages/layouts/DocItem.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react';
import DefaultDocItem from '@theme/DocItem';
import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';

function DocItem(props) {
// make sure to not use the window on the SSR
if(!ExecutionEnvironment.canUseDOM){
return null;
}
return <DefaultDocItem {...props} />;
}

export default DocItem;
7 changes: 6 additions & 1 deletion src/layouts/DocPage.js → src/pages/layouts/DocPage.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import React from 'react';
import DefaultDocPage from '@theme/DocPage';
import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
import {
initializeSnackObservers,
removeSnackObservers,
} from '../SnackHelpers';
} from '../../SnackHelpers';

function DocPage(props) {
// make sure to not use the window on the SSR
if(!ExecutionEnvironment.canUseDOM){
return null;
}
React.useEffect(() => {
// Tags in Head aren't immediately available when the snack script loads, so
// instead let's just store this in a global...
Expand Down
Loading