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

chore(package): update deps #3358

Merged
merged 7 commits into from Mar 3, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
75 changes: 37 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions package.json
Expand Up @@ -26,19 +26,19 @@
"@types/marked": "^1.2.2",
"@types/pluralize": "0.0.29",
"boxen": "^5.0.0",
"chai": "^4.3.0",
"chai": "^4.3.1",
"chokidar": "^3.5.1",
"clean-css": "^5.1.0",
"epipebomb": "^1.0.0",
"eslint": "^7.20.0",
"eslint-config-prettier": "^8.0.0",
"eslint": "^7.21.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jasmine": "^4.1.2",
"eslint-plugin-prettier": "^3.3.1",
"hyperhtml": "^2.34.0",
"idb": "^6.0.0",
"jasmine": "^3.6.4",
"jquery": "^3.5.1",
"jquery": "^3.6.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we still have this here?

"karma": "^6.1.1",
"karma-chrome-launcher": "^3.1.0",
"karma-firefox-launcher": "^2.1.0",
Expand All @@ -48,17 +48,17 @@
"karma-mocha-reporter": "^2.2.5",
"karma-safari-launcher": "^1.0.0",
"loading-indicator": "^2.0.0",
"marked": "^2.0.0",
"marked": "^2.0.1",
"pluralize": "^8.0.0",
"prettier": "^2.2.1",
"prompt": "^1.1.0",
"rollup": "^2.39.0",
"rollup": "^2.40.0",
"rollup-plugin-alias": "^2.2.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-terser": "^7.0.2",
"serve": "^11.3.2",
"typescript": "^4.1.5",
"typescript": "^4.2.2",
"webidl2": "^23.13.1"
},
"scripts": {
Expand All @@ -82,7 +82,7 @@
},
"dependencies": {
"colors": "^1.4.0",
"puppeteer": "^7.1.0",
"puppeteer": "^8.0.0",
"sade": "^1.7.4"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion src/core/dfn-finder.js
Expand Up @@ -36,7 +36,7 @@ export function findDfn(defn, name, { parent = "" } = {}) {
}

/**
* @param {string} type
* @param {{ type: string, arguments: any[] }} idlAst
* @param {string} parent
* @param {string} name
*/
Expand Down
26 changes: 14 additions & 12 deletions tests/spec/core/data-include-spec.js
Expand Up @@ -135,18 +135,19 @@ describe("Core — Data Include", () => {
body: `
<section id="abstract"></section>

<section data-include="${include}" data-include-format="markdown"></section>
<section id="test" data-include="${include}" data-include-format="markdown"></section>
`,
};
ops.abstract = null;

const doc = await makeRSDoc(ops);
const li = doc.querySelector("section li");
const li = doc.querySelector("section#test li");
expect(li).toBeTruthy();
expect(li.textContent).toContain("Rose");
expect(li.textContent).toContain("Blue");
expect(li.textContent).toContain("Red");
expect(li.textContent).toContain("wasteland");
expect(li.textContent).toBe("Rose");
const [p1, p2, p3] = [...doc.querySelectorAll("#test p")];
expect(p1.textContent).toContain("Blue");
expect(p2.textContent).toContain("Red");
expect(p3.textContent).toContain("wasteland");
Copy link
Member

@sidvishnoi sidvishnoi Mar 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See markedjs/marked#1934 (and the fix: markedjs/marked#1936)
cc: @saschanaz (don't know if this test was intentional as such)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intention here was to wrap them to li. It seems marked now requires at least 3-space indentation here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3-space fixes it. Shouldn't be a breaking change for us as we've delegated markdown related changes on marked, which is commonmark compliant (almost).
Thanks!

// Shouldn't break other sections
expect(doc.getElementById("abstract")).toBeTruthy();
});
Expand All @@ -160,7 +161,7 @@ describe("Core — Data Include", () => {
body: `
<section id="abstract"></section>

<section>
<section id="test">

<div data-include="${include}" data-include-format="markdown" data-include-replace></div>

Expand All @@ -170,12 +171,13 @@ describe("Core — Data Include", () => {
ops.abstract = null;

const doc = await makeRSDoc(ops);
const li = doc.querySelector("section li");
const li = doc.querySelector("section#test li");
expect(li).toBeTruthy();
expect(li.textContent).toContain("Rose");
expect(li.textContent).toContain("Blue");
expect(li.textContent).toContain("Red");
expect(li.textContent).toContain("wasteland");
expect(li.textContent).toBe("Rose");
const [p1, p2, p3] = [...doc.querySelectorAll("#test p")];
expect(p1.textContent).toContain("Blue");
expect(p2.textContent).toContain("Red");
expect(p3.textContent).toContain("wasteland");
expect(li.parentElement.parentElement.localName).toBe("section");
// Shouldn't break other sections
expect(doc.getElementById("abstract")).toBeTruthy();
Expand Down