Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit 946f2cd

Browse files
Merge pull request #298 from technote-space/release/v2.2.5
Release/v2.2.5
2 parents cc616fa + a32e089 commit 946f2cd

File tree

16 files changed

+1764
-1491
lines changed

16 files changed

+1764
-1491
lines changed

.editorconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@ indent_style = space
1919
indent_size = 2
2020

2121
[{*.txt,wp-config-sample.php}]
22-
end_of_line = crlf
22+
end_of_line = crlf
23+
24+
[*.md]
25+
trim_trailing_whitespace = false

.github/workflows/ci.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ on:
66
tags:
77
- "!*"
88

9-
name: Build
9+
name: CI
10+
11+
env:
12+
CI: 1
13+
TRAVIS_BUILD_DIR: ${{ github.workspace }}
1014

1115
jobs:
1216
eslint:
1317
name: ESLint
1418
runs-on: ubuntu-latest
15-
env:
16-
CI: 1
17-
TRAVIS_BUILD_DIR: ${{ github.workspace }}
1819
steps:
1920
- uses: actions/checkout@v1
2021
with:
@@ -33,9 +34,6 @@ jobs:
3334
phpcs:
3435
name: PHP Code Sniffer
3536
runs-on: ubuntu-latest
36-
env:
37-
CI: 1
38-
TRAVIS_BUILD_DIR: ${{ github.workspace }}
3937
steps:
4038
- uses: actions/checkout@v1
4139
with:
@@ -54,9 +52,6 @@ jobs:
5452
phpmd:
5553
name: PHPMD
5654
runs-on: ubuntu-latest
57-
env:
58-
CI: 1
59-
TRAVIS_BUILD_DIR: ${{ github.workspace }}
6055
steps:
6156
- uses: actions/checkout@v1
6257
with:
@@ -79,10 +74,7 @@ jobs:
7974
runs-on: ubuntu-latest
8075
strategy:
8176
matrix:
82-
node: ['8', '10', '11', '12']
83-
env:
84-
CI: 1
85-
TRAVIS_BUILD_DIR: ${{ github.workspace }}
77+
node: ['10', '11', '12']
8678
steps:
8779
- uses: actions/checkout@v1
8880
with:
@@ -112,9 +104,6 @@ jobs:
112104
name: PHPUnit
113105
needs: [phpcs, phpmd]
114106
runs-on: ubuntu-16.04
115-
env:
116-
CI: 1
117-
TRAVIS_BUILD_DIR: ${{ github.workspace }}
118107
services:
119108
mysql:
120109
image: mysql

.github/workflows/release.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ on:
55

66
name: Release
77

8+
env:
9+
CI: 1
10+
TRAVIS_BUILD_DIR: ${{ github.workspace }}
11+
812
jobs:
913
test:
1014
name: Test
1115
runs-on: ubuntu-latest
12-
env:
13-
CI: 1
14-
TRAVIS_BUILD_DIR: ${{ github.workspace }}
1516
steps:
1617
- name: Checkout
17-
uses: actions/checkout@master
18+
uses: actions/checkout@v1
1819
with:
1920
fetch-depth: 3
2021
- name: Prepare setting
@@ -40,24 +41,23 @@ jobs:
4041
runs-on: ubuntu-latest
4142
steps:
4243
- name: Checkout
43-
uses: actions/checkout@master
44+
uses: actions/checkout@v1
4445
with:
4546
fetch-depth: 3
4647
- name: Build
4748
run: |
4849
git clone --depth=1 https://github.com/wp-content-framework/travis-ci.git travis-ci
4950
bash travis-ci/bin/deploy/gh-pages.sh
5051
env:
51-
TRAVIS_BUILD_DIR: ${{ github.workspace }}
5252
GH_PAGES_APP_ID: editor
5353
GH_PAGES_PLUGIN_SCRIPT: ./index.min.js
5454
GH_PAGES_PLUGIN_STYLE: ./index.css
5555
GH_PAGES_TITLE: Marker Animation
5656
GH_PAGES_TEMPLATE: gutenberg
5757
GH_PAGES_TRACKING_ID: UA-78163306-3
5858
- name: Deploy
59-
uses: JamesIves/github-pages-deploy-action@master
60-
env:
59+
uses: JamesIves/github-pages-deploy-action@releases/v3
60+
with:
6161
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
6262
BRANCH: gh-pages
6363
FOLDER: gh-pages
@@ -73,12 +73,9 @@ jobs:
7373
name: Upload build files
7474
needs: test
7575
runs-on: ubuntu-latest
76-
env:
77-
CI: 1
78-
TRAVIS_BUILD_DIR: ${{ github.workspace }}
7976
steps:
8077
- name: Checkout
81-
uses: actions/checkout@master
78+
uses: actions/checkout@v1
8279
with:
8380
fetch-depth: 3
8481
- name: Prepare setting

