3pp-mirror/docusaurus
1
0
Fork 0
mirror of https://github.com/facebook/docusaurus.git synced 2025-05-10 15:47:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Resolve conflicts

Browse source
This commit is contained in:
Hector Ramos 2017-12-12 12:49:02 -08:00
commit a7d81c629d
12 changed files with 79 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.prettierrc
View file

@ -3,7 +3,7 @@
"jsxBracketSameLine": true,
"parser": "flow",
"printWidth": 80,
"proseWrap": false,
"proseWrap": "never",
"singleQuote": true,
"trailingComma": "es5"
}

4
lib/core/Head.js
View file

@ -60,9 +60,7 @@ class Head extends React.Component {
)}
<link
rel="stylesheet"
href={`//cdnjs.cloudflare.com/ajax/libs/highlight.js/${
highlightVersion
}/styles/${highlightTheme}.min.css`}
href={`//cdnjs.cloudflare.com/ajax/libs/highlight.js/${highlightVersion}/styles/${highlightTheme}.min.css`}
/>
{hasBlog && (
<link

12
lib/publish-gh-pages.js
View file

@ -54,9 +54,7 @@ let remoteBranch;
if (USE_SSH === 'true') {
remoteBranch = `git@github.com:${ORGANIZATION_NAME}/${PROJECT_NAME}.git`;
} else {
remoteBranch = `https://${GIT_USER}@github.com/${ORGANIZATION_NAME}/${
PROJECT_NAME
}.git`;
remoteBranch = `https://${GIT_USER}@github.com/${ORGANIZATION_NAME}/${PROJECT_NAME}.git`;
}
if (IS_PULL_REQUEST) {
@ -120,9 +118,7 @@ excludePath = `${PROJECT_NAME}-${DEPLOYMENT_BRANCH}`;
// https://github.com/shelljs/shelljs/issues/79
if (
shell.exec(
`rsync -rt --exclude=${excludePath} --exclude=.DS_Store ${fromPath} ${
toPath
}`
`rsync -rt --exclude=${excludePath} --exclude=.DS_Store ${fromPath} ${toPath}`
).code !== 0
) {
shell.echo(`Error: Copying build assets failed`);
@ -136,9 +132,7 @@ const currentCommit = shell.exec('git rev-parse HEAD').stdout.trim();
shell.exec('git add --all');
shell.exec(
`git commit -m "Deploy website" -m "Deploy website version based on ${
currentCommit
}"`
`git commit -m "Deploy website" -m "Deploy website version based on ${currentCommit}"`
);
if (shell.exec(`git push origin ${DEPLOYMENT_BRANCH}`).code !== 0) {
shell.echo('Error: Git push failed');

4
lib/rename-version.js
View file

@ -74,9 +74,7 @@ if (versionIndex < 0) {
console.error(
`${chalk.yellow(
'Version ' + currentVersion + ' does not currently exist!'
)}\n Version ${
currentVersion
} is not in the versions.json file. You can only rename existing versions.`
)}\n Version ${currentVersion} is not in the versions.json file. You can only rename existing versions.`
);
process.exit(1);
}

8
lib/server/generate.js
View file

@ -13,6 +13,7 @@ function execute() {
const readMetadata = require('./readMetadata.js');
const renderToStaticMarkup = require('react-dom/server').renderToStaticMarkup;
const path = require('path');
const color = require('color');
const toSlug = require('../core/toSlug.js');
const React = require('react');
const mkdirp = require('mkdirp');
@ -355,6 +356,13 @@ function execute() {
const color = siteConfig.colors[key];
cssContent = cssContent.replace(new RegExp('\\$' + key, 'g'), color);
});
const codeColor = color(siteConfig.colors.primaryColor)
.alpha(0.07)
.string();
cssContent = cssContent.replace(
new RegExp('\\$codeColor', 'g'),
codeColor
);
mkdirp.sync(targetFile.replace(new RegExp('/[^/]*$'), ''));
fs.writeFileSync(targetFile, cssContent);

5
lib/server/server.js
View file

@ -17,6 +17,7 @@ function execute(port) {
const fs = require('fs-extra');
const os = require('os');
const path = require('path');
const color = require('color');
const toSlug = require('../core/toSlug.js');
const mkdirp = require('mkdirp');
const glob = require('glob');
@ -479,6 +480,10 @@ function execute(port) {
const color = siteConfig.colors[key];
cssContent = cssContent.replace(new RegExp('\\$' + key, 'g'), color);
});
const codeColor = color(siteConfig.colors.primaryColor)
.alpha(0.07)
.string();
cssContent = cssContent.replace(new RegExp('\\$codeColor', 'g'), codeColor);
res.send(cssContent);
});

24
lib/server/versionFallback.js
View file

@ -98,14 +98,10 @@ files.forEach(file => {
if (!metadata.original_id) {
console.error(
`No 'original_id' field found in ${
file
}. Perhaps you forgot to add it when importing prior versions of your docs?`
`No 'original_id' field found in ${file}. Perhaps you forgot to add it when importing prior versions of your docs?`
);
throw new Error(
`No 'original_id' field found in ${
file
}. Perhaps you forgot to add it when importing prior versions of your docs?`
`No 'original_id' field found in ${file}. Perhaps you forgot to add it when importing prior versions of your docs?`
);
}
if (!metadata.id) {
@ -113,14 +109,10 @@ files.forEach(file => {
throw new Error(`No 'id' field found in ${file}.`);
} else if (metadata.id.indexOf('version-') === -1) {
console.error(
`The 'id' field in ${
file
} is missing the expected 'version-XX-' prefix. Perhaps you forgot to add it when importing prior versions of your docs?`
`The 'id' field in ${file} is missing the expected 'version-XX-' prefix. Perhaps you forgot to add it when importing prior versions of your docs?`
);
throw new Error(
`The 'id' field in ${
file
} is missing the expected 'version-XX-' prefix. Perhaps you forgot to add it when importing prior versions of your docs?`
`The 'id' field in ${file} is missing the expected 'version-XX-' prefix. Perhaps you forgot to add it when importing prior versions of your docs?`
);
}
@ -141,9 +133,7 @@ files.forEach(file => {
function docVersion(id, req_version) {
if (!available[id]) {
throw new Error(
`Document with id '${
id
}' was requested but no document with that id could be located.`
`Document with id '${id}' was requested but no document with that id could be located.`
);
}
// iterate through versions until a version less than or equal to the requested
@ -286,9 +276,7 @@ function sidebarVersion(req_version) {
}
}
throw new Error(
`No sidebar file available to use for version ${
req_version
}. Verify that 'version-${req_version}-sidebars.json' exists.`
`No sidebar file available to use for version ${req_version}. Verify that 'version-${req_version}-sidebars.json' exists.`
);
}

