Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from nodejs:main #318

Merged
merged 2 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,6 @@ jobs:
# regardless of having code changes or not
fetch-depth: 1

- name: Restore Build Cache
uses: actions/cache/restore@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: |
.turbo/cache
.next/cache
node_modules/.cache
# We want to restore cache from local .npm caches, .next/cache and node_modules/.cache
# As this should reduce build times, and the overall time for installing packages or running operations
key: cache-build-${{ hashFiles('package-lock.json') }}-
restore-keys: |
cache-build-${{ hashFiles('package-lock.json') }}-
cache-build-

- name: Set up Node.js
uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
with:
Expand Down Expand Up @@ -132,20 +118,3 @@ jobs:
# this should be a last resort in case by any chances the build memory gets too high
# but in general this should never happen
NODE_OPTIONS: '--max_old_space_size=4096'

- name: Save Build Cache
# We want to store the Build Cache within Pull Requests or during pushes against the `main` branch
# since caches created on the `main` (default) branch can be reused on Pull Requests and PRs coming from forks
if: |
github.event_name == 'push' || github.event_name == 'pull_request_target'
uses: actions/cache/save@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: |
.turbo/cache
.next/cache
node_modules/.cache
# Most of sibling Pull Requests will use the cache key based on the package-lock.json
# We do also add a hashFiles for `.next/cache` as GitHub Actions only allows
# One cache with same key to exist, so to ensure we always have a cache from the latest build
# We add the hashFiles of `.next/cache` to the cache key of the Cache Entry
key: cache-build-${{ hashFiles('package-lock.json') }}-${{ hashFiles('.next/cache/**') }}
File renamed without changes.
16 changes: 14 additions & 2 deletions app/[locale]/not-found.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
import NotFound from '@/app/not-found';
import { useTranslations } from 'next-intl';
import type { FC } from 'react';

export default NotFound;
const LocalizedNotFound: FC = () => {
const t = useTranslations();

return (
<div className="container">
<h2>{t('pages.404.title')}</h2>
<h3>{t('pages.404.description')}</h3>
</div>
);
};

export default LocalizedNotFound;
18 changes: 0 additions & 18 deletions app/not-found.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion pages/en/docs/guides/simple-profiling.md
Original file line number Diff line number Diff line change
Expand Up @@ -287,4 +287,4 @@ You may also find [how to create a flame graph][diagnostics flamegraph] helpful.

[profiler inside V8]: https://v8.dev/docs/profile
[benefits of asynchronous programming]: https://nodesource.com/blog/why-asynchronous
[diagnostics flamegraph]: /en/docs/guides/diagnostics-flamegraph/
[diagnostics flamegraph]: /docs/guides/diagnostics-flamegraph/
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors: ovflowd, HassanBahati
This overview covers the difference between **blocking** and **non-blocking**
calls in Node.js. This overview will refer to the event loop and libuv but no
prior knowledge of those topics is required. Readers are assumed to have a
basic understanding of the JavaScript language and Node.js [callback pattern](/learn/javascript-asynchronous-programming-and-callbacks/).
basic understanding of the JavaScript language and Node.js [callback pattern](/learn/asynchronous-work/javascript-asynchronous-programming-and-callbacks).

> "I/O" refers primarily to interaction with the system's disk and
> network supported by [libuv](https://libuv.org/).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ As a beginner, it's hard to get to a point where you are confident enough in you
- [Arrays](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)
- [Template Literals](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals)
- [Strict Mode](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode)
- [ECMAScript 2015 (ES6) and beyond](/learn/ecmascript-2015-es6-and-beyond/)
- [ECMAScript 2015 (ES6) and beyond](/learn/getting-started/ecmascript-2015-es6-and-beyond)

With those concepts in mind, you are well on your road to become a proficient JavaScript developer, in both the browser and in Node.js.

Expand Down
Loading