Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit aa8bdb6

Browse filesBrowse files
nodejs-github-botmarco-ippolito
nodejs-github-bot
authored and
marco-ippolito
committed
deps: update cjs-module-lexer to 2.1.1
PR-URL: #60646 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent cc849fd commit aa8bdb6
Copy full SHA for aa8bdb6

11 files changed

+26-15Lines changed: 26 additions & 15 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎deps/cjs-module-lexer/dist/lexer.js‎

Copy file name to clipboardExpand all lines: deps/cjs-module-lexer/dist/lexer.js
+1-1Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

‎deps/cjs-module-lexer/dist/lexer.mjs‎

Copy file name to clipboardExpand all lines: deps/cjs-module-lexer/dist/lexer.mjs
+2-2Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.
Collapse file

‎deps/cjs-module-lexer/lexer.js‎

Copy file name to clipboardExpand all lines: deps/cjs-module-lexer/lexer.js
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,10 @@ function parseSource (cjsSource) {
137137
pos += 4;
138138
if (source.charCodeAt(pos) === 40/*(*/) {
139139
openTokenPosStack[openTokenDepth++] = lastTokenPos;
140-
if (source.charCodeAt(++pos) === 114/*r*/)
140+
if (source.charCodeAt(pos + 1) === 114/*r*/) {
141+
pos++;
141142
tryParseRequire(ExportStar);
143+
}
142144
}
143145
}
144146
lastTokenPos = pos;
@@ -288,7 +290,7 @@ function tryBacktrackAddStarExportBinding (bPos) {
288290

289291
// `Object.` `prototype.`? hasOwnProperty.call(` IDENTIFIER `, ` IDENTIFIER$2 `)`
290292
function tryParseObjectHasOwnProperty (it_id) {
291-
ch = commentWhitespace();
293+
let ch = commentWhitespace();
292294
if (ch !== 79/*O*/ || !source.startsWith('bject', pos + 1)) return false;
293295
pos += 6;
294296
ch = commentWhitespace();
Collapse file

‎deps/cjs-module-lexer/src/Makefile‎

Copy file name to clipboardExpand all lines: deps/cjs-module-lexer/src/Makefile
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
WASM2WAT := ../wabt/bin/wasm2wat
2-
WASM_OPT := ../binaryen/bin/wasm-opt
1+
WASM2WAT ?= ../wabt/bin/wasm2wat
2+
WASM_OPT ?= ../binaryen/bin/wasm-opt
33

44
.PHONY: optimize clean
55

@@ -12,5 +12,8 @@ lib/lexer.wasm: include-wasm/cjs-module-lexer.h src/lexer.c | lib/
1212
lib/:
1313
@mkdir -p $@
1414

15+
optimize: lib/lexer.wasm
16+
$(WASM_OPT) -Oz --enable-bulk-memory --strip-debug lib/lexer.wasm -o lib/lexer.wasm
17+
1518
clean:
1619
$(RM) lib/*
Collapse file

‎deps/cjs-module-lexer/src/build/wasm.js‎

Copy file name to clipboardExpand all lines: deps/cjs-module-lexer/src/build/wasm.js
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const WASM_BUILDER_CONTAINER = 'ghcr.io/nodejs/wasm-builder@sha256:975f391d907e42a75b8c72eb77c782181e941608687d4d8694c3e9df415a0970' // v0.0.9
44

5-
const WASM_OPT = './wasm-opt'
5+
const WASM_OPT = process.env.WASM_OPT || './wasm-opt'
66

77
const { execSync } = require('node:child_process')
88
const { writeFileSync, readFileSync, existsSync, mkdirSync } = require('node:fs')
Collapse file

‎deps/cjs-module-lexer/src/lexer.js‎

Copy file name to clipboardExpand all lines: deps/cjs-module-lexer/src/lexer.js
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,10 @@ function parseSource (cjsSource) {
137137
pos += 4;
138138
if (source.charCodeAt(pos) === 40/*(*/) {
139139
openTokenPosStack[openTokenDepth++] = lastTokenPos;
140-
if (source.charCodeAt(++pos) === 114/*r*/)
140+
if (source.charCodeAt(pos + 1) === 114/*r*/) {
141+
pos++;
141142
tryParseRequire(ExportStar);
143+
}
142144
}
143145
}
144146
lastTokenPos = pos;
@@ -288,7 +290,7 @@ function tryBacktrackAddStarExportBinding (bPos) {
288290

289291
// `Object.` `prototype.`? hasOwnProperty.call(` IDENTIFIER `, ` IDENTIFIER$2 `)`
290292
function tryParseObjectHasOwnProperty (it_id) {
291-
ch = commentWhitespace();
293+
let ch = commentWhitespace();
292294
if (ch !== 79/*O*/ || !source.startsWith('bject', pos + 1)) return false;
293295
pos += 6;
294296
ch = commentWhitespace();
Collapse file

‎deps/cjs-module-lexer/src/lib/lexer.wasm‎

Copy file name to clipboard
0 Bytes
Binary file not shown.
Collapse file

‎deps/cjs-module-lexer/src/package-lock.json‎

Copy file name to clipboardExpand all lines: deps/cjs-module-lexer/src/package-lock.json
+4-2Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

‎deps/cjs-module-lexer/src/package.json‎

Copy file name to clipboardExpand all lines: deps/cjs-module-lexer/src/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cjs-module-lexer",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"description": "Lexes CommonJS modules, returning their named exports metadata",
55
"main": "lexer.js",
66
"exports": {
Collapse file

‎deps/cjs-module-lexer/src/src/lexer.c‎

Copy file name to clipboardExpand all lines: deps/cjs-module-lexer/src/src/lexer.c
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,10 @@ uint32_t parseCJS (uint16_t* _source, uint32_t _sourceLen, void (*_addExport)(co
120120
pos += 4;
121121
if (*pos == '(') {
122122
openTokenPosStack[openTokenDepth++] = lastTokenPos;
123-
if (*(++pos) == 'r')
123+
if (*(pos + 1) == 'r') {
124+
pos++;
124125
tryParseRequire(ExportStar);
126+
}
125127
}
126128
}
127129
lastTokenPos = pos;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.