Skip to content

Commit 31083e0

Browse files
Merge pull request #68 from bornfight/fix/may-fixes-jaki
responsive image/video fixes
2 parents 7395beb + 7bad528 commit 31083e0

26 files changed

+943
-680
lines changed

.eslintignore

-2
This file was deleted.

.eslintrc.json

-45
This file was deleted.

eslint.config.mjs

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import prettier from "eslint-plugin-prettier";
2+
import globals from "globals";
3+
import path from "node:path";
4+
import { fileURLToPath } from "node:url";
5+
import js from "@eslint/js";
6+
import { FlatCompat } from "@eslint/eslintrc";
7+
8+
const __filename = fileURLToPath(import.meta.url);
9+
const __dirname = path.dirname(__filename);
10+
const compat = new FlatCompat({
11+
baseDirectory: __dirname,
12+
recommendedConfig: js.configs.recommended,
13+
allConfig: js.configs.all,
14+
});
15+
16+
export default [
17+
{
18+
ignores: ["**/coverage", "**/templates"],
19+
},
20+
...compat.extends("eslint:recommended", "plugin:prettier/recommended", "prettier"),
21+
{
22+
plugins: {
23+
prettier,
24+
},
25+
languageOptions: {
26+
globals: {
27+
...Object.fromEntries(Object.entries(globals.browser).map(([key]) => [key, "off"])),
28+
...Object.fromEntries(Object.entries(globals.commonjs).map(([key]) => [key, "off"])),
29+
...globals.node,
30+
},
31+
ecmaVersion: "latest",
32+
sourceType: "module",
33+
},
34+
35+
rules: {
36+
"babel/no-invalid-this": 0,
37+
"import/no-anonymous-default-export": 0,
38+
"import/no-unresolved": [
39+
"error",
40+
{
41+
ignore: ["^jquery"],
42+
},
43+
],
44+
"no-alert": 0,
45+
"no-console": 0,
46+
"no-new": 0,
47+
"node/shebang": 0,
48+
"prettier/prettier": ["error"],
49+
"sort-imports": [
50+
"error",
51+
{
52+
ignoreDeclarationSort: true,
53+
},
54+
],
55+
},
56+
},
57+
];
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import prettier from "eslint-plugin-prettier";
2+
import globals from "globals";
3+
import path from "node:path";
4+
import { fileURLToPath } from "node:url";
5+
import js from "@eslint/js";
6+
import { FlatCompat } from "@eslint/eslintrc";
7+
8+
const __filename = fileURLToPath(import.meta.url);
9+
const __dirname = path.dirname(__filename);
10+
const compat = new FlatCompat({
11+
baseDirectory: __dirname,
12+
recommendedConfig: js.configs.recommended,
13+
allConfig: js.configs.all,
14+
});
15+
16+
export default [
17+
{
18+
ignores: ["**/node_modules/", "**/bower_components/", "static/js/vendor/**/*.js", "**/dist/"],
19+
},
20+
...compat.extends("eslint:recommended", "plugin:prettier/recommended", "prettier"),
21+
{
22+
plugins: {
23+
prettier,
24+
},
25+
languageOptions: {
26+
globals: {
27+
...globals.browser,
28+
...globals.commonjs,
29+
...globals.node,
30+
document: true,
31+
frontend_rest_object: true,
32+
window: true,
33+
wp: true,
34+
},
35+
ecmaVersion: "latest",
36+
sourceType: "module",
37+
},
38+
rules: {
39+
"babel/no-invalid-this": 0,
40+
"import/no-anonymous-default-export": 0,
41+
"no-alert": 0,
42+
"no-console": 0,
43+
"no-new": 0,
44+
"node/shebang": 0,
45+
"prettier/prettier": ["error"],
46+
"sort-imports": [
47+
"error",
48+
{
49+
ignoreDeclarationSort: true,
50+
},
51+
],
52+
},
53+
},
54+
];

generators/app/templates/common/package.json

