Skip to content
This repository was archived by the owner on Jun 30, 2024. It is now read-only.

Commit aad6c32

Browse files
lens0021lens0021
committed
Replace {es,style}lint and grunt with prettier
1 parent a287535 commit aad6c32

15 files changed

+144
-201
lines changed

‎.eslintrc.json

-19
This file was deleted.

‎.github/workflows/lint.yml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Lint
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
composer-test:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- uses: actions/checkout@v2
11+
- name: Setup PHP Action
12+
uses: shivammathur/setup-php@v2
13+
with:
14+
php-version: '7.3'
15+
tools: composer:v1
16+
- name: Get Composer Cache Directory
17+
id: composer-cache
18+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
19+
- uses: actions/cache@v2
20+
with:
21+
path: ${{ steps.composer-cache.outputs.dir }}
22+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
23+
restore-keys: |
24+
${{ runner.os }}-composer-
25+
- run: |
26+
composer install -n
27+
composer test
28+
29+
yarn-test:
30+
runs-on: ubuntu-latest
31+
32+
steps:
33+
- uses: actions/checkout@v2
34+
- name: Setup Node.js environment
35+
uses: actions/setup-node@v1
36+
with:
37+
node-version: '12'
38+
- name: Get yarn cache directory path
39+
id: yarn-cache-dir-path
40+
run: echo "::set-output name=dir::$(yarn cache dir)"
41+
- uses: actions/cache@v2
42+
id: yarn-cache
43+
with:
44+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
45+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
46+
restore-keys: |
47+
${{ runner.os }}-yarn-
48+
- run: yarn
49+
- run: yarn -s test

‎.github/workflows/php-test.yml

-27
This file was deleted.

‎.github/workflows/release-and-submit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
on:
22
push:
33
tags:
4-
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
4+
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
55

66
name: Upload Release Asset and submit a PR to docker-mediawiki repository
77

‎.prettierignore

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# composer dependencies
2+
/vendor/
3+
/composer.lock
4+
5+
# maintained by translatewiki
6+
/i18n/
7+
8+
# auto-genereted files
9+
/resources/ooui/

‎.prettierrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"singleQuote": true
3+
}

‎.stylelintrc.json

-8
This file was deleted.

‎Gruntfile.js

-62
This file was deleted.

‎build/typos.json

-19
This file was deleted.

‎composer.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"require-dev": {
3-
"jakub-onderka/php-parallel-lint": "1.0.0",
4-
"mediawiki/mediawiki-codesniffer": "24.0.0",
5-
"jakub-onderka/php-console-highlighter": "0.3.2",
6-
"mediawiki/minus-x": "0.3.1"
7-
},
8-
"scripts": {
9-
"test": [
10-
"parallel-lint . --exclude vendor --exclude node_modules",
11-
"phpcs -p -s",
12-
"minus-x check ."
13-
],
14-
"fix": [
15-
"minus-x fix .",
16-
"phpcbf"
17-
]
18-
}
2+
"require-dev": {
3+
"jakub-onderka/php-parallel-lint": "1.0.0",
4+
"mediawiki/mediawiki-codesniffer": "24.0.0",
5+
"jakub-onderka/php-console-highlighter": "0.3.2",
6+
"mediawiki/minus-x": "0.3.1"
7+
},
8+
"scripts": {
9+
"test": [
10+
"parallel-lint . --exclude vendor --exclude node_modules",
11+
"phpcs -p -s",
12+
"minus-x check ."
13+
],
14+
"fix": [
15+
"minus-x fix .",
16+
"phpcbf"
17+
]
18+
}
1919
}

