Skip to content

Commit

Permalink
Merge branch 'next' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
ST-DDT authored Feb 14, 2023
2 parents eddff87 + c46c539 commit 54462fa
Show file tree
Hide file tree
Showing 40 changed files with 1,752 additions and 780 deletions.
10 changes: 5 additions & 5 deletions cypress/e2e/api.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ describe('API Test', () => {
const text = $el.find('a').text();
const link = $el.find('a').attr('href');

cy.visit(`/api/${link}`);

cy.get('h2').should('include.text', text);
cy.get('h1').should('not.include.text', 'PAGE NOT FOUND');
cy.go('back');
cy.request(`/api/${link}`).should((response) => {
expect(response.status).to.eq(200);
expect(response.body).to.include(text);
expect(response.body).to.not.include('PAGE NOT FOUND');
});
});
});
});
Expand Down
1 change: 1 addition & 0 deletions docs/.vitepress/components/api-docs/method.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export interface Method {
readonly examples: string; // HTML
readonly deprecated: boolean;
readonly since: string;
readonly sourcePath: string; // URL-Suffix
readonly seeAlsos: string[];
}

Expand Down
48 changes: 43 additions & 5 deletions docs/.vitepress/components/api-docs/method.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import type { Method } from './method';
import MethodParameters from './method-parameters.vue';
import { slugify } from '../../shared/utils/slugify';
import { sourceBaseUrl } from '../../../api/source-base-url';
const props = defineProps<{ method: Method }>();
Expand All @@ -20,11 +21,9 @@ function seeAlsoToUrl(see: string): string {

<div v-html="props.method.description"></div>

<div v-if="props.method.since">
<p>
<em>Available since v<span v-html="props.method.since" /></em>
</p>
</div>
<p v-if="props.method.since">
<em>Available since v{{ props.method.since }}</em>
</p>

<MethodParameters
v-if="props.method.parameters.length > 0"
Expand All @@ -48,5 +47,44 @@ function seeAlsoToUrl(see: string): string {
</li>
</ul>
</div>

<div v-if="props.method.sourcePath">
<h3>Source</h3>
<ul>
<li>
<a
:href="sourceBaseUrl + props.method.sourcePath"
target="_blank"
class="source-link"
>
View Source
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="currentColor"
width="1.2em"
height="1.2em"
class="source-link-icon"
>
<path
d="M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z"
/>
</svg>
</a>
</li>
</ul>
</div>
</div>
</template>

<style scoped>
a.source-link {
display: flex;
align-items: center;
}
svg.source-link-icon {
display: inline;
margin-left: 0.3em;
}
</style>
9 changes: 8 additions & 1 deletion docs/about/team/members.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"desc": "Passionate TypeScript enthusiast. Also core member of Vite.",
"links": [
{ "icon": "github", "link": "https://github.com/Shinigami92" },
{ "icon": "twitter", "link": "https://twitter.com/Shini_92" }
{ "icon": "mastodon", "link": "https://elk.zone/mas.to/@Shini92" }
],
"sponsor": "https://github.com/sponsors/Shinigami92"
},
Expand Down Expand Up @@ -82,6 +82,13 @@
{ "icon": "github", "link": "https://github.com/xDivisionByZerox" }
]
},
{
"avatar": "https://github.com/matthewmayer.png",
"name": "Matt Mayer",
"title": "Contributor",
"desc": "",
"links": [{ "icon": "github", "link": "https://github.com/matthewmayer" }]
},
{
"avatar": "https://github.com/pkuczynski.png",
"name": "Piotr Kuczynski",
Expand Down
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,49 +85,49 @@
"@algolia/client-search": "~4.14.3",
"@types/glob": "~8.0.1",
"@types/markdown-it": "~12.2.3",
"@types/node": "~18.11.18",
"@types/node": "~18.13.0",
"@types/prettier": "~2.7.2",
"@types/react": "~18.0.27",
"@types/react": "~18.0.28",
"@types/sanitize-html": "~2.8.0",
"@types/semver": "~7.3.13",
"@types/validator": "~13.7.11",
"@typescript-eslint/eslint-plugin": "~5.49.0",
"@typescript-eslint/parser": "~5.49.0",
"@vitest/coverage-c8": "~0.28.3",
"@vitest/ui": "~0.28.3",
"@types/validator": "~13.7.12",
"@typescript-eslint/eslint-plugin": "~5.52.0",
"@typescript-eslint/parser": "~5.52.0",
"@vitest/coverage-c8": "~0.28.5",
"@vitest/ui": "~0.28.5",
"@vueuse/core": "~9.12.0",
"c8": "~7.12.0",
"conventional-changelog-cli": "~2.2.2",
"cypress": "~12.4.1",
"esbuild": "~0.17.5",
"eslint": "~8.33.0",
"cypress": "~12.5.1",
"esbuild": "~0.17.8",
"eslint": "~8.34.0",
"eslint-config-prettier": "~8.6.0",
"eslint-define-config": "~1.14.0",
"eslint-define-config": "~1.15.0",
"eslint-gitignore": "~0.1.0",
"eslint-plugin-jsdoc": "~39.7.4",
"eslint-plugin-jsdoc": "~40.0.0",
"eslint-plugin-prettier": "~4.2.1",
"glob": "~8.1.0",
"npm-run-all": "~4.1.5",
"picocolors": "~1.0.0",
"prettier": "2.8.3",
"prettier": "2.8.4",
"prettier-plugin-organize-imports": "~3.2.2",
"react": "~18.2.0",
"react-dom": "~18.2.0",
"rimraf": "~4.1.2",
"sanitize-html": "~2.8.1",
"sanitize-html": "~2.9.0",
"semver": "~7.3.8",
"standard-version": "~9.5.0",
"tsx": "~3.12.2",
"typedoc": "~0.23.24",
"tsx": "~3.12.3",
"typedoc": "~0.23.25",
"typedoc-plugin-missing-exports": "~1.0.0",
"typescript": "~4.9.4",
"validator": "~13.7.0",
"vite": "~4.0.4",
"vitepress": "1.0.0-alpha.43",
"vitest": "~0.28.3",
"vue": "~3.2.45"
"typescript": "~4.9.5",
"validator": "~13.9.0",
"vite": "~4.1.1",
"vitepress": "1.0.0-alpha.46",
"vitest": "~0.28.5",
"vue": "~3.2.47"
},
"packageManager": "pnpm@7.26.2",
"packageManager": "pnpm@7.27.0",
"engines": {
"node": "^14.17.0 || ^16.13.0 || >=18.0.0",
"npm": ">=6.14.13"
Expand Down
Loading

0 comments on commit 54462fa

Please sign in to comment.