chore(dependencies): comprehensively fix node_modules of v4 (#6340)

* chore(dependencies): comprehensively fix node_modules of v4 * changes * cleaner weaner * update to latest algoliasearch
algolia · Aug 28, 2024 · 983f6a4 · 983f6a4
1 parent 7be6691
commit 983f6a4
Show file tree

Hide file tree

Showing 44 changed files with 568 additions and 399 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -240,7 +240,7 @@ jobs:
             ./scripts/legacy/downgrade-algoliasearch-v4.js
       - run:
           name: Unit & Integration tests
-          command: yarn run test:ci
+          command: yarn run test:ci:v4
       - store_test_results:
           path: junit/jest/
       - run:

diff --git a/examples/js/calendar-widget/package.json b/examples/js/calendar-widget/package.json
@@ -8,7 +8,7 @@
     "website:examples": "BABEL_ENV=parcel parcel build index.html --public-url . --dist-dir=../../../website/examples/js/calendar-widget"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.js": "4.74.0"
   },
   "devDependencies": {

diff --git a/examples/js/e-commerce-umd/package.json b/examples/js/e-commerce-umd/package.json
@@ -9,7 +9,7 @@
   },
   "browserslist": "Firefox 127, Chrome 125, IE 11",
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.js": "4.74.0"
   },
   "devDependencies": {

diff --git a/examples/js/e-commerce/package.json b/examples/js/e-commerce/package.json
@@ -9,7 +9,7 @@
   },
   "browserslist": "Firefox 127, Chrome 125, IE 11",
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.js": "4.74.0"
   },
   "devDependencies": {

diff --git a/examples/js/getting-started/package.json b/examples/js/getting-started/package.json
@@ -9,7 +9,7 @@
     "lint:fix": "npm run lint -- --fix"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.css": "8.5.0",
     "instantsearch.js": "4.74.0"
   },

diff --git a/examples/js/media/package.json b/examples/js/media/package.json
@@ -8,7 +8,7 @@
     "website:examples": "BABEL_ENV=parcel parcel build index.html --public-url . --dist-dir=../../../website/examples/js/media"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "date-fns": "2.25.0",
     "instantsearch.js": "4.74.0"
   },

diff --git a/examples/js/tourism/package.json b/examples/js/tourism/package.json
@@ -8,7 +8,7 @@
     "website:examples": "BABEL_ENV=parcel parcel build index.html --public-url . --dist-dir=../../../website/examples/js/tourism"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.js": "4.74.0"
   },
   "devDependencies": {

diff --git a/examples/react/default-theme/package.json b/examples/react/default-theme/package.json
@@ -7,7 +7,7 @@
     "start": "BABEL_ENV=parcel parcel index.html"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.js": "4.74.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",

diff --git a/examples/react/e-commerce/package.json b/examples/react/e-commerce/package.json
@@ -9,7 +9,7 @@
   },
   "browserslist": "Firefox 127, Chrome 125, IE 11",
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.js": "4.74.0",
     "react": "18.2.0",
     "react-compound-slider": "3.4.0",

diff --git a/examples/react/getting-started/package.json b/examples/react/getting-started/package.json
@@ -7,7 +7,7 @@
     "start": "BABEL_ENV=parcel parcel index.html products.html --port 3000"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.css": "8.5.0",
     "instantsearch.js": "4.74.0",
     "react": "18.2.0",

diff --git a/examples/react/next-app-router/package.json b/examples/react/next-app-router/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.css": "8.5.0",
     "next": "13.5.1",
     "react": "18.2.0",

diff --git a/examples/react/next-routing/package.json b/examples/react/next-routing/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.css": "8.5.0",
     "next": "13.5.1",
     "react": "18.2.0",

diff --git a/examples/react/next/package.json b/examples/react/next/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "instantsearch.css": "8.5.0",
     "next": "13.5.1",
     "react": "18.2.0",

diff --git a/examples/react/react-native/package.json b/examples/react/react-native/package.json
@@ -11,7 +11,7 @@
     "eject": "expo eject"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "expo": "~44.0.0",
     "expo-status-bar": "~1.2.0",
     "instantsearch.js": "4.74.0",

diff --git a/examples/react/ssr/package.json b/examples/react/ssr/package.json
@@ -22,7 +22,7 @@
     "webpack-node-externals": "1.7.2"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "express": "4.17.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",

diff --git a/examples/vue/default-theme/package.json b/examples/vue/default-theme/package.json
@@ -8,7 +8,7 @@
     "website:examples": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build --dest ../../../website/examples/vue/default-theme"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "core-js": "2",
     "instantsearch.js": "4.74.0",
     "vue": "2.7.14",