‎extension.json

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
{
2-
"name": "AchievementBadges",
3-
"version": "0.0.0",
4-
"author": [ "Lens" ],
5-
"url": "https://github.com/femiwiki/AchievementBadges",
6-
"descriptionmsg": "achievementbadges-desc",
7-
"license-name": "GPL-2.0-or-later",
8-
"type": "specialpage",
9-
"requires": {
10-
"MediaWiki": ">= 1.35.0",
11-
"extensions": {
12-
"BetaFeatures": "*"
13-
}
14-
},
15-
"AutoloadNamespaces": {
16-
"MediaWiki\\Extension\\AchievementBadges\\": "includes/"
17-
},
18-
"Hooks": {
19-
"GetBetaFeaturePreferences": "MediaWiki\\Extension\\AchievementBadges\\Hooks::onGetBetaFeaturePreferences"
20-
},
21-
"SpecialPages": {
22-
"AchievementBadges": "MediaWiki\\Extension\\AchievementBadges\\SpecialAchievementBadges"
23-
},
24-
"MessagesDirs": {
25-
"AchievementBadges": [ "i18n" ]
26-
},
27-
"ExtensionMessagesFiles": {
28-
"AchievementBadgesAlias": "AchievementBadges.i18n.alias.php"
29-
},
30-
"manifest_version": 2
2+
"name": "AchievementBadges",
3+
"version": "0.0.0",
4+
"author": ["Lens"],
5+
"url": "https://github.com/femiwiki/AchievementBadges",
6+
"descriptionmsg": "achievementbadges-desc",
7+
"license-name": "GPL-2.0-or-later",
8+
"type": "specialpage",
9+
"requires": {
10+
"MediaWiki": ">= 1.35.0",
11+
"extensions": {
12+
"BetaFeatures": "*"
13+
}
14+
},
15+
"AutoloadNamespaces": {
16+
"MediaWiki\\Extension\\AchievementBadges\\": "includes/"
17+
},
18+
"Hooks": {
19+
"GetBetaFeaturePreferences": "MediaWiki\\Extension\\AchievementBadges\\Hooks::onGetBetaFeaturePreferences"
20+
},
21+
"SpecialPages": {
22+
"AchievementBadges": "MediaWiki\\Extension\\AchievementBadges\\SpecialAchievementBadges"
23+
},
24+
"MessagesDirs": {
25+
"AchievementBadges": ["i18n"]
26+
},
27+
"ExtensionMessagesFiles": {
28+
"AchievementBadgesAlias": "AchievementBadges.i18n.alias.php"
29+
},
30+
"manifest_version": 2
3131
}

‎i18n/en.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@
33
"authors": []
44
},
55
"achievementbadges-desc": "TBD",
6-
"special-achievementbadges": "Achievement badges"
6+
"special-achievementbadges": "Achievement badges",
7+
"achievementbadges-summary": "TBD",
8+
"achievementbadges-achievement-enable-message": "TBD",
9+
"achievementbadges-achievement-enable-description": "TBD",
10+
"achievementbadges-disabled": "TBD."
711
}

‎i18n/qqq.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
},
55
"achievementbadges-desc": "{{desc|name=AchievementBadges|url=https://www.mediawiki.org/wiki/Special:MyLanguage/Extension:AchievementBadges}}",
66
"special-achievementbadges": "Title for the Special Page that lists all achievements.",
7-
"achievementbadges-summary": "TBD"
7+
"achievementbadges-summary": "TBD",
8+
"achievementbadges-achievement-enable-message": "TBD",
9+
"achievementbadges-achievement-enable-description": "TBD",
10+
"achievementbadges-disabled": "TBD."
811
}

‎package.json

+14-17
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
{
2-
"name": "achievement-badges",
3-
"version": "0.0.0",
4-
"private": true,
5-
"description": "TBD",
6-
"scripts": {
7-
"test": "grunt test"
8-
},
9-
"devDependencies": {
10-
"eslint-config-wikimedia": "0.12.0",
11-
"grunt": "1.0.4",
12-
"grunt-banana-checker": "0.6.0",
13-
"grunt-contrib-watch": "1.1.0",
14-
"grunt-eslint": "21.0.0",
15-
"grunt-stylelint": "0.10.1",
16-
"grunt-tyops": "0.1.0",
17-
"stylelint-config-wikimedia": "0.5.0"
18-
}
2+
"name": "achievement-badges",
3+
"version": "0.0.0",
4+
"private": true,
5+
"description": "TBD",
6+
"scripts": {
7+
"test": "npm -s run lint",
8+
"lint": "npm -s run lint:prettier && npm -s run lint:i18n",
9+
"lint:prettier": "prettier '**/*.{js,json,css,less}' --check",
10+
"lint:i18n": "banana-checker --requireLowerCase=0 i18n/"
11+
},
12+
"devDependencies": {
13+
"grunt-banana-checker": "0.9.0",
14+
"prettier": "^2.2.1"
15+
}
1916
}

‎yarn.lock

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
5+
[email protected]:
6+
version "0.9.0"
7+
resolved "https://registry.yarnpkg.com/grunt-banana-checker/-/grunt-banana-checker-0.9.0.tgz#0b58cf59ae773c12d26ead8e797f7bbfbde85939"
8+
integrity sha512-SqPiB6OazWqR8USL0NymtuT5Br3mD9WBBsM1rHC/3wIi2SrZNM6/+j9CIeuEM5oCn+AtO2Y0+rzzFyOdC9afAg==
9+
10+
prettier@^2.2.1:
11+
version "2.2.1"
12+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
13+
integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==

0 commit comments

Comments
 (0)