Skip to content

Commit 96ff3e9

Browse files
authored
Merge branch 'master' into feat/spanish-translation
2 parents 54ed057 + 2bf48d2 commit 96ff3e9

File tree

11 files changed

+3223
-18494
lines changed

11 files changed

+3223
-18494
lines changed

.github/workflows/test.yml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Node CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
pull_request:
9+
types: [opened, synchronize, reopened]
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
15+
strategy:
16+
matrix:
17+
node-version: [12.x]
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
22+
- name: Use Node.js ${{ matrix.node-version }}
23+
uses: actions/setup-node@v1
24+
with:
25+
node-version: ${{ matrix.node-version }}
26+
27+
- name: Get yarn cache directory path
28+
id: yarn-cache-dir-path
29+
run: echo "::set-output name=dir::$(yarn cache dir)"
30+
31+
- uses: actions/cache@v2
32+
with:
33+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
34+
key: ${{ runner.os }}-yarn-${{ matrix.node-version }}-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
35+
restore-keys: |
36+
${{ runner.os }}-yarn-${{ matrix.node-version }}-
37+
38+
- name: install dependencies
39+
run: yarn --frozen-lockfile
40+
41+
- name: run tests
42+
run: yarn test
43+
44+
- name: run build
45+
run: yarn run build

.prettierrc.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
semi: true,
3+
singleQuote: false,
4+
trailingComma: "none",
5+
tabWidth: 2
6+
};

.travis.yml

-13
This file was deleted.

example/react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"react": "^16.6.0",
88
"react-dom": "^16.6.0",
99
"react-router-dom": "^4.3.1",
10-
"react-scripts": "^2.0.0"
10+
"react-scripts": "^3.0.0"
1111
},
1212
"scripts": {
1313
"start": "SKIP_PREFLIGHT_CHECK=true react-scripts start",

example/react/yarn.lock

+3,105-2,735
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)