Skip to content

Commit 1b27f7b

Browse files
bors[bot]bidoubiwa
andauthored
Merge #530
530: Add compatibility with instantsearch types r=bidoubiwa a=bidoubiwa fixes: #529 fixes: #460 fixes: #517 Co-authored-by: Charlotte Vermandel <[email protected]>
2 parents c5925ef + a6faee2 commit 1b27f7b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1986
-2238
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ jobs:
2828
with:
2929
node-version: '12.x'
3030
- name: Install dependencies
31-
run: yarn --dev && yarn --cwd ./playgrounds/react
31+
run: yarn --dev && yarn --cwd ./playgrounds/vue
3232
- name: Run Browser tests
3333
uses: cypress-io/github-action@v2
3434
with:
3535
# Tests are only done on one playground to avoid long testing time
36-
start: yarn playground:react
37-
env: playground=react
36+
start: yarn playground:vue
37+
env: playground=vue
3838
- uses: actions/upload-artifact@v1
3939
if: failure()
4040
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,4 @@ cypress/support
118118
cypress/plugins
119119
cypress/fixtures
120120

121+
.vscode

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"test:watch": "yarn test --watch",
99
"test": "jest --runInBand --selectProjects dom --selectProjects node",
1010
"test:build": "yarn build && jest --runInBand --selectProjects build",
11-
"test:e2e": "concurrently --kill-others -s first \"NODE_ENV=test yarn playground:javascript\" \"cypress run --env playground=javascript\"",
11+
"test:e2e": "concurrently --kill-others -s first \"NODE_ENV=test yarn playground:angular\" \"cypress run --env playground=angular\"",
1212
"test:e2e:all": "sh scripts/e2e.sh",
13-
"test:e2e:watch": "concurrently --kill-others -s first \"NODE_ENV=test yarn playground:javascript\" \"cypress open --env playground=javascript\"",
13+
"test:e2e:watch": "concurrently --kill-others -s first \"NODE_ENV=test yarn playground:angular\" \"cypress open --env playground=angular\"",
1414
"test:all": "yarn test:e2e:all && yarn test && test:build",
1515
"cy:open": "cypress open",
1616
"playground:vue": "yarn --cwd ./playgrounds/vue && yarn --cwd ./playgrounds/vue serve",
@@ -53,20 +53,22 @@
5353
"url": "https://github.com/meilisearch/instant-meilisearch.git"
5454
},
5555
"dependencies": {
56-
"meilisearch": "^0.20.1"
56+
"meilisearch": "^0.21.0"
5757
},
5858
"devDependencies": {
5959
"@babel/cli": "^7.15.7",
6060
"@babel/core": "^7.15.5",
6161
"@babel/preset-env": "^7.15.6",
6262
"@rollup/plugin-commonjs": "^17.1.0",
6363
"@rollup/plugin-node-resolve": "^11.2.0",
64+
"@types/jest": "^27.0.2",
6465
"@typescript-eslint/eslint-plugin": "^4.16.1",
6566
"@typescript-eslint/parser": "^4.16.1",
6667
"@vue/eslint-config-typescript": "^7.0.0",
6768
"@vue/eslint-plugin": "^4.2.0",
69+
"algoliasearch": "^4.10.5",
6870
"babel-eslint": "^10.1.0",
69-
"babel-jest": "^26.1.0",
71+
"babel-jest": "^27.2.2",
7072
"concurrently": "^6.2.1",
7173
"cssnano": "^4.1.10",
7274
"cypress": "^7.3.0",
@@ -86,7 +88,7 @@
8688
"eslint-plugin-standard": "^5.0.0",
8789
"eslint-plugin-vue": "^7.7.0",
8890
"instantsearch.js": "^4.30.1",
89-
"jest": "^26.6.3",
91+
"jest": "^27.2.2",
9092
"jest-watch-typeahead": "^0.6.3",
9193
"prettier": "^2.0.0",
9294
"regenerator-runtime": "^0.13.7",
@@ -96,8 +98,8 @@
9698
"rollup-plugin-terser": "^7.0.0",
9799
"rollup-plugin-typescript2": "^0.30.0",
98100
"shx": "^0.3.3",
99-
"ts-jest": "^26.5.2",
101+
"ts-jest": "^27.0.5",
100102
"tslib": "^2.3.1",
101-
"typescript": "^4.3.5"
103+
"typescript": "^4.4.3"
102104
}
103105
}

playgrounds/angular/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"@angular/platform-browser": "~11.2.2",
1717
"@angular/platform-browser-dynamic": "~11.2.2",
1818
"@angular/router": "~11.2.2",
19-
"angular-instantsearch": "^3.0.0-beta.5",
19+
"algoliasearch": "^4.10.5",
20+
"angular-instantsearch": "^4.0.0",
2021
"instantsearch.css": "^7.4.5",
2122
"instantsearch.js": "^4.14.0",
2223
"rxjs": "~6.6.0",

playgrounds/angular/tsconfig.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,29 @@
88
"declaration": false,
99
"downlevelIteration": true,
1010
"experimentalDecorators": true,
11+
"allowSyntheticDefaultImports": true,
1112
"moduleResolution": "node",
1213
"importHelpers": true,
1314
"target": "es2015",
1415
"module": "es2020",
1516
"lib": [
1617
"es2020",
1718
"dom"
18-
]
19+
],
20+
// Enforced typing rules
21+
"strict": true,
22+
"noImplicitAny": true,
23+
"strictNullChecks": true,
24+
"strictFunctionTypes": true,
25+
"strictPropertyInitialization": true,
26+
"strictBindCallApply": true,
27+
"noImplicitThis": true,
28+
"noImplicitReturns": true,
29+
"alwaysStrict": true,
30+
"emitDecoratorMetadata": true,
31+
"forceConsistentCasingInFileNames": true,
32+
"noUnusedLocals": false,
33+
"noUnusedParameters": true,
1934
},
2035
"angularCompilerOptions": {
2136
"enableI18nLegacyMessageIdFormat": false

0 commit comments

Comments
 (0)