Skip to content

Commit b81ff43

Browse files
authored
Merge branch 'main' of https://github.com/nodejs/nodejs.org into tailwind-update
2 parents c52e14b + 5230197 commit b81ff43

File tree

19 files changed

+335
-116
lines changed

19 files changed

+335
-116
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ updates:
4545
next-js:
4646
patterns:
4747
- 'next'
48-
- 'eslint-config-next'
4948
- '@next/eslint-plugin-next'
5049
- 'next-*'
5150
- '@vercel/*'

.github/workflows/lint-and-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ jobs:
202202
startsWith(github.event.pull_request.head.ref, 'dependabot/') == false &&
203203
github.event.pull_request.head.ref != 'chore/crowdin')
204204
# sha reference has no stable git tag reference or URL. see https://github.com/chromaui/chromatic-cli/issues/797
205-
uses: chromaui/action@30b6228aa809059d46219e0f556752e8672a7e26
205+
uses: chromaui/action@c93e0bc3a63aa176e14a75b61a31847cbfdd341c
206206
with:
207207
workingDir: packages/ui-components
208208
buildScriptName: storybook:build

apps/site/components/Common/ActiveLink.tsx

Lines changed: 0 additions & 14 deletions
This file was deleted.

apps/site/components/__mocks__/client-context.mjs

Lines changed: 0 additions & 11 deletions
This file was deleted.

apps/site/components/__mocks__/next-image.mjs

Lines changed: 0 additions & 4 deletions
This file was deleted.

apps/site/components/withRouterSelect.tsx

Lines changed: 0 additions & 31 deletions
This file was deleted.

apps/site/navigation.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,17 +211,17 @@
211211
"link": "/learn/typescript/introduction",
212212
"label": "components.navigation.learn.typescript.links.introduction"
213213
},
214-
"transpile": {
215-
"link": "/learn/typescript/transpile",
216-
"label": "components.navigation.learn.typescript.links.transpile"
214+
"runNatively": {
215+
"link": "/learn/typescript/run-natively",
216+
"label": "components.navigation.learn.typescript.links.runNatively"
217217
},
218218
"run": {
219219
"link": "/learn/typescript/run",
220220
"label": "components.navigation.learn.typescript.links.run"
221221
},
222-
"runNatively": {
223-
"link": "/learn/typescript/run-natively",
224-
"label": "components.navigation.learn.typescript.links.runNatively"
222+
"transpile": {
223+
"link": "/learn/typescript/transpile",
224+
"label": "components.navigation.learn.typescript.links.transpile"
225225
},
226226
"publishingTSPackage": {
227227
"link": "/learn/typescript/publishing-a-ts-package",

apps/site/next.constants.mjs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,6 @@ export const NEXT_DATA_URL = process.env.NEXT_PUBLIC_DATA_URL
100100
? `${BASE_URL}${BASE_PATH}/en/next-data/`
101101
: `http://localhost:${process.env.PORT ?? 3000}/en/next-data/`;
102102

103-
/**
104-
* This ReGeX is used to remove the `index.md(x)` suffix of a name and to remove
105-
* the `.md(x)` extensions of a filename.
106-
*
107-
* This RegEx is used to transform the file system pathnames into acceptable
108-
* Route Segments for Next.js Dynamic Routes on `pages/[...path].tsx`
109-
*/
110-
export const MD_EXTENSION_REGEX = /((\/)?(index))?\.mdx?$/i;
111-
112103
/**
113104
* This is the default type of blog post type that we use for OG Meta Tags
114105
*/

apps/site/next.helpers.mjs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,6 @@ import { glob } from 'glob';
1313
* @type {Map<string, Promise<string>>} */
1414
const globCacheByPath = new Map();
1515

16-
export const getMatchingRoutes = (route = '', matches = []) =>
17-
matches.some(match => route === match);
18-
19-
/**
20-
* This method is responsible for reading all immediate subdirectories of a directory
21-
*
22-
* @param {string} root the root directory to search from
23-
* @param {string} cwd the current working directory
24-
* @returns {Promise<Array<string>>} a promise containing an array of directories
25-
*/
26-
export const getDirectories = async (root, cwd) => {
27-
return glob('*', { root, cwd, withFileTypes: true })
28-
.then(d => d.filter(e => e.isDirectory()))
29-
.then(d => d.map(e => e.name));
30-
};
31-
3216
/**
3317
* This gets the relative path from `import.meta.url`
3418
*

apps/site/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"@node-core/ui-components": "*",
2727
"@node-core/website-i18n": "*",
2828
"@nodevu/core": "0.3.0",
29-
"@opentelemetry/api": "1.9.0",
3029
"@orama/react-components": "^0.6.4",
3130
"@oramacloud/client": "^2.1.4",
3231
"@radix-ui/react-slot": "^1.1.2",

0 commit comments

Comments
 (0)