From 15129c4481a1fbbc2448e7d91ac36e15bc2278d2 Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Mon, 27 Jun 2022 11:59:48 +0200 Subject: [PATCH 1/2] chore: prepare release 2022-06-24 --- .../CHANGELOG.md | 4 ++++ .../packages/algoliasearch/package.json | 14 ++++++------- .../packages/client-common/package.json | 2 +- .../requester-browser-xhr/package.json | 4 ++-- .../packages/requester-node-http/package.json | 4 ++-- config/clients.config.json | 2 +- config/openapitools.json | 20 +++++++++---------- 7 files changed, 27 insertions(+), 23 deletions(-) diff --git a/clients/algoliasearch-client-javascript/CHANGELOG.md b/clients/algoliasearch-client-javascript/CHANGELOG.md index a56a0c6e79..05c55c6fd0 100644 --- a/clients/algoliasearch-client-javascript/CHANGELOG.md +++ b/clients/algoliasearch-client-javascript/CHANGELOG.md @@ -1,3 +1,7 @@ +## [0.6.2](https://github.com/algolia/algoliasearch-client-javascript/compare/0.6.1...0.6.2) + +- d7fcc6d3 fix(javascript): import lite resolution (#737) + ## [0.6.1](https://github.com/algolia/algoliasearch-client-javascript/compare/0.6.0...0.6.1) - 5b70ec1a fix(javascript): publish `algoliasearch` dist (#735) diff --git a/clients/algoliasearch-client-javascript/packages/algoliasearch/package.json b/clients/algoliasearch-client-javascript/packages/algoliasearch/package.json index 663081f608..0e85c0fa55 100644 --- a/clients/algoliasearch-client-javascript/packages/algoliasearch/package.json +++ b/clients/algoliasearch-client-javascript/packages/algoliasearch/package.json @@ -1,6 +1,6 @@ { "name": "@experimental-api-clients-automation/algoliasearch", - "version": "0.6.1", + "version": "0.6.2", "description": "A fully-featured and blazing-fast JavaScript API client to interact with Algolia API.", "repository": "algolia/algoliasearch-client-javascript", "license": "MIT", @@ -56,12 +56,12 @@ "test": "jest" }, "dependencies": { - "@experimental-api-clients-automation/client-analytics": "0.6.1", - "@experimental-api-clients-automation/client-common": "0.6.1", - "@experimental-api-clients-automation/client-personalization": "0.6.1", - "@experimental-api-clients-automation/client-search": "0.6.1", - "@experimental-api-clients-automation/requester-browser-xhr": "0.6.1", - "@experimental-api-clients-automation/requester-node-http": "0.6.1" + "@experimental-api-clients-automation/client-analytics": "0.6.2", + "@experimental-api-clients-automation/client-common": "0.6.2", + "@experimental-api-clients-automation/client-personalization": "0.6.2", + "@experimental-api-clients-automation/client-search": "0.6.2", + "@experimental-api-clients-automation/requester-browser-xhr": "0.6.2", + "@experimental-api-clients-automation/requester-node-http": "0.6.2" }, "devDependencies": { "@types/jest": "28.1.2", diff --git a/clients/algoliasearch-client-javascript/packages/client-common/package.json b/clients/algoliasearch-client-javascript/packages/client-common/package.json index 1354360009..c41ed62368 100644 --- a/clients/algoliasearch-client-javascript/packages/client-common/package.json +++ b/clients/algoliasearch-client-javascript/packages/client-common/package.json @@ -1,6 +1,6 @@ { "name": "@experimental-api-clients-automation/client-common", - "version": "0.6.1", + "version": "0.6.2", "description": "Common package for the Algolia JavaScript API client.", "repository": "algolia/algoliasearch-client-javascript", "license": "MIT", diff --git a/clients/algoliasearch-client-javascript/packages/requester-browser-xhr/package.json b/clients/algoliasearch-client-javascript/packages/requester-browser-xhr/package.json index e682d15781..0b422d98e7 100644 --- a/clients/algoliasearch-client-javascript/packages/requester-browser-xhr/package.json +++ b/clients/algoliasearch-client-javascript/packages/requester-browser-xhr/package.json @@ -1,6 +1,6 @@ { "name": "@experimental-api-clients-automation/requester-browser-xhr", - "version": "0.6.1", + "version": "0.6.2", "description": "Promise-based request library for browser using xhr.", "repository": "algolia/algoliasearch-client-javascript", "license": "MIT", @@ -18,7 +18,7 @@ "clean": "rm -rf dist/" }, "dependencies": { - "@experimental-api-clients-automation/client-common": "0.6.1" + "@experimental-api-clients-automation/client-common": "0.6.2" }, "devDependencies": { "@types/node": "16.11.41", diff --git a/clients/algoliasearch-client-javascript/packages/requester-node-http/package.json b/clients/algoliasearch-client-javascript/packages/requester-node-http/package.json index ac0bd7e9d2..9b4f366032 100644 --- a/clients/algoliasearch-client-javascript/packages/requester-node-http/package.json +++ b/clients/algoliasearch-client-javascript/packages/requester-node-http/package.json @@ -1,6 +1,6 @@ { "name": "@experimental-api-clients-automation/requester-node-http", - "version": "0.6.1", + "version": "0.6.2", "description": "Promise-based request library for node using the native http module.", "repository": "algolia/algoliasearch-client-javascript", "license": "MIT", @@ -17,7 +17,7 @@ "clean": "rm -rf dist/" }, "dependencies": { - "@experimental-api-clients-automation/client-common": "0.6.1" + "@experimental-api-clients-automation/client-common": "0.6.2" }, "devDependencies": { "@types/node": "16.11.41", diff --git a/config/clients.config.json b/config/clients.config.json index c89fa13d03..3306329fdd 100644 --- a/config/clients.config.json +++ b/config/clients.config.json @@ -15,7 +15,7 @@ "folder": "clients/algoliasearch-client-javascript", "npmNamespace": "@experimental-api-clients-automation", "gitRepoId": "algoliasearch-client-javascript", - "utilsPackageVersion": "0.6.1", + "utilsPackageVersion": "0.6.2", "modelFolder": "model", "apiFolder": "src", "customGenerator": "algolia-javascript", diff --git a/config/openapitools.json b/config/openapitools.json index 8a65d6ad5e..6eed747ce8 100644 --- a/config/openapitools.json +++ b/config/openapitools.json @@ -6,63 +6,63 @@ "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-search", "reservedWordsMappings": "queryParameters=queryParameters,requestOptions=requestOptions", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "javascript-lite": { "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/algoliasearch/lite", "reservedWordsMappings": "queryParameters=queryParameters,requestOptions=requestOptions", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "javascript-recommend": { "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/recommend", "reservedWordsMappings": "queryParameters=queryParameters", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "javascript-personalization": { "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-personalization", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "javascript-analytics": { "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-analytics", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "javascript-insights": { "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-insights", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "javascript-abtesting": { "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-abtesting", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "javascript-query-suggestions": { "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-query-suggestions", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "javascript-sources": { "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-sources", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "javascript-predict": { "output": "#{cwd}/clients/algoliasearch-client-javascript/packages/client-predict", "additionalProperties": { - "packageVersion": "0.6.1" + "packageVersion": "0.6.2" } }, "java-search": { From 0d3e7fcb1ccf65e0fb9a340dbddb35c6b84edd3a Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Mon, 27 Jun 2022 12:00:11 +0200 Subject: [PATCH 2/2] fix release install --- .github/actions/setup/action.yml | 2 +- .github/workflows/check.yml | 15 +++++++++++++-- scripts/formatter.ts | 6 ++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index ae2c572f16..81ba1b6306 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -93,7 +93,7 @@ runs: - name: Install JavaScript client dependencies if: ${{ inputs.language == 'javascript' }} shell: bash - run: cd clients/algoliasearch-client-javascript && yarn install + run: cd clients/algoliasearch-client-javascript && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install # PHP deps - name: Run composer update diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4ecb749072..ecd7f62c22 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -148,6 +148,9 @@ jobs: )}} path: clients/algoliasearch-client-javascript/packages/${{ matrix.client }} + - name: Remove generated clients + run: cd clients/algoliasearch-client-javascript/packages && ls . | grep -v -E "(client-common|requester-)" | xargs rm -rf + - name: Setup if: ${{ steps.cache.outputs.cache-hit != 'true' }} uses: ./.github/actions/setup @@ -208,6 +211,14 @@ jobs: with: type: js_utils + - name: Remove generated clients + if: ${{ steps.cache.outputs.cache-hit != 'true' && matrix.client.language == 'javascript' }} + run: | + cd ${{ matrix.client.path }}/packages + ls . | grep -v -E "(client-common|requester-|algoliasearch)" | xargs rm -rf + rm -rf algoliasearch/lite + mv algoliasearch/package.json algoliasearch/package.json.tmp + - name: Setup uses: ./.github/actions/setup with: @@ -217,9 +228,9 @@ jobs: if: ${{ steps.cache.outputs.cache-hit != 'true' }} run: yarn cli generate ${{ matrix.client.language }} ${{ matrix.client.toRun }} - - name: Update `yarn.lock` for JavaScript + - name: Restore the algoliasearch package.json if: ${{ matrix.client.language == 'javascript' }} - run: cd ${{ matrix.client.path }} && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install + run: mv ${{ matrix.client.path }}/packages/algoliasearch/package.json.tmp ${{ matrix.client.path }}/packages/algoliasearch/package.json - name: Build clients if: ${{ steps.cache.outputs.cache-hit != 'true' && matrix.client.language != 'php' }} diff --git a/scripts/formatter.ts b/scripts/formatter.ts index 9ab22aa214..6116edc446 100644 --- a/scripts/formatter.ts +++ b/scripts/formatter.ts @@ -13,6 +13,12 @@ export async function formatter( let cmd = ''; switch (language) { case 'javascript': + if (CI) { + await run( + 'cd clients/algoliasearch-client-javascript && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install', + { verbose } + ); + } cmd = `yarn eslint --ext=ts,json ${folder} --fix --no-error-on-unmatched-pattern`; break; case 'java':