24
lib/static/css/main.css
View file

@ -719,19 +719,17 @@ input::placeholder {
color: #e5e5e5;
}
code,
a code,
.mainContainer .wrapper a code,
.mainContainer .wrapper a:focus code {
color: $primaryColor;
font-family: "SFMono-Regular",source-code-pro,Menlo,Monaco,Consolas,"Roboto Mono","Droid Sans Mono","Liberation Mono",Consolas,"Courier New",Courier,monospace;
}
a code {
text-decoration: underline;
}
a:hover code {
text-decoration: none;
code {
padding: 2px 0;
background-color: $codeColor;
/* box-shadow acts as padding around inline code snippets
* while not adding any extra spacing between words. */
box-shadow: 2px 0 $codeColor, -2px 0 $codeColor;
color: inherit;
border-radius: .3em;
font-family: "SFMono-Regular",source-code-pro,Menlo,Monaco,Consolas,"Roboto Mono","Droid Sans Mono","Liberation Mono",Consolas,"Courier New",Courier,monospace;
/* avoids scale issues on mobile */
word-break: break-word;
}
pre code {

4
lib/write-translations.js
View file

@ -92,9 +92,7 @@ function execute() {
if (!file.endsWith('-sidebars.json')) {
if (file.endsWith('-sidebar.json')) {
console.warn(
`Skipping ${
file
}. Make sure your sidebar filenames follow this format: 'version-VERSION-sidebars.json'.`
`Skipping ${file}. Make sure your sidebar filenames follow this format: 'version-VERSION-sidebars.json'.`
);
}
return;

7
package-lock.json generated
View file

@ -1600,9 +1600,10 @@
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
},
"prettier": {
"version": "1.8.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.8.2.tgz",
"integrity": "sha512-fHWjCwoRZgjP1rvLP7OGqOznq7xH1sHMQUFLX8qLRO79hI57+6xbc5vB904LxEkCfgFgyr3vv06JkafgCSzoZg=="
"version": "1.9.1",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.9.1.tgz",
"integrity": "sha512-oYpQsZk7/0o8+YJUB0LfjkTYQa79gUIF2ESeqvG23IzcgqqvmeOE4+lMG7E/UKX3q3RIj8JHSfhrXWhon1L+zA==",
"dev": true
},
"private": {
"version": "0.1.8",

5
package.json
View file

@ -16,6 +16,7 @@
"babylon": "^6.17.4",
"chalk": "^2.1.0",
"classnames": "^2.2.5",
"color": "^2.0.1",
"commander": "^2.11.0",
"crowdin-cli": "^0.3.0",
"escape-string-regexp": "^1.0.5",
@ -24,7 +25,6 @@
"fs-extra": "^3.0.1",
"glob": "^7.1.2",
"highlight.js": "^9.12.0",
"prettier": "1.8.2",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-dom-factories": "^1.0.1",
@ -49,5 +49,8 @@
"docusaurus-version": "./lib/version.js",
"docusaurus-rename-version": "./lib/rename-version.js",
"docusaurus-feed": "./lib/generate-feed.js"
},
"devDependencies": {
"prettier": "^1.9.1"
}
}

38
yarn.lock
View file

@ -698,10 +698,30 @@ color-convert@^1.9.0:
dependencies:
color-name "^1.1.1"
color-name@^1.1.1:
color-convert@^1.9.1:
version "1.9.1"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
dependencies:
color-name "^1.1.1"
color-name@^1.0.0, color-name@^1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
color-string@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.2.tgz#26e45814bc3c9a7cbd6751648a41434514a773a9"
dependencies:
color-name "^1.0.0"
simple-swizzle "^0.2.2"
color@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/color/-/color-2.0.1.tgz#e4ed78a3c4603d0891eba5430b04b86314f4c839"
dependencies:
color-convert "^1.9.1"
color-string "^1.5.2"
combined-stream@^1.0.5, combined-stream@~1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@ -1077,6 +1097,10 @@ ipaddr.js@1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
is-arrayish@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.1.tgz#c2dfc386abaa0c3e33c48db3fe87059e69065efd"
is-finite@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
@ -1274,9 +1298,9 @@ performance-now@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
prettier@1.8.2:
version "1.8.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.2.tgz#bff83e7fd573933c607875e5ba3abbdffb96aeb8"
prettier@^1.9.1:
version "1.9.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.1.tgz#41638a0d47c1efbd1b7d5a742aaa5548eab86d70"
private@^0.1.6, private@^0.1.7:
version "0.1.8"
@ -1492,6 +1516,12 @@ shelljs@^0.7.8:
interpret "^1.0.0"
rechoir "^0.6.2"
simple-swizzle@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
dependencies:
is-arrayish "^0.3.1"
sitemap@^1.13.0:
version "1.13.0"
resolved "https://registry.yarnpkg.com/sitemap/-/sitemap-1.13.0.tgz#569cbe2180202926a62a266cd3de09c9ceb43f83"