Skip to content

Commit a9c4bd4

Browse files
dependabot[bot]max-ostapenkotunetheweb
authored
Bump super-linter/super-linter from 7.2.1 to 7 (#4017)
* Bump super-linter/super-linter from 7.2.1 to 7.3.0 Bumps [super-linter/super-linter](https://github.com/super-linter/super-linter) from 7.2.1 to 7.3.0. - [Release notes](https://github.com/super-linter/super-linter/releases) - [Changelog](https://github.com/super-linter/super-linter/blob/main/CHANGELOG.md) - [Commits](super-linter/super-linter@v7.2.1...v7.3.0) --- updated-dependencies: - dependency-name: super-linter/super-linter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * keep major version * linting * lint * lint * lint * lint * lint * Remove unnecessary lint exceptions * Lint fixes * Linting * Linting --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Ostapenko <1611259+max-ostapenko@users.noreply.github.com> Co-authored-by: Barry Pollard <barrypollard@google.com>
1 parent ece1f08 commit a9c4bd4

22 files changed

+165
-173
lines changed

.github/linters/.ecrc renamed to .github/linters/.editorconfig-checker.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Verbose": false,
33
"Debug": false,
44
"IgnoreDefaults": false,
5-
"SpacesAftertabs": false,
5+
"SpacesAfterTabs": false,
66
"NoColor": false,
77
"Exclude": [],
88
"AllowedContentTypes": [],

‎.github/workflows/linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
echo "VALIDATE_ALL_CODEBASE=false" >> $GITHUB_ENV
3333
- name: Lint Code Base
34-
uses: super-linter/super-linter/slim@v7.2.1
34+
uses: super-linter/super-linter/slim@v7
3535
env:
3636
DEFAULT_BRANCH: main
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test_website.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Use more complete checks for generated HTML linting
4141
run: cp -f .github/linters/.htmlhintrc_morechecks .github/linters/.htmlhintrc
4242
- name: Lint Generated HTML
43-
uses: super-linter/super-linter/slim@v7.2.1
43+
uses: super-linter/super-linter/slim@v7
4444
env:
4545
DEFAULT_BRANCH: main
4646
FILTER_REGEX_INCLUDE: src/static/html/.*

‎sql/lib/css-font-parser.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ const parser = (() => {
226226
return { parseFont, parseFontFamily };
227227
})();
228228

229-
function parseFontProperty(value) {
229+
function parseFontProperty(value) { // eslint-disable-line no-unused-vars
230230
return parser.parseFont(value);
231231
}
232232

233-
function parseFontFamilyProperty(value) {
233+
function parseFontFamilyProperty(value) { // eslint-disable-line no-unused-vars
234234
return parser.parseFontFamily(value);
235235
}

‎sql/lib/css-parser.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// https://github.com/visionmedia/css-parse/pull/49#issuecomment-30088027
33
var commentre = /\/\*[^*]*\*+([^/*][^*]*\*+)*\//g
44

5-
function parse(css, options){
5+
function parse(css, options){ // eslint-disable-line no-unused-vars
66
options = options || {};
77

88
/**
@@ -28,7 +28,7 @@ function parse(css, options){
2828
*/
2929

3030
function position() {
31-
var start = { line: lineno, column: column };
31+
//var start = { line: lineno, column: column };
3232
return function(node){
3333
//node.position = new Position(start);
3434
whitespace();
@@ -151,8 +151,8 @@ function parse(css, options){
151151

152152
function comments(rules) {
153153
var c;
154-
rules = rules || [];
155-
while (c = comment()) {
154+
rules = (rules || []);
155+
while ((c = comment())) {
156156
if (c !== false) {
157157
//rules.push(c);
158158
}
@@ -216,15 +216,15 @@ function parse(css, options){
216216
var pos = position();
217217

218218
// prop
219-
var prop = match(/^(\*?[-#\/\*\\\w]+(\[[0-9a-z_-]+\])?)\s*/);
219+
var prop = match(/^(\*?[-#\/\*\\\w]+(\[[0-9a-z_-]+\])?)\s*/); // eslint-disable-line no-useless-escape
220220
if (!prop) return;
221221
prop = trim(prop[0]);
222222

223223
// :
224224
if (!match(/^:\s*/)) return error("property missing ':'");
225225

226226
// val
227-
var val = match(/^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^\)]*?\)|[^};])+)/);
227+
var val = match(/^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^\)]*?\)|[^};])+)/); // eslint-disable-line no-useless-escape
228228

229229
var ret = pos({
230230
type: 'declaration',
@@ -250,10 +250,10 @@ function parse(css, options){
250250

251251
// declarations
252252
var decl;
253-
while (decl = declaration()) {
253+
while ((decl = declaration())) {
254254
if (decl !== false) {
255-
decls.push(decl);
256-
comments(decls);
255+
decls.push(decl);
256+
comments(decls);
257257
}
258258
}
259259

@@ -270,7 +270,7 @@ function parse(css, options){
270270
var vals = [];
271271
var pos = position();
272272

273-
while (m = match(/^((\d+\.\d+|\.\d+|\d+)%?|[a-z]+)\s*/)) {
273+
while ((m = match(/^((\d+\.\d+|\.\d+|\d+)%?|[a-z]+)\s*/))) {
274274
vals.push(m[1]);
275275
match(/^,\s*/);
276276
}
@@ -296,15 +296,15 @@ function parse(css, options){
296296
var vendor = m[1];
297297

298298
// identifier
299-
var m = match(/^([-\w]+)\s*/);
299+
m = match(/^([-\w]+)\s*/);
300300
if (!m) return error("@keyframes missing name");
301301
var name = m[1];
302302

303303
if (!open()) return error("@keyframes missing '{'");
304304

305305
var frame;
306306
var frames = comments();
307-
while (frame = keyframe()) {
307+
while ((frame = keyframe())) {
308308
frames.push(frame);
309309
frames = frames.concat(comments());
310310
}
@@ -422,7 +422,7 @@ function parse(css, options){
422422

423423
// declarations
424424
var decl;
425-
while (decl = declaration()) {
425+
while ((decl = declaration())) {
426426
decls.push(decl);
427427
decls = decls.concat(comments());
428428
}
@@ -476,7 +476,7 @@ function parse(css, options){
476476

477477
// declarations
478478
var decl;
479-
while (decl = declaration()) {
479+
while ((decl = declaration())) {
480480
decls.push(decl);
481481
decls = decls.concat(comments());
482482
}

‎sql/lib/css-utils.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable no-unused-vars */
2+
13
var parsel = (() => {
24
const TOKENS = {
35
attribute: /\[\s*(?:(?<namespace>\*|[-\w]*)\|)?(?<name>[-\w\u{0080}-\u{FFFF}]+)\s*(?:(?<operator>\W?=)\s*(?<value>.+?)\s*(?<caseSensitive>[iIsS])?\s*)?\]/gu,
@@ -54,7 +56,7 @@ function tokenizeBy (text, grammar) {
5456

5557
var strarr = [text];
5658

57-
tokenloop: for (var token in grammar) {
59+
for (var token in grammar) {
5860
let pattern = grammar[token];
5961

6062
for (var i=0; i < strarr.length; i++) { // Don’t cache length as it changes during the loop
@@ -589,7 +591,7 @@ function walkDeclarations(rules, callback, test) {
589591
let {property, value} = declaration;
590592
let important = false;
591593

592-
value = value.replace(/\s*!important\s*$/, $0 => {
594+
value = value.replace(/\s*!important\s*$/, () => {
593595
important = true;
594596
return "";
595597
});

‎sql/lib/get-css-utils.js‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
const fs = require("fs");
22
const https = require("https");
33

4-
function readFile(file, enc = "utf8") {
5-
return new Promise((resolve, reject) => {
6-
fs.readFile(file, enc, (err,data) => {
7-
if (err) {
8-
reject(err);
9-
}
10-
11-
resolve(data);
12-
});
13-
});
14-
}
15-
164
function writeFile(file, contents, enc) {
175
return new Promise((resolve, reject) => {
186
fs.writeFile(file, contents, enc, (err) => {
@@ -47,12 +35,12 @@ const urls = [
4735

4836
(async ()=>{
4937

50-
let contents = urls.map(async url => await downloadFile(url));
38+
let contents = urls.map(async url => await downloadFile(url));
5139

52-
contents = await Promise.all(contents);
40+
contents = await Promise.all(contents);
5341

54-
contents = contents.join("\n\n");
42+
contents = contents.join("\n\n");
5543

56-
writeFile("./css-utils.js", contents);
44+
writeFile("./css-utils.js", contents);
5745

5846
})();

‎sql/lib/text-utils.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"deploy": "./tools/scripts/deploy.sh",
2323
"dev": "source .venv/bin/activate && npm run start",
2424
"lint": "run-script-os",
25-
"lint:darwin:linux": "docker container run -it --rm -v \"$PWD/..\":/app -w /app/src --entrypoint=./tools/scripts/run_linter_locally.sh github/super-linter:slim-latest",
26-
"lint:win32": "docker container run --rm -v \"%cd%\\..\":/app -w /app/src --entrypoint=./tools/scripts/run_linter_locally.sh github/super-linter:slim-latest",
25+
"lint:darwin:linux": "docker container run -it --rm -v \"$PWD/..\":/app -w /app/src --entrypoint=./tools/scripts/run_linter_locally.sh ghcr.io/super-linter/super-linter:slim-latest",
26+
"lint:win32": "docker container run --rm -v \"%cd%\\..\":/app -w /app/src --entrypoint=./tools/scripts/run_linter_locally.sh ghcr.io/super-linter/super-linter:slim-latest",
2727
"pytest": "pytest --cov server --cov-fail-under=100 --cov-report=term-missing -s",
2828
"stage": "./tools/scripts/deploy.sh -n",
2929
"start": "run-script-os",

‎src/static/css/ebook.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ section.chapter {
312312
background: transparent url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOTIwIiBoZWlnaHQ9IjEyNTAiIHZpZXdCb3g9IjAgMCAxOTIwIDEyNTAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+DQogICAgICBzdmd7YmFja2dyb3VuZDojZmZmfQ0KICAgICAgLmNscy0xe2ZpbGw6I2E4Y2FiYTtmaWxsLXJ1bGU6ZXZlbm9kZDtvcGFjaXR5Oi4wNX0NCiAgICA8L3N0eWxlPg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTS0yMzEgODloMjA4OHY2NTFsLTIwODggMzYwVjg5eiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0tNDcwIDIzOWgyMDg4djY1MWwtMjA4OCAzNjBWMjM5eiIvPg0KICA8cGF0aCBkPSJNLTE0NC0xOWgyMDg4djY1MUwtMTQ0IDk5MlYtMTl6IiBmaWxsPSIjMWEyYjQ5IiBvcGFjaXR5PSIuNzUiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0tNDcwLTgzaDIwODh2NjUxTC00NzAgOTI4Vi04M3oiLz4NCiAgPHBhdGggZD0iTS0yMzItNDhoMjA4OHY2NTFMLTIzMiA5NjNWLTQ4eiIgZmlsbD0iI2YyZjJmMiIgb3BhY2l0eT0iLjA1IiBmaWxsLXJ1bGU9ImV2ZW5vZGQiLz4NCjwvc3ZnPg0K");
313313
background-position: bottom left;
314314
background-repeat: no-repeat;
315-
background-size: 100% 100%;
315+
background-size: 100% 100%; /* stylelint-disable-line at-rule-descriptor-no-unknown */
316316

317317
@top-left {
318318
content: '';

0 commit comments

Comments
 (0)