Skip to content
Open
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
10 changes: 10 additions & 0 deletions doc/contributing/pull-requests.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,14 @@ A good commit message should describe what changed and why.
contain an explanation about the reason of the breaking change, which
situation would trigger the breaking change, and what is the exact change.

6. Your commit must contain the `Signed-off-by` line with your name and email
address as an acknowledgement that you agree to the [Developer Certificate of Origin][].
Bot generated commits are exempt from this requirement. If a commit has
multiple authors, the `Signed-off-by` line should be added for each author;
and at least one should match the author information in the commit metadata.
This rule does not apply to dependency updates (e.g. cherry-picks), release
commits, or backport commits.

Sample complete commit message:

```text
Expand All @@ -210,6 +218,7 @@ less.

Fixes: https://github.com/nodejs/node/issues/1337
Refs: https://eslint.org/docs/rules/space-in-parens.html
Signed-off-by: J. Random User <j.random.user@example.com>
```

If you are new to contributing to Node.js, please try to do your best at
Expand Down Expand Up @@ -594,6 +603,7 @@ More than one subsystem may be valid for any particular issue or pull request.
[Building guide]: ../../BUILDING.md
[CI (Continuous Integration) test run]: #continuous-integration-testing
[Code of Conduct]: https://github.com/nodejs/admin/blob/HEAD/CODE_OF_CONDUCT.md
[Developer Certificate of Origin]: ../../CONTRIBUTING.md#developers-certificate-of-origin-11
[Onboarding guide]: ../../onboarding.md
[approved]: #getting-approvals-for-your-pull-request
[benchmark results]: writing-and-running-benchmarks.md
Expand Down
10 changes: 9 additions & 1 deletion src/node_modules.cc
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,16 @@ void BindingData::GetPackageScopeConfig(
url::ThrowInvalidURL(realm->env(), resolved.ToStringView(), std::nullopt);
return;
}
BufferValue file_path_buf(realm->isolate(),
String::NewFromUtf8(realm->isolate(),
file_url->c_str(),
NewStringType::kInternalized,
file_url->size())
.ToLocalChecked());
ToNamespacedPath(realm->env(), &file_path_buf);
error_context.specifier = resolved.ToString();
auto package_json = GetPackageJSON(realm, *file_url, &error_context);
auto package_json =
GetPackageJSON(realm, file_path_buf.ToStringView(), &error_context);
if (package_json != nullptr) {
if constexpr (return_only_type) {
Local<Value> value;
Expand Down
4 changes: 2 additions & 2 deletions test/es-module/test-esm-long-path-win.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe('long path on Windows', () => {
tmpdir.refresh();

fs.mkdirSync(packageDirPath);
fs.writeFileSync(packageJSPath, '');
fs.writeFileSync(packageJSPath, '{}');
fs.writeFileSync(indexJSPath, '');

const packageJsonUrl = pathToFileURL(
Expand All @@ -83,7 +83,7 @@ describe('long path on Windows', () => {
tmpdir.refresh();

fs.mkdirSync(packageDirPath);
fs.writeFileSync(packageJSPath, '');
fs.writeFileSync(packageJSPath, '{}');
fs.writeFileSync(indexJSPath, '');

const packageJsonUrl = pathToFileURL(
Expand Down
40 changes: 40 additions & 0 deletions test/parallel/test-module-subpath-import-long-path.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Regression test for https://github.com/nodejs/node/issues/62043
'use strict';

const common = require('../common');
if (!common.isWindows) {
common.skip('this test is Windows-specific.');
}

const fs = require('fs');
const { createRequire } = require('module');
const path = require('path');
const tmpdir = require('../common/tmpdir');

tmpdir.refresh();

const TARGET = 260; // Shortest length that used to trigger the bug
const fixedLen = tmpdir.path.length + 2 + 'package.json'.length;
const dirNameLen = Math.max(TARGET - fixedLen, 1);

const dir = path.join(tmpdir.path, 'a'.repeat(dirNameLen));
const depDir = path.join(dir, 'node_modules', 'dep');
const packageJsonPath = path.join(dir, 'package.json');

fs.mkdirSync(depDir, { recursive: true });
fs.writeFileSync(
packageJsonPath,
JSON.stringify({ imports: { '#foo': './foo.mjs' } }),
);
fs.writeFileSync(path.join(dir, 'foo.mjs'), 'export default 1;\n');
fs.writeFileSync(
path.join(depDir, 'package.json'),
JSON.stringify({ name: 'dep', exports: { '.': './index.mjs' } }),
);
fs.writeFileSync(path.join(depDir, 'index.mjs'), 'export default 1;\n');

const req = createRequire(path.join(dir, '_.mjs'));

// Both resolves should succeed without throwing
req.resolve('dep');
req.resolve('#foo');