.github/workflows/toc.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
on: push
1+
on:
2+
pull_request:
3+
types: [opened, synchronize, reopened, closed]
4+
25
name: TOC Generator
6+
37
jobs:
48
toc:
59
name: TOC Generator
610
runs-on: ubuntu-latest
711
steps:
812
- name: TOC Generator
9-
uses: technote-space/toc-generator@v1
13+
uses: technote-space/toc-generator@v2
1014
with:
1115
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
12-
TARGET_PATHS: 'README.md,README.ja.md'
16+
TARGET_BRANCH_PREFIX: release/
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
on:
2+
schedule:
3+
- cron: 0 17 * * 5
4+
pull_request:
5+
types: [opened, synchronize, reopened, closed]
6+
7+
name: Update dependencies
8+
9+
env:
10+
CI: 1
11+
GITHUB_ACTION: 1
12+
TRAVIS_BUILD_DIR: ${{ github.workspace }}
13+
14+
jobs:
15+
release:
16+
name: Update dependencies
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Update dependencies
20+
uses: technote-space/create-pr-action@v1
21+
with:
22+
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
23+
GLOBAL_INSTALL_PACKAGES: npm-check-updates
24+
EXECUTE_COMMANDS: |
25+
composer bin:download
26+
composer bin:update
27+
COMMIT_MESSAGE: 'chore: update dependencies'
28+
PR_BRANCH_NAME: 'chore-update-${PR_ID}'
29+
PR_TITLE: 'chore: update dependencies (${PR_MERGE_REF})'
30+
PR_DEFAULT_BRANCH_PREFIX: release/
31+
PR_DEFAULT_BRANCH_NAME: ${PATCH_VERSION}
32+
PR_DEFAULT_BRANCH_TITLE: release/${PATCH_VERSION}
33+
TARGET_BRANCH_PREFIX: release/

README.ja.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Marker Animation
22

