Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't fail when HTML tags are implied #6752

Merged
merged 7 commits into from
Sep 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion flow-libs/posthtml-parser.js.flow
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,8 @@ declare module 'posthtml-parser' {
}
) => PostHTMLNode;

declare module.exports: typeof parser;
declare module.exports: {
parser: typeof parser;
...
}
}
7 changes: 5 additions & 2 deletions flow-libs/posthtml-render.js.flow
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ declare module 'posthtml-render' {
...
};

declare var parser: (
declare var render: (
tree: PostHTMLNode,
options?: {
singleTags?: Array<string | RegExp>,
Expand All @@ -21,5 +21,8 @@ declare module 'posthtml-render' {
}
) => string;

declare module.exports: typeof parser;
declare module.exports: {
render: typeof render;
...
}
}
32 changes: 32 additions & 0 deletions packages/core/integration-tests/test/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,38 @@ describe('html', function() {
assert.equal(html.length, 0);
});

it('should work with an invalid html file', async function() {
let inputFile = path.join(
__dirname,
'/integration/html-invalid/index.html',
);
await bundle(inputFile, {
defaultTargetOptions: {
shouldOptimize: false,
},
});

let outputFile = path.join(distDir, 'index.html');
let html = await outputFS.readFile(outputFile, 'utf8');
assert(html.includes('This is a paragraph'));
});

it("should work with html that doesn't include optional closing tags", async function() {
let inputFile = path.join(
__dirname,
'/integration/html-optional-closing-tags/index.html',
);
await bundle(inputFile, {
defaultTargetOptions: {
shouldOptimize: false,
},
});

let outputFile = path.join(distDir, 'index.html');
let html = await outputFS.readFile(outputFile, 'utf8');
assert(html.includes('Paragraph 1'));
});

it('should read .htmlnanorc.json and minify HTML in production mode', async function() {
await bundle(
path.join(__dirname, '/integration/htmlnano-config/index.html'),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!doctype html>
<html>

<head>
<title>Invalid HTML file</title>
</head>

<body>

<p>This is a paragraph.<ul><li>This is a list.</li></ul></p>

</body>

</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!DOCTYPE html>

<title>Title</title>

<p>Paragraph 1

<hr>

<p>Paragraph 2
4 changes: 2 additions & 2 deletions packages/core/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"chalk": "^4.1.0",
"ncp": "^2.0.0",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.4",
"posthtml-parser": "^0.9.0",
"posthtml": "^0.16.5",
"posthtml-parser": "^0.10.1",
"resolve": "^1.12.0",
"ws": "^7.0.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/test-utils/src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import path from 'path';
import url from 'url';
import WebSocket from 'ws';
import nullthrows from 'nullthrows';
import postHtmlParse from 'posthtml-parser';
import {parser as postHtmlParse} from 'posthtml-parser';
import postHtml from 'posthtml';
import EventEmitter from 'events';

Expand Down
2 changes: 1 addition & 1 deletion packages/optimizers/htmlnano/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@parcel/plugin": "2.0.0-rc.0",
"htmlnano": "^1.0.1",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.4",
"posthtml": "^0.16.5",
"svgo": "^2.4.0"
}
}
2 changes: 1 addition & 1 deletion packages/packagers/html/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"@parcel/types": "2.0.0-rc.0",
"@parcel/utils": "2.0.0-rc.0",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.4"
"posthtml": "^0.16.5"
}
}
6 changes: 3 additions & 3 deletions packages/transformers/html/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"@parcel/hash": "2.0.0-rc.0",
"@parcel/plugin": "2.0.0-rc.0",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.4",
"posthtml-parser": "^0.9.0",
"posthtml-render": "^2.0.6",
"posthtml": "^0.16.5",
"posthtml-parser": "^0.10.1",
"posthtml-render": "^3.0.0",
"semver": "^5.4.1"
}
}
4 changes: 2 additions & 2 deletions packages/transformers/html/src/HTMLTransformer.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// @flow

