Skip to content

Commit 84fdfd4

Browse files
committed
Fix requesting punycode
1 parent 8c3ce6b commit 84fdfd4

File tree

3 files changed

+23
-55
lines changed

3 files changed

+23
-55
lines changed

packages/node-services/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"@codesandbox/common": "^1.0.8",
1616
"constants-browserify": "^1.0.0",
1717
"events": "^3.0.0",
18+
"punycode": "^2.1.1",
1819
"resolve": "^1.10.0",
1920
"string_decoder": "^1.3.0",
2021
"util": "^0.12.1",

packages/node-services/src/module.ts

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function updateChildren(
1414
child: Module,
1515
scan: boolean
1616
) {
17-
var children = parent && parent.children;
17+
const children = parent && parent.children;
1818
if (children && !(scan && children.includes(child))) children.push(child);
1919
}
2020

@@ -28,15 +28,15 @@ export default class Module {
2828
static _extensions: {
2929
[ext: string]: (module: Module, filename: string) => void;
3030
} = {
31-
['.js']: function(module: Module, filename: string) {
31+
'.js': function(module: Module, filename: string) {
3232
const fs = BrowserFS.BFSRequire('fs');
33-
var content = fs.readFileSync(filename, 'utf8');
33+
const content = fs.readFileSync(filename, 'utf8');
3434

3535
module._compile(content, filename);
3636
},
37-
['.json']: function(module: Module, filename: string) {
37+
'.json': function(module: Module, filename: string) {
3838
const fs = BrowserFS.BFSRequire('fs');
39-
var content = fs.readFileSync(filename, 'utf8');
39+
const content = fs.readFileSync(filename, 'utf8');
4040

4141
try {
4242
module.exports = JSON.parse(content);
@@ -84,7 +84,7 @@ export default class Module {
8484
}
8585

8686
_compile(content: string, filename: string) {
87-
var _self = this;
87+
const _self = this;
8888
// remove shebang
8989
content = content.replace(/^\#\!.*/, '');
9090

@@ -162,14 +162,18 @@ export default class Module {
162162
return require('debug');
163163
}
164164

165-
if (request == '/vscode/node_modules.asar/vscode-textmate') {
165+
if (request === '/vscode/node_modules.asar/vscode-textmate') {
166166
return require('vscode-textmate/out/main');
167167
}
168168

169169
if (request === 'zlib') {
170170
return require('browserify-zlib');
171171
}
172172

173+
if (request === 'punycode') {
174+
return require('punycode');
175+
}
176+
173177
if (request === 'execa') {
174178
return {};
175179
}
@@ -202,6 +206,7 @@ export default class Module {
202206
extensionVersion: string,
203207
key: string
204208
) {}
209+
205210
sendTelemetryEvent(
206211
eventName: string,
207212
properties?: {
@@ -211,6 +216,7 @@ export default class Module {
211216
[key: string]: number;
212217
}
213218
) {}
219+
214220
dispose() {}
215221
},
216222
};
@@ -287,8 +293,8 @@ export default class Module {
287293
return BrowserFS.BFSRequire(request);
288294
}
289295

290-
var filename = Module._resolveFilename(request, parent);
291-
var cachedModule = Module._cache[filename];
296+
const filename = Module._resolveFilename(request, parent);
297+
const cachedModule = Module._cache[filename];
292298
if (cachedModule) {
293299
updateChildren(parent, cachedModule, true);
294300
return cachedModule.exports;
@@ -302,7 +308,7 @@ export default class Module {
302308
return getCaller;
303309
}
304310

305-
var module = new Module(filename, parent);
311+
const module = new Module(filename, parent);
306312

307313
if (isMain) {
308314
// @ts-ignore
@@ -312,7 +318,7 @@ export default class Module {
312318

313319
Module._cache[filename] = module;
314320

315-
var threw = true;
321+
let threw = true;
316322
try {
317323
module.load(filename);
318324
threw = false;

yarn.lock

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3225,14 +3225,7 @@
32253225
resolved "https://registry.yarnpkg.com/@reach/auto-id/-/auto-id-0.7.1.tgz#68ff4345b12c5ead6d0374a574480090b18a1b31"
32263226
integrity sha512-7bE/tCFc6KBMKkSfquJFpeZic+OHe+RAE2OHCN66felnleVwm6hr128d2UAp5vb1H12F6fm1kCUV9s3xNqSwMQ==
32273227

3228-
"@reach/auto-id@^0.8.5":
3229-
version "0.8.5"
3230-
resolved "https://registry.yarnpkg.com/@reach/auto-id/-/auto-id-0.8.5.tgz#940500d4c93624852efa5ecbed29c5d7015eb6e9"
3231-
integrity sha512-FmyoQ5Mvw+WXLd3JOlDmHDQKqhTiZ+BwtEq9HW6pgzYMztq1wr5itv4lrSDqOYa/hJfNrkBC8iCtaIKcykuYnQ==
3232-
dependencies:
3233-
tslib "^1.10.0"
3234-
3235-
"@reach/auto-id@^0.8.6":
3228+
"@reach/auto-id@^0.8.5", "@reach/auto-id@^0.8.6":
32363229
version "0.8.6"
32373230
resolved "https://registry.yarnpkg.com/@reach/auto-id/-/auto-id-0.8.6.tgz#34ecd120186960e3980dbc34cdace8e65405ea4e"
32383231
integrity sha512-lohwxy1uqj74p05WJDxMpo5paAQoM0r6MQYuVxR4U6piuGG67ggEPNVG7X4lQhi2jbeB6wvaPJiBVgikZJ/DIA==
@@ -3277,31 +3270,15 @@
32773270
tabbable "^4.0.0"
32783271
tslib "^1.10.0"
32793272

3280-
"@reach/portal@^0.8.5":
3281-
version "0.8.5"
3282-
resolved "https://registry.yarnpkg.com/@reach/portal/-/portal-0.8.5.tgz#586e8686e9ba34368b1df3fc9a84c3ef923dd2d3"
3283-
integrity sha512-YRQgItjxw6DznndN4T3YS6Ikuq+FPZg8fekXeM1feuQSnMlAtEAyYVaMhpAKSD65+Yc9Zu0Utfxp5ji+wO+FLg==
3284-
dependencies:
3285-
tslib "^1.10.0"
3286-
3287-
"@reach/portal@^0.8.6":
3273+
"@reach/portal@^0.8.5", "@reach/portal@^0.8.6":
32883274
version "0.8.6"
32893275
resolved "https://registry.yarnpkg.com/@reach/portal/-/portal-0.8.6.tgz#b96b92dca36955f7b3ef20617d2c35cf58b58c48"
32903276
integrity sha512-tmBpHe/3juLsXtsMUUQrHOz3rv5reILPZpt5ISQj5ucdRQ1cgSeWaGM2uDme5vKNXWz3/xTakkEExZyOhsM6zQ==
32913277
dependencies:
32923278
"@reach/utils" "^0.8.6"
32933279
tslib "^1.10.0"
32943280

3295-
"@reach/rect@^0.8.2":
3296-
version "0.8.2"
3297-
resolved "https://registry.yarnpkg.com/@reach/rect/-/rect-0.8.2.tgz#4e51ef1b734f26a42c3cdfa8d812a11b8017d3ef"
3298-
integrity sha512-6vrGm/9Cjw5ygbzccJdmrERqLxmaR2dATzkOvmsnTuR54BH/UgUjUYMxy/pVCmHZacNMTZRqOJwAyJQBOdCD4w==
3299-
dependencies:
3300-
"@reach/observe-rect" "^1.0.5"
3301-
prop-types "^15.7.2"
3302-
tslib "^1.10.0"
3303-
3304-
"@reach/rect@^0.8.6":
3281+
"@reach/rect@^0.8.2", "@reach/rect@^0.8.6":
33053282
version "0.8.6"
33063283
resolved "https://registry.yarnpkg.com/@reach/rect/-/rect-0.8.6.tgz#8f5b6c7fd2cf13a03cfda001fef0a5beb21fe1a2"
33073284
integrity sha512-1CriCEshJ1VUOw05bG9u1leHBydP+Z9Vk5adPw5v+bLHz1QW1HB/0UmZAbHluY6a5XLN2KqULKc9Fk7NT1jZKQ==
@@ -3334,15 +3311,7 @@
33343311
prop-types "^15.7.2"
33353312
tslib "^1.10.0"
33363313

3337-
"@reach/utils@^0.8.5":
3338-
version "0.8.5"
3339-
resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.8.5.tgz#6675d6f81054c8dce1b9d535280b0e3c5174fe7d"
3340-
integrity sha512-nc84exIqBa+EohJPBFjePQP88dBAP4l+tChxwWszzZ+R6tTtSgOg40WyQ5EjPYJFbltnbZIbASHefcEBrFxqng==
3341-
dependencies:
3342-
tslib "^1.10.0"
3343-
warning "^4.0.3"
3344-
3345-
"@reach/utils@^0.8.6":
3314+
"@reach/utils@^0.8.5", "@reach/utils@^0.8.6":
33463315
version "0.8.6"
33473316
resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.8.6.tgz#41c7ac8b7699d0e663bda773398ae1c459679ee3"
33483317
integrity sha512-ec9Ea99LQhlBoMKsJ7n2GYD3u3a0IHDLcfbA50C6aDKnSFvVYSPkF2Iav3fQ07VGfe+FuNGi0iYi1qkE8uSmDw==
@@ -10582,15 +10551,7 @@ dom-converter@^0.2:
1058210551
dependencies:
1058310552
"@babel/runtime" "^7.1.2"
1058410553

10585-
dom-serializer@0:
10586-
version "0.2.1"
10587-
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz#13650c850daffea35d8b626a4cfc4d3a17643fdb"
10588-
integrity sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==
10589-
dependencies:
10590-
domelementtype "^2.0.1"
10591-
entities "^2.0.0"
10592-
10593-
dom-serializer@^0.2.1:
10554+
dom-serializer@0, dom-serializer@^0.2.1:
1059410555
version "0.2.2"
1059510556
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
1059610557
integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==

0 commit comments

Comments
 (0)