3-
[![Build Status](https://github.com/technote-space/marker-animation/workflows/Build/badge.svg)](https://github.com/technote-space/marker-animation/actions)
3+
[![CI Status](https://github.com/technote-space/marker-animation/workflows/CI/badge.svg)](https://github.com/technote-space/marker-animation/actions)
44
[![Build Status](https://travis-ci.com/technote-space/marker-animation.svg?branch=master)](https://travis-ci.com/technote-space/marker-animation)
55
[![codecov](https://codecov.io/gh/technote-space/marker-animation/branch/master/graph/badge.svg)](https://codecov.io/gh/technote-space/marker-animation)
66
[![CodeFactor](https://www.codefactor.io/repository/github/technote-space/marker-animation/badge)](https://www.codefactor.io/repository/github/technote-space/marker-animation)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Marker Animation
22

3-
[![Build Status](https://github.com/technote-space/marker-animation/workflows/Build/badge.svg)](https://github.com/technote-space/marker-animation/actions)
3+
[![CI Status](https://github.com/technote-space/marker-animation/workflows/CI/badge.svg)](https://github.com/technote-space/marker-animation/actions)
44
[![Build Status](https://travis-ci.com/technote-space/marker-animation.svg?branch=master)](https://travis-ci.com/technote-space/marker-animation)
55
[![codecov](https://codecov.io/gh/technote-space/marker-animation/branch/master/graph/badge.svg)](https://codecov.io/gh/technote-space/marker-animation)
66
[![CodeFactor](https://www.codefactor.io/repository/github/technote-space/marker-animation/badge)](https://www.codefactor.io/repository/github/technote-space/marker-animation)

assets/js/package.json

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,69 @@
11
{
22
"name": "marker-animation",
3-
"version": "2.2.4",
3+
"version": "2.2.5",
44
"description": "marker animation for wordpress",
55
"main": "marker-animation.min.js",
66
"scripts": {
77
"start": "yarn build",
88
"test": "yarn lint && yarn cover",
99
"test:update": "yarn lint && yarn cover:update",
10-
"lint": "eslint src/**/**/*.js && eslint __tests__/**/**/*.js",
10+
"lint": "eslint src/**/**/*.js __tests__/**/**/*.js",
11+
"lint:fix": "eslint --fix src/**/**/*.ts __tests__/**/**/*.ts",
1112
"cover": "jest --coverage",
1213
"cover:update": "jest --coverage --updateSnapshot",
1314
"develop": "yarn develop:m && yarn develop:g",
1415
"develop:m": "webpack --mode development --config marker-animation.config.js",
1516
"develop:g": "webpack --mode development --config gutenberg.config.js",
1617
"build": "yarn build:m && yarn build:g",
1718
"build:m": "webpack --mode production --config marker-animation.config.js",
18-
"build:g": "webpack --mode production --config gutenberg.config.js"
19+
"build:g": "webpack --mode production --config gutenberg.config.js",
20+
"update": "ncu -u && yarn install && yarn upgrade && yarn audit"
1921
},
2022
"author": "Technote <technote.space@gmail.com> (https://technote.space)",
2123
"license": "GPL-3.0",
2224
"dependencies": {
23-
"@technote-space/register-grouped-format-type": "^1.1.8",
24-
"jquery.marker-animation": "^1.4.7"
25+
"@technote-space/register-grouped-format-type": "^1.2.3",
26+
"jquery.marker-animation": "^1.4.11"
2527
},
2628
"devDependencies": {
27-
"@babel/core": "^7.6.4",
28-
"@babel/plugin-proposal-object-rest-spread": "^7.6.2",
29-
"@babel/plugin-transform-modules-commonjs": "^7.6.0",
30-
"@babel/plugin-transform-react-jsx": "^7.3.0",
31-
"@babel/plugin-transform-runtime": "^7.6.2",
32-
"@babel/polyfill": "^7.6.0",
33-
"@babel/preset-env": "^7.6.3",
34-
"@babel/register": "^7.6.2",
35-
"@wordpress/block-editor": "^3.2.2",
36-
"@wordpress/blocks": "^6.7.2",
37-
"@wordpress/components": "^8.3.2",
38-
"@wordpress/compose": "^3.7.2",
39-
"@wordpress/core-data": "^2.7.2",
40-
"@wordpress/data": "^4.9.2",
29+
"@babel/core": "^7.7.7",
30+
"@babel/plugin-proposal-object-rest-spread": "^7.7.7",
31+
"@babel/plugin-transform-modules-commonjs": "^7.7.5",
32+
"@babel/plugin-transform-react-jsx": "^7.7.7",
33+
"@babel/plugin-transform-runtime": "^7.7.6",
34+
"@babel/polyfill": "^7.7.0",
35+
"@babel/preset-env": "^7.7.7",
36+
"@babel/register": "^7.7.7",
37+
"@wordpress/block-editor": "^3.4.0",
38+
"@wordpress/blocks": "^6.9.0",
39+
"@wordpress/components": "^8.5.0",
40+
"@wordpress/compose": "^3.9.0",
41+
"@wordpress/core-data": "^2.9.0",
42+
"@wordpress/data": "^4.11.0",
4143
"@wordpress/dom-ready": "^2.5.1",
42-
"@wordpress/editor": "^9.7.2",
43-
"@wordpress/element": "^2.8.2",
44-
"@wordpress/format-library": "^1.9.2",
44+
"@wordpress/editor": "^9.9.0",
45+
"@wordpress/element": "^2.10.0",
46+
"@wordpress/format-library": "^1.11.0",
4547
"@wordpress/hooks": "^2.6.0",
46-
"@wordpress/i18n": "^3.6.1",
47-
"@wordpress/rich-text": "^3.7.2",
48-
"@wordpress/server-side-render": "^1.3.2",
49-
"@wordpress/url": "^2.8.1",
48+
"@wordpress/i18n": "^3.7.0",
49+
"@wordpress/rich-text": "^3.9.0",
50+
"@wordpress/server-side-render": "^1.5.0",
51+
"@wordpress/url": "^2.9.0",
5052
"babel-jest": "^24.9.0",
5153
"babel-loader": "^8.0.6",
5254
"duplicate-package-checker-webpack-plugin": "^3.0.0",
53-
"enzyme": "^3.10.0",
54-
"enzyme-adapter-react-16": "^1.15.1",
55+
"enzyme": "^3.11.0",
56+
"enzyme-adapter-react-16": "^1.15.2",
5557
"enzyme-to-json": "^3.4.3",
56-
"eslint": "^6.5.1",
57-
"eslint-plugin-react": "^7.16.0",
58+
"eslint": "^6.8.0",
59+
"eslint-plugin-react": "^7.17.0",
5860
"jest": "^24.9.0",
5961
"jest-extended": "^0.11.2",
6062
"lodash": "^4.17.15",
6163
"mousetrap": "^1.6.3",
6264
"react-autosize-textarea": "^7.0.0",
6365
"speed-measure-webpack-plugin": "^1.3.1",
64-
"webpack": "^4.41.2",
65-
"webpack-cli": "~3.3.9"
66+
"webpack": "^4.41.5",
67+
"webpack-cli": "~3.3.10"
6668
}
6769
}

0 commit comments

Comments
 (0)