archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2026-02-01 16:07:13 +00:00
Code Issues Projects Releases Wiki Activity

chore: upgrade htmljs-parser (#1811)

Browse Source
This commit is contained in:
Dylan Piercey 2022-06-20 14:17:10 -07:00 committed by GitHub
parent f4639a1a88
commit 49ef9801b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/fifty-pugs-end.md Normal file
View File

@ -0,0 +1,5 @@
---
"@marko/compiler": patch
---
Upgrade htmljs-parser to improve source location information.

16
package-lock.json generated
View File

@ -4893,9 +4893,9 @@
"dev": true
},
"node_modules/htmljs-parser": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/htmljs-parser/-/htmljs-parser-3.3.4.tgz",
"integrity": "sha512-zFj2WYq4iQEqH1E5ru0PCIf01GnuzCrfiAJtb5t5IPk1i0L42Ovdeiz+uXlM4YhMPtMgwlJZ3N0J1YB7poa35A=="
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/htmljs-parser/-/htmljs-parser-4.0.0.tgz",
"integrity": "sha512-QaZgalvHTvVCCoXO9R9iZuZrSDGqvBR9PocN2DcsvcgCPfJpQYl8tNule36g16yUxAp2yiEVdVyHo9fTT3aBXQ=="
},
"node_modules/htmlparser2": {
"version": "3.10.1",
@ -9900,7 +9900,7 @@
"@marko/babel-utils": "^5.21.1",
"complain": "^1.6.0",
"he": "^1.2.0",
"htmljs-parser": "^3.3.4",
"htmljs-parser": "^4.0.0",
"jsesc": "^3.0.2",
"lasso-package-root": "^1.0.1",
"property-handlers": "^1.1.1",
@ -11583,7 +11583,7 @@
"@marko/translator-default": "^5.21.1",
"complain": "^1.6.0",
"he": "^1.2.0",
"htmljs-parser": "^3.3.4",
"htmljs-parser": "^4.0.0",
"jsesc": "^3.0.2",
"lasso-package-root": "^1.0.1",
"property-handlers": "^1.1.1",
@ -13726,9 +13726,9 @@
"dev": true
},
"htmljs-parser": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/htmljs-parser/-/htmljs-parser-3.3.4.tgz",
"integrity": "sha512-zFj2WYq4iQEqH1E5ru0PCIf01GnuzCrfiAJtb5t5IPk1i0L42Ovdeiz+uXlM4YhMPtMgwlJZ3N0J1YB7poa35A=="
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/htmljs-parser/-/htmljs-parser-4.0.0.tgz",
"integrity": "sha512-QaZgalvHTvVCCoXO9R9iZuZrSDGqvBR9PocN2DcsvcgCPfJpQYl8tNule36g16yUxAp2yiEVdVyHo9fTT3aBXQ=="
},
"htmlparser2": {
"version": "3.10.1",

2
packages/compiler/package.json
View File

@ -16,7 +16,7 @@
"@marko/babel-utils": "^5.21.1",
"complain": "^1.6.0",
"he": "^1.2.0",
"htmljs-parser": "^3.3.4",
"htmljs-parser": "^4.0.0",
"jsesc": "^3.0.2",
"lasso-package-root": "^1.0.1",
"property-handlers": "^1.1.1",

5
packages/compiler/src/babel-plugin/parser.js
View File

@ -10,8 +10,9 @@ const noop = () => {};
const emptyRange = part => part.start === part.end;
const isAttrTag = tag => tag.name.value?.[0] === "@";
const toBabelPosition = ({ line, character }) => ({
// Babel lines start at 1 and use "column" instead of "character".
line: line + 1,
column: character ? character - 1 : character
column: character
});
export function parseMarko(file) {
@ -28,8 +29,6 @@ export function parseMarko(file) {
let onNext = noop;
const positionAt = index => toBabelPosition(parser.positionAt(index));
const locationAt = range => {
// Babel columns start at 0, but that is silly.
// Here we normalize the parsers 1 based columns.
const { start, end } = parser.locationAt(range);
return {
start: toBabelPosition(start),

2
packages/translator-default/test/fixtures/error-unclosed-tag/snapshots/cjs-error-expected.txt vendored
View File

@ -1,4 +1,4 @@
packages/translator-default/test/fixtures/error-unclosed-tag/template.marko(1,1): Missing ending "div" tag
> 1 | <div>
| ^
| ^^^^^
2 | <span/>

2
packages/translator-default/test/fixtures/error-unclosed-tag/snapshots/generated-error-expected.txt vendored
View File

@ -1,4 +1,4 @@
packages/translator-default/test/fixtures/error-unclosed-tag/template.marko(1,1): Missing ending "div" tag
> 1 | <div>
| ^
| ^^^^^
2 | <span/>

2
packages/translator-default/test/fixtures/error-unclosed-tag/snapshots/html-error-expected.txt vendored
View File

@ -1,4 +1,4 @@
packages/translator-default/test/fixtures/error-unclosed-tag/template.marko(1,1): Missing ending "div" tag
> 1 | <div>
| ^
| ^^^^^
2 | <span/>

2
packages/translator-default/test/fixtures/error-unclosed-tag/snapshots/htmlProduction-error-expected.txt vendored
View File

@ -1,4 +1,4 @@
packages/translator-default/test/fixtures/error-unclosed-tag/template.marko(1,1): Missing ending "div" tag
> 1 | <div>
| ^
| ^^^^^
2 | <span/>

2
packages/translator-default/test/fixtures/error-unclosed-tag/snapshots/hydrate-error-expected.txt vendored
View File

@ -1,4 +1,4 @@
packages/translator-default/test/fixtures/error-unclosed-tag/template.marko(1,1): Missing ending "div" tag
> 1 | <div>
| ^
| ^^^^^
2 | <span/>

2
packages/translator-default/test/fixtures/error-unclosed-tag/snapshots/vdom-error-expected.txt vendored
View File

@ -1,4 +1,4 @@
packages/translator-default/test/fixtures/error-unclosed-tag/template.marko(1,1): Missing ending "div" tag
> 1 | <div>
| ^
| ^^^^^
2 | <span/>

2
packages/translator-default/test/fixtures/error-unclosed-tag/snapshots/vdomProduction-error-expected.txt vendored
View File

@ -1,4 +1,4 @@
packages/translator-default/test/fixtures/error-unclosed-tag/template.marko(1,1): Missing ending "div" tag
> 1 | <div>
| ^
| ^^^^^
2 | <span/>