+23-29
Original file line numberDiff line numberDiff line change
@@ -30,46 +30,40 @@
3030
"fontfaceobserver-es": "^3.3.3",
3131
"gsap": "^3.12.5",
3232
"instant.page": "^5.2.0",
33-
"slim-select": "^2.8.1",
34-
"swiper": "^11.0.6",
35-
"vanilla-lazyload": "^17.8.8"
33+
"slim-select": "^2.8.2",
34+
"swiper": "^11.1.4",
35+
"vanilla-lazyload": "^19.1.3"
3636
},
3737
"devDependencies": {
38-
"@babel/core": "^7.23.9",
38+
"@babel/core": "^7.24.7",
3939
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
40-
"@babel/plugin-transform-class-properties": "^7.23.3",
41-
"@babel/plugin-transform-object-rest-spread": "^7.23.4",
42-
"@babel/preset-env": "^7.23.9",
43-
<%_ if (react) { _%>
44-
"@babel/preset-react": "^7.23.3",
45-
<%_ } _%>
40+
"@babel/plugin-transform-class-properties": "^7.24.7",
41+
"@babel/plugin-transform-object-rest-spread": "^7.24.7",
42+
"@babel/preset-env": "^7.24.7",
43+
"@eslint/eslintrc": "^3.1.0",
44+
"@eslint/js": "^9.4.0",
4645
"@namics/stylelint-bem": "^10.0.0",
46+
"ajv": "^8.16.0",
4747
"babel-loader": "^9.1.3",
4848
"browser-sync": "^3.0.2",
4949
"browser-sync-v3-webpack-plugin": "^0.1.0",
50-
"css-loader": "^6.10.0",
51-
"eslint": "^8.56.0",
50+
"css-loader": "^7.1.2",
51+
"eslint": "^9.4.0",
5252
"eslint-config-prettier": "^9.1.0",
5353
"eslint-plugin-prettier": "^5.1.3",
54-
<%_ if (react) { _%>
55-
"eslint-plugin-react": "^7.33.2",
56-
<%_ } _%>
54+
"globals": "^15.4.0",
5755
"husky": "^9.0.11",
58-
"mini-css-extract-plugin": "^2.8.0",
59-
"postcss": "^8.4.35",
60-
"prettier": "^3.2.5",
61-
<%_ if (react) { _%>
62-
"react": "^18.2.0",
63-
"react-dom": "^18.2.0",
64-
<%_ } _%>
65-
"sass": "^1.71.1",
66-
"sass-loader": "^14.1.1",
67-
"style-loader": "^3.3.4",
68-
"stylelint": "^16.2.1",
69-
"stylelint-config-standard-scss": "^13.0.0",
56+
"mini-css-extract-plugin": "^2.9.0",
57+
"postcss": "^8.4.38",
58+
"prettier": "^3.3.2",
59+
"sass": "^1.77.5",
60+
"sass-loader": "^14.2.1",
61+
"style-loader": "^4.0.0",
62+
"stylelint": "^16.6.1",
63+
"stylelint-config-standard-scss": "^13.1.0",
7064
"stylelint-prettier": "^5.0.0",
71-
"stylelint-scss": "^6.1.0",
72-
"webpack": "^5.90.3",
65+
"stylelint-scss": "^6.3.1",
66+
"webpack": "^5.92.0",
7367
"webpack-cli": "^5.1.4",
7468
"webpack-remove-empty-scripts": "^1.0.4"
7569
},

generators/app/templates/dotfiles/.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ insert_final_newline = true
1414
[*.{json,yml}]
1515
indent_style = space
1616
indent_size = 2
17-
insert_final_newline = true
17+
insert_final_newline = true

generators/app/templates/dotfiles/.eslintignore

-4
This file was deleted.

generators/app/templates/dotfiles/.eslintrc.json

-59
This file was deleted.

generators/app/templates/dotfiles/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ Thumbs.db
8787
.sass-cache/*
8888
node_modules/*
8989
bower_components/*
90-
/node_modules/*
90+
/node_modules/*

generators/app/templates/dotfiles/.prettierignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ bower_components/
1212
.Spotlight-V100
1313
.Trashes
1414
ehthumbs.db
15-
Thumbs.db
15+
Thumbs.db
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dist/
22
node_modules/
33
bower_components/
4-
src/styles/settings/**/*.scss
5-
src/styles/tools/**/*.scss
4+
static/scss/settings/**/*.scss
5+
static/scss/tools/**/*.scss

0 commit comments

Comments
 (0)