Skip to content

Commit

Permalink
Merge branch 'main' into meta/add-more-info
Browse files Browse the repository at this point in the history
  • Loading branch information
ovflowd authored Sep 6, 2023
2 parents b50d2a6 + b0afe5a commit b3d2521
Show file tree
Hide file tree
Showing 62 changed files with 2,558 additions and 2,630 deletions.
5 changes: 3 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ node_modules
.swc
build

# Legacy Public Files
public/static/documents
# Public Files
public/node-releases-data.json
public/blog-posts-data.json

# We don't want to lint/prettify the Coverage Results
coverage
Expand Down
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,22 @@ updates:
schedule:
interval: weekly
day: friday
labels:
- dependencies
- 'github_actions:pull-request'
- 'github_actions'
commit-message:
prefix: meta
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: '/'
versioning-strategy: increase
schedule:
interval: weekly
day: friday
labels:
- dependencies
- 'github_actions:pull-request'
commit-message:
prefix: meta
groups:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ jobs:
# the `${{ needs.base.outputs.turbo_args }}` is a string substitution happening from the base job
run: npx --package=turbo@latest -- turbo prettier ${{ needs.base.outputs.turbo_args }}

- name: Run `tsc build`
# We want to check that all TypeScript checks are working as expected
run: npx --package=typescript@latest -- tsc --build .

- name: Save Lint Cache
# We don't need to upload a Lint Cache for Dependabot PRs and also when the GitHub Event is not a Pull Request
# i.e. if the Event is a Merge Queue Event
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ storybook-static
# ESlint Cache Files
.eslintmdcache
.eslintjscache

# TypeScript
tsconfig.tsbuildinfo
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ build
# Files that should not be parsed
CODEOWNERS

# Legacy Public Files
# Public Files
public/static/documents
public/node-releases-data.json
public/blog-posts-data.json

# We don't want to lint/prettify the Coverage Results
coverage
Expand Down
20 changes: 16 additions & 4 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
import NextImage from 'next/image';
import { Open_Sans } from 'next/font/google';
import { SiteProvider } from '../providers/siteProvider';
import { ThemeProvider } from '../providers/themeProvider';
import { LocaleProvider } from '../providers/localeProvider';
import { openSans } from '../util/nextFonts';
import type { Preview } from '@storybook/react';

import '../styles/index.scss';
import '../styles/new/index.scss';

const openSans = Open_Sans({
weight: ['300', '400', '600', '700'],
display: 'fallback',
subsets: ['latin'],
variable: '--font-open-sans',
});

const preview: Preview = {
parameters: {
Expand All @@ -25,12 +32,17 @@ const preview: Preview = {
},
};

// The `openSans.variable` injects the name of the Font Family to the DOM Tree
// The `font-open-sans` variable is the actual Tailwind Classname
// that tells that the font-family for this Component tree should be "Open Sans"
const storyClasses = `${openSans.variable} font-open-sans`;

export const decorators = [
Story => (
<SiteProvider>
<LocaleProvider>
<ThemeProvider font={openSans.style.fontFamily}>
<div data-test-id="story-root">
<ThemeProvider>
<div className={storyClasses}>
<Story />
</div>
</ThemeProvider>
Expand Down
6 changes: 6 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
"selector-pseudo-class-no-unknown": [
true,
{ "ignorePseudoClasses": ["global"] }
],
"scss/at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["tailwind"]
}
]
}
}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ The webhook is set up on GitHub for this project and talks to a small Node serve
- Thanks to [Cloudflare](https://cloudflare.com) for providing the infrastructure that serves Node.js's Website, Node.js's CDN and more.

[code of conduct]: https://github.com/nodejs/admin/blob/main/CODE_OF_CONDUCT.md
[contribution guidelines]: ./CONTRIBUTING.md
[content vs code]: ./CONTENT_VS_CODE.md
[dependency pinning]: ./DEPENDENCY_PINNING.md
[collaborator guide]: ./COLLABORATOR_GUIDE.md
[contribution guidelines]: https://github.com/nodejs/nodejs.org/blob/main/CONTRIBUTING.md
[content vs code]: https://github.com/nodejs/nodejs.org/blob/main/CONTENT_VS_CODE.md
[dependency pinning]: https://github.com/nodejs/nodejs.org/blob/main/DEPENDENCY_PINNING.md
[collaborator guide]: https://github.com/nodejs/nodejs.org/blob/main/COLLABORATOR_GUIDE.md
[figma design]: https://www.figma.com/file/pu1vZPqNIM7BePd6W8APA5/Node.js
[translation guidelines]: ./TRANSLATION.md
[translation guidelines]: https://github.com/nodejs/nodejs.org/blob/main/TRANSLATION.md
26 changes: 0 additions & 26 deletions components/Api/DataTag/index.module.scss

This file was deleted.

25 changes: 0 additions & 25 deletions components/Api/DataTag/index.stories.ts

This file was deleted.

12 changes: 0 additions & 12 deletions components/Api/DataTag/index.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions components/Api/JsonLink/index.module.scss

This file was deleted.

14 changes: 0 additions & 14 deletions components/Api/JsonLink/index.stories.ts

This file was deleted.

22 changes: 0 additions & 22 deletions components/Api/JsonLink/index.tsx

This file was deleted.

5 changes: 0 additions & 5 deletions components/Api/SourceLink/index.module.scss

This file was deleted.

14 changes: 0 additions & 14 deletions components/Api/SourceLink/index.stories.ts

This file was deleted.

20 changes: 0 additions & 20 deletions components/Api/SourceLink/index.tsx

This file was deleted.

16 changes: 0 additions & 16 deletions components/Article/Alert/index.module.scss

This file was deleted.

13 changes: 0 additions & 13 deletions components/Article/Alert/index.stories.ts

This file was deleted.

8 changes: 0 additions & 8 deletions components/Article/Alert/index.tsx

This file was deleted.

Loading

0 comments on commit b3d2521

Please sign in to comment.