Skip to content

Commit e3ce029

Browse files
alexdimaalexdima
committed
Prepare for node >= v8.0.0
1 parent 7c849cb commit e3ce029

6 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎src/bootstrap.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
1212

1313
const originalResolveLookupPaths = Module._resolveLookupPaths;
14-
Module._resolveLookupPaths = function (request, parent) {
15-
const result = originalResolveLookupPaths(request, parent);
14+
Module._resolveLookupPaths = function (request, parent, newReturn) {
15+
const result = originalResolveLookupPaths(request, parent, newReturn);
1616

17-
const paths = result[1];
17+
const paths = newReturn ? result : result[1];
1818
for (let i = 0, len = paths.length; i < len; i++) {
1919
if (paths[i] === NODE_MODULES_PATH) {
2020
paths.splice(i, 0, NODE_MODULES_ASAR_PATH);

‎src/cli.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
1212

1313
const originalResolveLookupPaths = Module._resolveLookupPaths;
14-
Module._resolveLookupPaths = function (request, parent) {
15-
const result = originalResolveLookupPaths(request, parent);
14+
Module._resolveLookupPaths = function (request, parent, newReturn) {
15+
const result = originalResolveLookupPaths(request, parent, newReturn);
1616

17-
const paths = result[1];
17+
const paths = newReturn ? result : result[1];
1818
for (let i = 0, len = paths.length; i < len; i++) {
1919
if (paths[i] === NODE_MODULES_PATH) {
2020
paths.splice(i, 0, NODE_MODULES_ASAR_PATH);

‎src/main.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ Error.stackTraceLimit = 100; // increase number of stack frames (from 10, https:
2020
const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
2121

2222
const originalResolveLookupPaths = Module._resolveLookupPaths;
23-
Module._resolveLookupPaths = function (request, parent) {
24-
const result = originalResolveLookupPaths(request, parent);
23+
Module._resolveLookupPaths = function (request, parent, newReturn) {
24+
const result = originalResolveLookupPaths(request, parent, newReturn);
2525

26-
const paths = result[1];
26+
const paths = newReturn ? result : result[1];
2727
for (let i = 0, len = paths.length; i < len; i++) {
2828
if (paths[i] === NODE_MODULES_PATH) {
2929
paths.splice(i, 0, NODE_MODULES_ASAR_PATH);

‎src/vs/code/electron-browser/issue/issueReporter.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ function main() {
6565
const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
6666

6767
const originalResolveLookupPaths = Module._resolveLookupPaths;
68-
Module._resolveLookupPaths = function (request, parent) {
69-
const result = originalResolveLookupPaths(request, parent);
68+
Module._resolveLookupPaths = function (request, parent, newReturn) {
69+
const result = originalResolveLookupPaths(request, parent, newReturn);
7070

71-
const paths = result[1];
71+
const paths = newReturn ? result : result[1];
7272
for (let i = 0, len = paths.length; i < len; i++) {
7373
if (paths[i] === NODE_MODULES_PATH) {
7474
paths.splice(i, 0, NODE_MODULES_ASAR_PATH);

‎src/vs/code/electron-browser/sharedProcess/sharedProcess.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ function main() {
6969
const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
7070

7171
const originalResolveLookupPaths = Module._resolveLookupPaths;
72-
Module._resolveLookupPaths = function (request, parent) {
73-
const result = originalResolveLookupPaths(request, parent);
72+
Module._resolveLookupPaths = function (request, parent, newReturn) {
73+
const result = originalResolveLookupPaths(request, parent, newReturn);
7474

75-
const paths = result[1];
75+
const paths = newReturn ? result : result[1];
7676
for (let i = 0, len = paths.length; i < len; i++) {
7777
if (paths[i] === NODE_MODULES_PATH) {
7878
paths.splice(i, 0, NODE_MODULES_ASAR_PATH);

‎src/vs/workbench/electron-browser/bootstrap/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ function main() {
137137
const NODE_MODULES_ASAR_PATH = NODE_MODULES_PATH + '.asar';
138138

139139
const originalResolveLookupPaths = Module._resolveLookupPaths;
140-
Module._resolveLookupPaths = function (request, parent) {
141-
const result = originalResolveLookupPaths(request, parent);
140+
Module._resolveLookupPaths = function (request, parent, newReturn) {
141+
const result = originalResolveLookupPaths(request, parent, newReturn);
142142

143-
const paths = result[1];
143+
const paths = newReturn ? result : result[1];
144144
for (let i = 0, len = paths.length; i < len; i++) {
145145
if (paths[i] === NODE_MODULES_PATH) {
146146
paths.splice(i, 0, NODE_MODULES_ASAR_PATH);

0 commit comments

Comments
 (0)