Skip to content

Commit f71bfa9

Browse files
committed
fix(tools): update cem deps
1 parent cb9095a commit f71bfa9

9 files changed

+1777
-2250
lines changed

.changeset/polite-bats-kick.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@patternfly/pfe-tools": patch
3+
---
4+
5+
update dependencies

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@ tools/**/*.js
4141
!elements/*/demo/*.js
4242

4343
tools/create-element/templates/**/*
44+
node_modules
45+
node_modules/**/*

package-lock.json

Lines changed: 1751 additions & 2139 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,21 @@
6464
},
6565
"devDependencies": {
6666
"@actions/core": "^1.6.0",
67-
"@actions/exec": "^1.1.0",
68-
"@actions/glob": "^0.2.0",
69-
"@commitlint/cli": "^16.1.0",
67+
"@actions/exec": "^1.1.1",
68+
"@actions/glob": "^0.2.1",
69+
"@commitlint/cli": "^16.2.3",
7070
"@commitlint/config-conventional": "^16.0.0",
7171
"@commitlint/config-lerna-scopes": "^16.0.0",
7272
"@patternfly/eslint-config-elements": "^0.0.2-next.1",
7373
"@patternfly/pfe-tools": "^0.1.0-next.4",
7474
"@types/numeral": "^2.0.2",
7575
"@types/prismjs": "^1.26.0",
7676
"@types/prompts": "^2.0.14",
77-
"commitlint": "^16.1.0",
77+
"commitlint": "^16.2.3",
7878
"cpx": "^1.5.0",
79-
"custom-elements-manifest": "^1.0.0",
8079
"git-branch": "^2.0.1",
8180
"husky": "^7.0.4",
82-
"leasot": "^12.0.0",
81+
"leasot": "^12.2.0",
8382
"lerna": "^4.0.0",
8483
"npm-merge-driver": "^2.3.6",
8584
"open": "^8.0.4",
@@ -94,5 +93,8 @@
9493
"./core/*",
9594
"./elements/*",
9695
"./tools/*"
97-
]
96+
],
97+
"dependencies": {
98+
"@octokit/core": "^3.6.0"
99+
}
98100
}
Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,13 @@
11
diff --git a/node_modules/@11ty/eleventy-plugin-syntaxhighlight/src/HighlightPairedShortcode.js b/node_modules/@11ty/eleventy-plugin-syntaxhighlight/src/HighlightPairedShortcode.js
2-
index 5dbd602..bc5765c 100644
2+
index 5dbd602..3ea76b5 100644
33
--- a/node_modules/@11ty/eleventy-plugin-syntaxhighlight/src/HighlightPairedShortcode.js
44
+++ b/node_modules/@11ty/eleventy-plugin-syntaxhighlight/src/HighlightPairedShortcode.js
5-
@@ -3,31 +3,32 @@ const PrismLoader = require("./PrismLoader");
6-
const HighlightLinesGroup = require("./HighlightLinesGroup");
7-
const getAttributes = require("./getAttributes");
8-
9-
-module.exports = function (content, language, highlightNumbers, options = {}) {
10-
+module.exports = function(content, language, highlightNumbers, options = {}) {
11-
const preAttributes = getAttributes(options.preAttributes);
12-
const codeAttributes = getAttributes(options.codeAttributes);
13-
14-
// default to on
15-
- if(options.trim === undefined || options.trim === true) {
16-
+ if (options.trim === undefined || options.trim === true) {
17-
content = content.trim();
5+
@@ -20,7 +20,7 @@ module.exports = function (content, language, highlightNumbers, options = {}) {
186
}
197

20-
let highlightedContent;
21-
- if( language === "text" ) {
22-
+ if ( language === "text" ) {
23-
highlightedContent = content;
24-
} else {
25-
highlightedContent = Prism.highlight(content, PrismLoader(language), language);
26-
}
27-
28-
- let group = new HighlightLinesGroup(highlightNumbers);
8+
let group = new HighlightLinesGroup(highlightNumbers);
299
- let lines = highlightedContent.split("\n");
30-
+ const group = new HighlightLinesGroup(highlightNumbers);
31-
+ // see https://github.com/11ty/eleventy-plugin-syntaxhighlight/pull/60/files
3210
+ let lines = highlightedContent.split(/\r?\n/);
3311
lines = lines.map(function(line, j) {
34-
- if(options.alwaysWrapLineHighlights || highlightNumbers) {
35-
- let lineContent = group.getLineMarkup(j, line);
36-
+ if (options.alwaysWrapLineHighlights || highlightNumbers) {
37-
+ const lineContent = group.getLineMarkup(j, line);
38-
return lineContent;
39-
}
40-
return line;
41-
});
42-
43-
- return `<pre class="language-${language}"${preAttributes}><code class="language-${language}"${codeAttributes}>` + lines.join(options.lineSeparator || "<br>") + "</code></pre>";
44-
+ return `<pre class="language-${language}"${preAttributes}><code class="language-${language}"${codeAttributes}>${lines.join(options.lineSeparator || "<br>")}</code></pre>`;
45-
};
12+
if(options.alwaysWrapLineHighlights || highlightNumbers) {
13+
let lineContent = group.getLineMarkup(j, line);

patches/cem-plugin-module-file-extensions+0.0.2.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

patches/cem-plugin-readonly+0.0.2.patch

Lines changed: 0 additions & 21 deletions
This file was deleted.

patches/html-include-element+0.2.0.patch

Lines changed: 0 additions & 31 deletions
This file was deleted.

tools/pfe-tools/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,12 @@
8686
"@web/test-runner": "^0.13.26",
8787
"@web/test-runner-junit-reporter": "^0.4.11",
8888
"@web/test-runner-playwright": "^0.8.8",
89-
"api-viewer-element": "^0.6.4",
90-
"cem-plugin-module-file-extensions": "^0.0.2",
91-
"cem-plugin-readonly": "^0.0.2",
89+
"api-viewer-element": "^1.0.0-pre.5 || ^1.0.0",
90+
"cem-plugin-module-file-extensions": "^0.0.5",
91+
"cem-plugin-readonly": "^0.0.5",
9292
"clean-css": "^5.2.4",
9393
"compression": "^1.7.4",
94+
"custom-elements-manifest": "^1.0.0",
9495
"dedent": "^0.7.0",
9596
"dotenv": "^16.0.0",
9697
"eleventy-plugin-toc": "^1.1.5",
@@ -100,7 +101,7 @@
100101
"esbuild-plugin-minify-html-literals": "^1.0.1",
101102
"eslint": "^8.11.0",
102103
"glob": "^7.2.0",
103-
"html-include-element": "^0.2.0",
104+
"html-include-element": "^0.3.0",
104105
"lit": "^2.1.2",
105106
"markdown-it-anchor": "^8.4.1",
106107
"npm-run-all": "^4.1.5",

0 commit comments

Comments
 (0)