Skip to content

Commit

Permalink
Merge pull request #26 from TopRealm/merge-conflict
Browse files Browse the repository at this point in the history
Merge conflict
  • Loading branch information
ZoruaFox authored Jun 4, 2024
2 parents f43f551 + ead4ff9 commit 21b7a7f
Show file tree
Hide file tree
Showing 8 changed files with 447 additions and 557 deletions.
4 changes: 1 addition & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"id-denylist": "error",
"id-length": "off",
"id-match": "error",
"implicit-arrow-linebreak": "off",
"init-declarations": "off",
"lines-between-class-members": "off",
"logical-assignment-operators": "error",
Expand Down Expand Up @@ -244,9 +245,6 @@
"no-jquery/no-slide": "off",
"no-jquery/variable-pattern": "off",

"security/detect-non-literal-regexp": "off",
"security/detect-unsafe-regex": "off",

"unicorn/better-regex": "off",
"unicorn/consistent-destructuring": "off",
"unicorn/consistent-function-scoping": "off",
Expand Down
18 changes: 9 additions & 9 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"selector-type-no-unknown": null,
"plugin/no-unsupported-browser-features": null,
"wikimedia/no-at-import-css": null,
"stylistic/declaration-colon-newline-after": null,
"stylistic/declaration-colon-space-after": "always-single-line",
"stylistic/function-parentheses-space-inside": "never",
"stylistic/indentation": null,
"stylistic/media-feature-parentheses-space-inside": "never",
"stylistic/selector-attribute-brackets-space-inside": "never",
"stylistic/selector-descendant-combinator-no-non-space": null,
"stylistic/selector-pseudo-class-parentheses-space-inside": "never",
"stylistic/value-list-comma-newline-after": null
"@stylistic/declaration-colon-newline-after": null,
"@stylistic/declaration-colon-space-after": "always-single-line",
"@stylistic/function-parentheses-space-inside": "never",
"@stylistic/indentation": null,
"@stylistic/media-feature-parentheses-space-inside": "never",
"@stylistic/selector-attribute-brackets-space-inside": "never",
"@stylistic/selector-descendant-combinator-no-non-space": null,
"@stylistic/selector-pseudo-class-parentheses-space-inside": "never",
"@stylistic/value-list-comma-newline-after": null
},
"overrides": [
{
Expand Down
6 changes: 3 additions & 3 deletions dist/FloatTOC/FloatTOC.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/TextSpacing/TextSpacing.js

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "awesome-gadgets",
"version": "4.6.5",
"version": "4.6.6",
"description": "Storage, management, compilation, and automatic deployment of MediaWiki gadgets.",
"private": true,
"type": "module",
Expand Down Expand Up @@ -64,8 +64,8 @@
"@babel/types": "^7.24.6",
"@commitlint/cli": "^19.3.0",
"@commitlint/config-conventional": "^19.2.2",
"@mrhenry/babel-plugin-core-web": "^1.2.2",
"@mrhenry/core-web": "^1.2.2",
"@mrhenry/babel-plugin-core-web": "^1.2.3",
"@mrhenry/core-web": "^1.2.3",
"@types/babel__core": "^7.20.5",
"@types/babel__helper-plugin-utils": "^7.10.3",
"@types/babel__traverse": "^7.20.6",
Expand All @@ -74,12 +74,12 @@
"@types/jquery": "^3.5.30",
"@types/jqueryui": "^1.12.22",
"@types/minimist": "^1.2.5",
"@types/node": "^20.12.13",
"@types/node": "^20.14.0",
"@types/oojs": "^7.0.6",
"@types/oojs-ui": "^0.49.0",
"@types/prompts": "^2.4.9",
"@typescript-eslint/eslint-plugin": "^7.11.0",
"@typescript-eslint/parser": "^7.11.0",
"@typescript-eslint/eslint-plugin": "^7.12.0",
"@typescript-eslint/parser": "^7.12.0",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/language-plugin-pug": "^2.0.19",
Expand All @@ -96,7 +96,7 @@
"esbuild-postcss": "^0.0.4",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-wikimedia": "^0.27.0",
"eslint-config-wikimedia": "^0.28.0",
"eslint-plugin-es5": "^1.5.0",
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-unicorn": "^53.0.0",
Expand All @@ -106,7 +106,7 @@
"happy-dom": "^14.12.0",
"husky": "^9.0.11",
"less-plugin-npm-import": "^2.1.0",
"less-plugin-preset-env": "^1.2.13",
"less-plugin-preset-env": "^1.2.14",
"lightningcss": "^1.25.1",
"minimist": "^1.2.8",
"moment": "^2.30.1",
Expand All @@ -116,28 +116,28 @@
"pinia": "^2.1.7",
"postcss": "^8.4.38",
"postcss-import": "^16.1.0",
"postcss-load-config": "^5.1.0",
"postcss-load-config": "^6.0.1",
"postcss-preset-env": "^9.5.14",
"prettier": "^3.2.5",
"prettier": "^3.3.0",
"prompts": "^2.4.2",
"proxy-polyfill": "^0.3.2",
"pug": "^3.0.3",
"rimraf": "^5.0.7",
"stylelint": "^15.11.0",
"stylelint-config-css-modules": "4.2.0",
"stylelint-config-wikimedia": "^0.16.1",
"tsx": "^4.11.0",
"types-mediawiki-renovate": "2.14.3",
"stylelint": "^16.6.1",
"stylelint-config-css-modules": "^4.4.0",
"stylelint-config-wikimedia": "^0.17.0",
"tsx": "^4.11.2",
"types-mediawiki-renovate": "^2.14.4",
"typescript": "^5.4.5",
"typescript-plugin-css-modules": "^5.1.0",
"unorm": "^1.6.0",
"vue": "3.3.9",
"vue-eslint-parser": "^9.4.2",
"vue-eslint-parser": "^9.4.3",
"vue-tsc": "^2.0.19"
},
"pnpm": {
"overrides": {
"@typescript-eslint/utils": "^7.11.0",
"@typescript-eslint/utils": "^7.12.0",
"ansi-regex@<6": "^5.0.1",
"arrify@<3": "^2.0.1",
"balanced-match@<3": "^2.0.0",
Expand Down Expand Up @@ -168,10 +168,10 @@
"types-mediawiki": "npm:types-mediawiki-renovate"
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]"
}
}
}
File renamed without changes.
Loading

0 comments on commit 21b7a7f

Please sign in to comment.