Skip to content

Commit 6d58d7b

Browse files
bors[bot]bidoubiwa
andauthored
Merge #135
135: Update yarn lock and cleaning r=bidoubiwa a=bidoubiwa ## In this PR - add build in eslintignore to avoid linting the react build folder - Add `playground build` job workflow that checks if the react and vue playground build correctly - Add the job to the bors toml - Add vue file in the lining command to avoid ignoring them on lint - Add two scripts in package json to launch the playground tests - Remove eslint from `vue` playground because it inherits them from root directory - Update yarn locks Co-authored-by: Charlotte Vermandel <[email protected]> Co-authored-by: cvermand <[email protected]>
2 parents 458f4ed + 868be3b commit 6d58d7b

File tree

7 files changed

+58
-352
lines changed

7 files changed

+58
-352
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules
22
dist
3+
build

.github/workflows/test.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
tests:
14-
name: instant-meilisearch-tests
14+
name: integration-tests
1515
runs-on: ubuntu-latest
1616

1717
steps:
@@ -32,7 +32,7 @@ jobs:
3232
run: yarn test:demo:browser
3333

3434
style:
35-
name: instant-meilisearch-style-tests
35+
name: style-check
3636
runs-on: ubuntu-latest
3737

3838
steps:
@@ -41,3 +41,16 @@ jobs:
4141
run: yarn install
4242
- name: Tests style
4343
run: yarn lint
44+
45+
builds:
46+
name: playground-builds
47+
runs-on: ubuntu-latest
48+
49+
steps:
50+
- uses: actions/checkout@v1
51+
- name: Install dependencies
52+
run: yarn install
53+
- name: Run Vue build
54+
run: yarn build:playground:vue
55+
- name: Run React build
56+
run: yarn build:playground:react

bors.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
status = ["instant-meilisearch-tests", "instant-meilisearch-style-tests"]
1+
status = ['integration-tests', 'style-check', 'playground-builds']
22
# 1 hour timeout
33
timeout-sec = 3600

package.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
"test:demo:browser": "yarn --cwd examples/express && yarn --cwd examples/express test",
1010
"test:demo:nodejs": "node examples/node/index.js",
1111
"test:demo:esm": "yarn --cwd examples/esm && yarn --cwd examples/esm start",
12+
"build:playground:vue": "yarn --cwd ./playgrounds/vue && yarn --cwd ./playgrounds/vue build",
13+
"build:playground:react": "yarn --cwd ./playgrounds/react && yarn --cwd ./playgrounds/react build",
1214
"test:all": "yarn test && yarn test:demo",
13-
"lint": "eslint --ext .js,.ts,.tsx .",
14-
"lint:fix": "eslint --ext .js,.ts,.tsx --fix .",
15+
"lint": "eslint --ext .js,.ts,.tsx,.vue .",
16+
"lint:fix": "eslint --ext .js,.ts,.tsx,.vue --fix .",
1517
"build": "rollup -c rollup.config.js && rollup --environment NODE_ENV:production -c rollup.config.js ",
1618
"playground:vue": "yarn --cwd ./playgrounds/vue && yarn --cwd ./playgrounds/vue serve",
1719
"playground:react": "yarn --cwd ./playgrounds/react && yarn --cwd ./playgrounds/react start"
@@ -44,11 +46,11 @@
4446
"@babel/preset-env": "^7.10.4",
4547
"@rollup/plugin-commonjs": "^16.0.0",
4648
"@rollup/plugin-node-resolve": "^10.0.0",
49+
"babel-jest": "^26.1.0",
4750
"@typescript-eslint/eslint-plugin": "^4.0.0",
4851
"@typescript-eslint/parser": "^4.0.0",
4952
"babel-eslint": "^10.1.0",
50-
"babel-jest": "^26.1.0",
51-
"eslint": "^7.5.0",
53+
"eslint": "^7.13.0",
5254
"eslint-config-prettier": "^6.11.0",
5355
"eslint-config-react-app": "^6.0.0",
5456
"eslint-config-standard": "^16.0.0",

playgrounds/vue/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
"@vue/cli-plugin-babel": "~4.4.0",
1818
"@vue/cli-plugin-eslint": "~4.4.0",
1919
"@vue/cli-service": "~4.4.0",
20-
"babel-eslint": "^10.1.0",
21-
"eslint": "^6.7.2",
22-
"eslint-plugin-vue": "^6.2.2",
2320
"vue-template-compiler": "^2.6.11"
2421
},
2522
"eslintConfig": {

0 commit comments

Comments
 (0)