Skip to content

Commit

Permalink
Merge pull request #99 from hideki0403/develop
Browse files Browse the repository at this point in the history
release: v1.5.8
  • Loading branch information
hideki0403 authored Jun 29, 2024
2 parents 99e2422 + 92d1fef commit eae06b6
Show file tree
Hide file tree
Showing 9 changed files with 959 additions and 2,554 deletions.
6 changes: 0 additions & 6 deletions .eslintignore

This file was deleted.

86 changes: 0 additions & 86 deletions .eslintrc.json

This file was deleted.

12 changes: 7 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,24 @@ jobs:
with:
fetch-depth: 0

- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
cache: npm
cache: pnpm

- name: npm ci
run: npm ci
- name: pnpm install
run: pnpm install --frozen-lockfile

- name: create artifact
run: npm run publish
run: pnpm run publish
env:
TARGET_LOCALE: ja
BASE_URL: 'https://pages.yukineko.me/better-japanese' # DO NOT put trailing slash

- name: copy common files
run: npm run build-web
run: pnpm run build-web

- name: deploy
uses: peaceiris/actions-gh-pages@v3
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ jobs:
with:
fetch-depth: 0

- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: 'lts/*'
cache: npm
cache: pnpm

- name: get package version
id: package-version
Expand All @@ -43,13 +45,13 @@ jobs:
echo "pre=false" >> $GITHUB_OUTPUT
fi
- name: npm ci
- name: pnpm install
if: steps.check-tag.outputs.exists == 'false'
run: npm ci
run: pnpm install --frozen-lockfile

- name: create artifact
if: steps.check-tag.outputs.exists == 'false'
run: npm run build
run: pnpm run build

- name: archive artifact
if: steps.check-tag.outputs.exists == 'false'
Expand Down
82 changes: 82 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
import globals from 'globals'
import path from 'node:path'
import { fileURLToPath } from 'node:url'
import js from '@eslint/js'
import { FlatCompat } from '@eslint/eslintrc'

const compat = new FlatCompat({
baseDirectory: path.dirname(fileURLToPath(import.meta.url)),
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
})

export default [{
ignores: [
'**/node_modules',
'**/.github',
'**/dist',
'**/build',
'**/publish',
'**/static',
],
}, ...compat.extends('plugin:jsonc/recommended-with-json5'), {
languageOptions: {
globals: {
...globals.browser,
},

ecmaVersion: 'latest',
sourceType: 'script',
},

rules: {
semi: ['error', 'never', {
beforeStatementContinuationChars: 'never',
}],

'semi-spacing': ['error', {
after: true,
before: false,
}],

'semi-style': ['error', 'first'],
'no-extra-semi': 'error',
'no-unexpected-multiline': 'error',
'no-unreachable': 'error',

'space-infix-ops': ['error', {
int32Hint: false,
}],

'space-before-function-paren': ['error', {
anonymous: 'never',
named: 'never',
asyncArrow: 'always',
}],

'space-before-blocks': ['error', 'always'],
quotes: [2, 'single'],

'comma-spacing': ['error', {
after: true,
before: false,
}],

'spaced-comment': 'error',
'operator-linebreak': ['error', 'none'],
'no-multi-spaces': 'error',

'key-spacing': ['error', {
afterColon: true,
}],

'no-else-return': 'error',
camelcase: 'error',
'brace-style': 'error',
'no-var': 'error',

'no-multiple-empty-lines': ['error', {
max: 1,
}],
},
}]
Loading

0 comments on commit eae06b6

Please sign in to comment.