Possible fix for #15374 #15389

guybedford · 2017-09-13T11:54:31Z

This should fix the Windows path bug with drive letters being detected as the protocol, getting modules to work on Windows properly.

I still need to actually test this out on a Windows machine (won't have access again till tomorrow) but I'm 99% sure it'll work out.

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

Affected core subsystem(s)

esmodules

targos · 2017-09-13T12:02:58Z

Thanks for the fix! If you are able to write a test for it, we can run it on CI and we'll see if it works on the Windows machines.

/cc @bmeck

bmeck · 2017-09-13T12:11:29Z

This looks correct to me

…

On Sep 13, 2017 7:04 AM, "Michaël Zasso" ***@***.***> wrote: Thanks for the fix! If you are able to write a test for it, we can run it on CI and we'll see if it works on the Windows machines. /cc @bmeck <https://github.com/bmeck> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#15389 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAOUo88XjVp5xIR2c9esTbfjMGzx5PYnks5sh8S3gaJpZM4PV_g3> .

Fixes: nodejs#15374

bzoz

Tested this, it fixes #15374.

guybedford · 2017-09-13T18:21:34Z

Wrt to the tests, I'm not that knowledgable on how they actually get executed at a top level to know what the exact entry point is here, and as to why they weren't failing already on windows. Any end-to-end modules test should capture this - I don't think it's a specific test case.

targos · 2017-09-13T22:01:31Z

@guybedford you are right. I just realized that es-module tests don't run on CI yet: #15276

MylesBorins · 2017-09-14T11:53:11Z

Since this has been manually verified to work should we land once 48 hours has passed? I don't think we should block on fixing the CI for this.

jasnell · 2017-09-15T16:59:31Z

CI: https://ci.nodejs.org/job/node-test-pull-request/10097/

Fixes: #15374 PR-URL: #15389 Reviewed-By: Bradley Farias <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Bartosz Sosnowski <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>

jasnell · 2017-09-15T19:35:17Z

Landed in dce72c2

styfle · 2017-09-15T20:45:23Z

lib/module.js

@@ -435,7 +435,7 @@ Module._load = function(request, parent, isMain) {
    if (experimentalModules) {
      if (filename === null || /\.mjs$/.test(filename)) {


Is there a reason why regex is used here instead of filename.endsWith('.mjs')?

Habits from before that existed. Technically we could/should not be using prototype functions since they could be tainted by preloading via --require.

Technically we could/should not be using prototype functions since they could be tainted by preloading

There's a lot to tweak then because there's heavy use of apply, call, charAt, concat, pop, push, slice, test, and on and on. It'd be neat to see if some of this could be solved with a new context to avoid plucking all these methods off.

There's a lot to tweak then because there's heavy use of charAt, concat, pop, push, test, slice, and on and on.

This concern pops up now and then.
Refs: #12956
Refs: #12981

@jdalton Contexts are expensive w/o snapshots to create and we would need a frozen one to avoid mutations which would mean making that custom Snapshot, we couldn't use vm.createContext due to the funky sandbox bridge it creates leaking : #6283 . I'd be open to using one if we had a snapshot, but it would still be ~10ms on my benchmarks to create a full one.

Fixes: nodejs/node#15374 PR-URL: nodejs/node#15389 Reviewed-By: Bradley Farias <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Bartosz Sosnowski <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>

Fixes: #15374 PR-URL: #15389 Reviewed-By: Bradley Farias <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Bartosz Sosnowski <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>

Fixes: nodejs/node#15374 PR-URL: nodejs/node#15389 Reviewed-By: Bradley Farias <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Bartosz Sosnowski <[email protected]> Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>

nodejs-github-bot added the module Issues and PRs related to the module subsystem. label Sep 13, 2017

guybedford force-pushed the 15374 branch 2 times, most recently from 0119097 to cc05513 Compare September 13, 2017 11:58

module: ensure exact file url passed to top-level import for main

fccab24

Fixes: nodejs#15374

guybedford force-pushed the 15374 branch from cc05513 to fccab24 Compare September 13, 2017 12:22

bmeck approved these changes Sep 13, 2017

View reviewed changes

mscdex added the esm Issues and PRs related to the ECMAScript Modules implementation. label Sep 13, 2017

jasnell approved these changes Sep 13, 2017

View reviewed changes

bzoz approved these changes Sep 13, 2017

View reviewed changes

refack approved these changes Sep 13, 2017

View reviewed changes

targos approved these changes Sep 13, 2017

View reviewed changes

daxlab approved these changes Sep 14, 2017

View reviewed changes

jdalton mentioned this pull request Sep 14, 2017

ESM Module: ERR_INVALID_PROTOCOL #15374

Closed

jasnell closed this Sep 15, 2017

styfle reviewed Sep 15, 2017

View reviewed changes

jasnell mentioned this pull request Sep 20, 2017

Node.js 8.6.0 Release Proposal #15509

Merged

MylesBorins added the dont-land-on-v6.x label Oct 17, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Possible fix for #15374 #15389

Possible fix for #15374 #15389

guybedford commented Sep 13, 2017

targos commented Sep 13, 2017

bmeck commented Sep 13, 2017 via email

bzoz left a comment

guybedford commented Sep 13, 2017 •

edited

Loading

targos commented Sep 13, 2017

MylesBorins commented Sep 14, 2017

jasnell commented Sep 15, 2017

jasnell commented Sep 15, 2017

styfle Sep 15, 2017

refack Sep 15, 2017

bmeck Sep 15, 2017

refack Sep 15, 2017

jdalton Sep 15, 2017 •

edited

Loading

refack Sep 15, 2017

bmeck Sep 15, 2017

		@@ -435,7 +435,7 @@ Module._load = function(request, parent, isMain) {
		if (experimentalModules) {
		if (filename === null \|\| /\.mjs$/.test(filename)) {

Possible fix for #15374 #15389

Possible fix for #15374 #15389

Conversation

guybedford commented Sep 13, 2017

Checklist

Affected core subsystem(s)

targos commented Sep 13, 2017

bmeck commented Sep 13, 2017 via email

bzoz left a comment

Choose a reason for hiding this comment

guybedford commented Sep 13, 2017 • edited Loading

targos commented Sep 13, 2017

MylesBorins commented Sep 14, 2017

jasnell commented Sep 15, 2017

jasnell commented Sep 15, 2017

styfle Sep 15, 2017

Choose a reason for hiding this comment

refack Sep 15, 2017

Choose a reason for hiding this comment

bmeck Sep 15, 2017

Choose a reason for hiding this comment

refack Sep 15, 2017

Choose a reason for hiding this comment

jdalton Sep 15, 2017 • edited Loading

Choose a reason for hiding this comment

refack Sep 15, 2017

Choose a reason for hiding this comment

bmeck Sep 15, 2017

Choose a reason for hiding this comment

guybedford commented Sep 13, 2017 •

edited

Loading

jdalton Sep 15, 2017 •

edited

Loading