Merge branch 'main' into users/janechu/fix-gitignore-for-docs

This commit is contained in:
Jane Chu 2022-05-24 07:13:03 -07:00 коммит произвёл GitHub
Родитель 5f412dff61 39edee754c
Коммит e2758bdd5f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 70 добавлений и 12 удалений

53
package-lock.json сгенерированный
Просмотреть файл

@ -29,7 +29,7 @@
"glob": "^7.1.2",
"husky": "^4.2.5",
"lint-staged": "^10.1.2",
"prettier": "2.0.2",
"prettier": "^2.6.1",
"rimraf": "^3.0.2",
"yargs": "^16.2.0"
}
@ -18239,15 +18239,18 @@
}
},
"node_modules/prettier": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz",
"integrity": "sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==",
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz",
"integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==",
"dev": true,
"bin": {
"prettier": "bin-prettier.js"
},
"engines": {
"node": ">=10.13.0"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/pretty-error": {
@ -25440,6 +25443,18 @@
"react": "^16.8.0"
}
},
"packages/fast-tooling-react/node_modules/prettier": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz",
"integrity": "sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==",
"dev": true,
"bin": {
"prettier": "bin-prettier.js"
},
"engines": {
"node": ">=10.13.0"
}
},
"packages/fast-tooling-react/node_modules/typescript": {
"version": "4.3.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
@ -25681,6 +25696,18 @@
"node": ">=6.11.5"
}
},
"packages/fast-tooling/node_modules/prettier": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz",
"integrity": "sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==",
"dev": true,
"bin": {
"prettier": "bin-prettier.js"
},
"engines": {
"node": ">=10.13.0"
}
},
"packages/fast-tooling/node_modules/resolve-typescript-plugin": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/resolve-typescript-plugin/-/resolve-typescript-plugin-1.1.5.tgz",
@ -29058,6 +29085,12 @@
"integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
"dev": true
},
"prettier": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz",
"integrity": "sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==",
"dev": true
},
"resolve-typescript-plugin": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/resolve-typescript-plugin/-/resolve-typescript-plugin-1.1.5.tgz",
@ -29243,6 +29276,12 @@
"yargs": "^16.2.0"
},
"dependencies": {
"prettier": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz",
"integrity": "sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==",
"dev": true
},
"typescript": {
"version": "4.3.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
@ -41735,9 +41774,9 @@
"dev": true
},
"prettier": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz",
"integrity": "sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==",
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz",
"integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==",
"dev": true
},
"pretty-error": {

Просмотреть файл

@ -56,7 +56,7 @@
"glob": "^7.1.2",
"husky": "^4.2.5",
"lint-staged": "^10.1.2",
"prettier": "2.0.2",
"prettier": "^2.6.1",
"rimraf": "^3.0.2",
"yargs": "^16.2.0"
}

Просмотреть файл

@ -3,7 +3,7 @@ import path from "path";
import fs from "fs-extra";
import { marked } from "marked";
import { template as templateResolver } from "lodash-es";
import versions from "../docs/versions.json";
import versions from "../docs/versions.json" assert { type: "json" };
import { ghPagesBaseUrl } from "./constants.js";
const __dirname = process.cwd();

Просмотреть файл

@ -1,4 +1,4 @@
import versions from "./versions.json";
import versions from "./versions.json" assert { type: "json" };
const toolingPackageName = "@microsoft/fast-tooling";
const toolingReactPackageName = "@microsoft/fast-tooling-react";

Просмотреть файл

@ -13,7 +13,7 @@
content="A system of development tools, and utilities used à la carte or as a suite to build enterprise-grade websites and applications."
/>
<meta property="og:type" content="website" />
<meta property="og:url" content="https://www.example.com/" />
<meta property="og:url" content="https://microsoft.github.io/fast-tooling/" />
<meta
property="og:description"
content="A system of development tools, and utilities used à la carte or as a suite to build enterprise-grade websites and applications."

Просмотреть файл

@ -12,6 +12,8 @@
--font-family: system-ui, -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell,
Noto Sans, sans-serif, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial,
sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
--font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas,
"Liberation Mono", "Courier New", monospace;
--background-color-layer-1: #18191a;
--background-color-layer-2: #242526;
--background-color-layer-3: hsla(0, 0%, 100%, 0.05);
@ -37,6 +39,9 @@
--category-background-color: var(--background-color-layer-2);
--category-border-radius: 10px;
--table-caption-background-color: var(--background-color-layer-3);
--code-background: #333437;
--code-border-radius: 6px;
--code-block-background: rgb(41, 45, 62);
display: flex;
flex-direction: column;
justify-content: space-between;
@ -87,7 +92,7 @@
width: var(--sidebar-width);
min-width: var(--sidebar-width);
border-right: 1px solid var(--sidebar-border-color);
height: calc(100vh - var(--toolbar-height) - var(--footer-height) - 30px);
min-height: calc(100vh - var(--toolbar-height) - var(--footer-height) - 30px);
overflow: auto;
}
@ -290,6 +295,20 @@
padding: var(--table-cell-padding);
}
pre code {
display: block;
padding: 16px;
background-color: var(--code-block-background);
}
code {
background-color: var(--code-background);
border: 0.1rem solid rgba(0, 0, 0, 0.1);
border-radius: var(--code-border-radius);
font-family: var(--font-family-monospace);
padding: 2px;
}
@media (max-width: 996px) {
.mobile-control {
display: flex;