import {Transformer} from '@parcel/plugin';
import parse from 'posthtml-parser';
import {parser as parse} from 'posthtml-parser';
import nullthrows from 'nullthrows';
import render from 'posthtml-render';
import {render} from 'posthtml-render';
import semver from 'semver';
import collectDependencies from './dependencies';
import extractInlineAssets from './inline';
Expand Down
6 changes: 3 additions & 3 deletions packages/transformers/posthtml/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"@parcel/plugin": "2.0.0-rc.0",
"@parcel/utils": "2.0.0-rc.0",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.4",
"posthtml-parser": "^0.9.0",
"posthtml-render": "^2.0.6",
"posthtml": "^0.16.5",
"posthtml-parser": "^0.10.1",
"posthtml-render": "^3.0.0",
"semver": "^5.4.1"
}
}
4 changes: 2 additions & 2 deletions packages/transformers/posthtml/src/PostHTMLTransformer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {Transformer} from '@parcel/plugin';

import path from 'path';
import posthtml from 'posthtml';
import parse from 'posthtml-parser';
import render from 'posthtml-render';
import {parser as parse} from 'posthtml-parser';
import {render} from 'posthtml-render';
import nullthrows from 'nullthrows';
import semver from 'semver';
import {relativePath} from '@parcel/utils';
Expand Down
6 changes: 3 additions & 3 deletions packages/transformers/svg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"@parcel/hash": "2.0.0-rc.0",
"@parcel/plugin": "2.0.0-rc.0",
"nullthrows": "^1.1.1",
"posthtml": "^0.16.4",
"posthtml-parser": "^0.9.0",
"posthtml-render": "^2.0.6",
"posthtml": "^0.16.5",
"posthtml-parser": "^0.10.1",
"posthtml-render": "^3.0.0",
"semver": "^5.4.1"
}
}
4 changes: 2 additions & 2 deletions packages/transformers/svg/src/SVGTransformer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import {Transformer} from '@parcel/plugin';
import nullthrows from 'nullthrows';
import semver from 'semver';
import parse from 'posthtml-parser';
import render from 'posthtml-render';
import {parser as parse} from 'posthtml-parser';
import {render} from 'posthtml-render';
import collectDependencies from './dependencies';
import extractInlineAssets from './inline';

Expand Down
17 changes: 12 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5029,6 +5029,13 @@ domhandler@^4.0.0, domhandler@^4.2.0:
dependencies:
domelementtype "^2.2.0"

domhandler@^4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
dependencies:
domelementtype "^2.2.0"

domutils@^1.5.1, domutils@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
Expand Down Expand Up @@ -7046,12 +7053,12 @@ htmlparser2@^6.0.0:
entities "^2.0.0"

htmlparser2@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.1.1.tgz#ef251d16e5b40818ba162aa24bc051c297eb3f76"
integrity sha512-hZb0lfG0hbhR/hB879zbBr8Opv0Be9Zp+JYHgqTw5epF++aotu/zmMTPLy/60iJyR1MaD/3pYRp7xYteXsZMEA==
version "7.1.2"
resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.1.2.tgz#587923d38f03bc89e03076e00cba2c7473f37f7c"
integrity sha512-d6cqsbJba2nRdg8WW2okyD4ceonFHn9jLFxhwlNcLhQWcFPdxXeJulgOLjLKtAK9T6ahd+GQNZwG9fjmGW7lyg==
dependencies:
domelementtype "^2.0.1"
domhandler "^4.0.0"
domhandler "^4.2.2"
domutils "^2.8.0"
entities "^3.0.1"

Expand Down Expand Up @@ -10546,7 +10553,7 @@ posthtml-obfuscate@^0.1.5:
resolved "https://registry.yarnpkg.com/posthtml-obfuscate/-/posthtml-obfuscate-0.1.5.tgz#d65f6642c96349002d33a2208845b2f7517d0fc8"
integrity sha1-1l9mQsljSQAtM6IgiEWy91F9D8g=

posthtml-parser@^0.10.0:
posthtml-parser@^0.10.0, posthtml-parser@^0.10.1:
version "0.10.1"
resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.10.1.tgz#63c41931a9339cc2c32aba14f06286d98f107abf"
integrity sha512-i7w2QEHqiGtsvNNPty0Mt/+ERch7wkgnFh3+JnBI2VgDbGlBqKW9eDVd3ENUhE1ujGFe3e3E/odf7eKhvLUyDg==
Expand Down