diff --git a/examples/vue/e-commerce/package.json b/examples/vue/e-commerce/package.json
@@ -8,7 +8,7 @@
     "website:examples": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build --dest ../../../website/examples/vue/e-commerce"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "core-js": "2",
     "instantsearch.js": "4.74.0",
     "vue": "2.7.14",

diff --git a/examples/vue/getting-started/package.json b/examples/vue/getting-started/package.json
@@ -7,7 +7,7 @@
     "build": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "core-js": "2",
     "instantsearch.js": "4.74.0",
     "vue": "2.7.14",

diff --git a/examples/vue/media/package.json b/examples/vue/media/package.json
@@ -8,7 +8,7 @@
     "website:examples": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build --dest ../../../website/examples/vue/media"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "core-js": "2",
     "instantsearch.js": "4.74.0",
     "vue": "2.7.14",

diff --git a/examples/vue/nuxt/package.json b/examples/vue/nuxt/package.json
@@ -11,7 +11,7 @@
     "generate": "nuxt generate"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "cross-env": "^5.2.0",
     "css-loader": "^4.3.0",
     "nuxt": "^2.4.5",

diff --git a/examples/vue/ssr/package.json b/examples/vue/ssr/package.json
@@ -8,7 +8,7 @@
     "start": "NODE_ENV=production NODE_OPTIONS=--openssl-legacy-provider vue-cli-service ssr:serve --mode production"
   },
   "dependencies": {
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "core-js": "2",
     "instantsearch.css": "8.5.0",
     "qs": "6.9.7",

diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "type-check:v3": "tsc --project tsconfig.v3.json",
     "test": "jest && lerna run test",
     "test:ci": "./scripts/retry.sh 3 'jest --maxWorkers=4 --ci' && lerna run test --concurrency=1",
+    "test:ci:v4": "./scripts/retry.sh 3 'jest --maxWorkers=4 --ci' && lerna run test:v4 --concurrency=1",
     "test:size": "bundlesize",
     "test:exports": "lerna run test:exports",
     "test:versions": "./tests/versions/index.js",
@@ -33,16 +34,12 @@
     "release": "shipjs prepare",
     "prepare": "lerna run prepare && patch-package",
     "prepare-vue3": "./scripts/prepare-vue3.js",
-    "watch:es": "lerna run watch:es --parallel --stream --ignore='example-*' --ignore='create-instantsearch-app'"
+    "watch:es": "lerna run watch:es --parallel --stream --ignore='example-*' --ignore='create-instantsearch-app'",
+    "postinstall": "yarn install --force --cwd scripts/legacy/algoliasearch@5-dependency-container && yarn install --force --cwd scripts/legacy/algoliasearch-v4-dependency-container && cp -r scripts/legacy/algoliasearch@5-dependency-container/node_modules/* node_modules/ && cp -r scripts/legacy/algoliasearch-v4-dependency-container/node_modules/* node_modules/"
   },
   "devDependencies": {
-    "@algolia/cache-common": "4.23.2",
-    "@algolia/cache-in-memory": "4.23.2",
-    "@algolia/client-search": "5.0.0",
-    "@algolia/client-common": "5.0.0",
-    "@algolia/logger-common": "4.23.2",
-    "@algolia/requester-node-http": "4.23.2",
-    "@algolia/transporter": "4.23.2",
+    "@algolia/client-search": "5.1.1",
+    "@algolia/client-common": "5.1.1",
     "@babel/cli": "7.15.4",
     "@babel/core": "7.15.5",
     "@babel/plugin-proposal-class-properties": "7.14.5",
@@ -89,9 +86,8 @@
     "@wdio/spec-reporter": "5.16.5",
     "@wdio/static-server-service": "5.16.5",
     "algoliasearch-v3": "npm:[email protected]",
-    "algoliasearch-v4": "npm:[email protected]",
-    "algoliasearch-v5": "npm:[email protected]",
-    "algoliasearch": "5.0.0",
+    "algoliasearch-v5": "npm:[email protected]",
+    "algoliasearch": "5.1.1",
     "babel-eslint": "10.1.0",
     "babel-jest": "27.4.6",
     "babel-plugin-inline-replace-variables": "1.3.1",
@@ -147,7 +143,7 @@
     "typescript": "5.5.2"
   },
   "resolutions": {
-    "places.js/algoliasearch": "5.0.0",
+    "places.js/algoliasearch": "5.1.1",
     "brotli-size": "4.0.0",
     "webpack": "4.47.0",
     "babel-loader": "8.2.2"

diff --git a/packages/algoliasearch-helper/package.json b/packages/algoliasearch-helper/package.json
@@ -10,6 +10,7 @@
     "lint": "eslint .",
     "doc": "node documentation-src/metalsmith.js",
     "test": "../../scripts/retry.sh 3 'scripts/test.sh'",
+    "test:v4": "../../scripts/retry.sh 3 'scripts/test.sh'",
     "test:unit": "jest",
     "test:watch": "jest --watch",
     "test:v3": "yarn run test",
@@ -34,9 +35,7 @@
     "types/algoliasearch.js"
   ],
   "devDependencies": {
-    "@algolia/recommend": "4.23.2",
     "@metalsmith/sass": "1.4.0",
-    "@types/algoliasearch": "3.34.11",
     "browserify": "14.5.0",
     "exorcist": "1.0.1",
     "handlebars": "4.1.0",

diff --git a/packages/create-instantsearch-app/e2e/__snapshots__/templates.test.js.snap b/packages/create-instantsearch-app/e2e/__snapshots__/templates.test.js.snap
@@ -5321,7 +5321,7 @@ exports[`Templates React InstantSearch Native File content: tsconfig.json 1`] =
 `;
 
 exports[`Templates React InstantSearch Native File content: types/ProductHit.ts 1`] = `
-"import { Hit as AlgoliaHit } from '@algolia/client-search';
+"import { Hit as AlgoliaHit } from 'instantsearch.js';
 
 export type ProductHit = AlgoliaHit<{
   brand: string;

diff --git a/packages/create-instantsearch-app/package.json b/packages/create-instantsearch-app/package.json
@@ -32,10 +32,10 @@
     "node": ">= 10"
   },
   "dependencies": {
-    "@algolia/cache-in-memory": "4",
+    "@algolia/client-common": "5.1.1",
     "@metalsmith/in-place": "4.6.0",
     "@metalsmith/remove": "1.3.0",
-    "algoliasearch": "4",
+    "algoliasearch": "5.1.1",
     "chalk": "3.0.0",
     "commander": "4.1.1",
     "inquirer": "8.2.0",

diff --git a/packages/create-instantsearch-app/src/cli/__tests__/getInformationFromIndex.js b/packages/create-instantsearch-app/src/cli/__tests__/getInformationFromIndex.js
@@ -1,4 +1,4 @@
-const algoliasearch = require('algoliasearch');
+const { algoliasearch } = require('algoliasearch');
 
 const getInformationFromIndex = require('../getInformationFromIndex');
 
@@ -15,7 +15,7 @@ jest.mock('algoliasearch', () => {
     })
   );
 
-  return _algoliasearch;
+  return { algoliasearch: _algoliasearch };
 });
 
 test('returns default information', async () => {

diff --git a/packages/create-instantsearch-app/src/cli/getInformationFromIndex.js b/packages/create-instantsearch-app/src/cli/getInformationFromIndex.js
@@ -1,14 +1,14 @@
-const { createInMemoryCache } = require('@algolia/cache-in-memory');
-const algoliasearch = require('algoliasearch');
+const { createMemoryCache } = require('@algolia/client-common');
+const { algoliasearch } = require('algoliasearch');
 
 const clients = new Map();
 function getClient(appId, apiKey) {
   const key = [appId, apiKey].join('__');
   let client = clients.get(key);
   if (!client) {
     client = algoliasearch(appId, apiKey, {
-      responsesCache: createInMemoryCache(),
-      requestsCache: createInMemoryCache(),
+      responsesCache: createMemoryCache(),
+      requestsCache: createMemoryCache(),
     });
 
     clients.set(key, client);

diff --git a/...ges/create-instantsearch-app/src/templates/React InstantSearch Native/types/ProductHit.ts b/...ges/create-instantsearch-app/src/templates/React InstantSearch Native/types/ProductHit.ts
@@ -1,4 +1,4 @@
-import { Hit as AlgoliaHit } from '@algolia/client-search';
+import { Hit as AlgoliaHit } from 'instantsearch.js';
 
 export type ProductHit = AlgoliaHit<{
   brand: string;

diff --git a/packages/instantsearch.js/package.json b/packages/instantsearch.js/package.json
@@ -61,7 +61,7 @@
     "@instantsearch/testutils": "1.44.0",
     "@storybook/html": "5.3.9",
     "@types/scriptjs": "0.0.2",
-    "algoliasearch": "5.0.0",
+    "algoliasearch": "5.1.1",
     "places.js": "1.17.1",
     "scriptjs": "2.5.9",
     "webpack": "4.47.0"