Skip to content

Commit 39a7d52

Browse files
authored
fix(javascript): import type for bundler (#4020)
1 parent 950bd58 commit 39a7d52

File tree

8 files changed

+18
-26
lines changed

8 files changed

+18
-26
lines changed

clients/algoliasearch-client-javascript/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"packages/*"
77
],
88
"scripts": {
9-
"build:all": "lerna run build --include-dependencies",
10-
"build:many": "lerna run build --scope 'algoliasearch' --scope '@algolia/requester-testing' --scope '@algolia/logger-console' --scope ${0:-'{@algolia/*,algoliasearch}'} --include-dependencies",
9+
"build": "lerna run build --scope '@algolia/requester-testing' --scope '@algolia/logger-console' --scope 'algoliasearch' --include-dependencies",
1110
"clean": "lerna run clean",
1211
"release:bump": "lerna version ${0:-patch} --no-changelog --no-git-tag-version --no-push --exact --force-publish --yes",
1312
"release:publish": "tsc --project scripts/tsconfig.json && node scripts/dist/scripts/publish.js",

clients/algoliasearch-client-javascript/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"compilerOptions": {
33
"allowJs": false,
4+
"verbatimModuleSyntax": true,
45
"allowSyntheticDefaultImports": true,
56
"declaration": true,
67
"esModuleInterop": true,

scripts/buildLanguages.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B
4848
case 'javascript':
4949
await run('YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install', { cwd, language });
5050
if (buildType === 'client') {
51-
const packageNames = gens.map(({ additionalProperties: { packageName } }) =>
52-
packageName === 'algoliasearch' ? packageName : `@algolia/${packageName}`,
53-
);
54-
await run(`yarn build:many '{${packageNames.join(',')},}'`, { cwd, language });
51+
await run(`yarn build`, { cwd, language });
5552
break;
5653
}
5754

scripts/ci/githubActions/createMatrix.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,7 @@ async function createClientMatrix(baseBranch: string): Promise<void> {
112112
languageMatrix.testsToStore = `${languageMatrix.testsToStore} ${testsRootFolder}/build.gradle`;
113113
break;
114114
case 'javascript':
115-
const packageNames = matrix[language].toRun.map((client) => {
116-
const packageName = GENERATORS[`${language}-${client}`].additionalProperties.packageName;
117-
118-
// `algoliasearch` is not preceded by `@algolia`
119-
return client === 'algoliasearch' ? packageName : `@algolia/${packageName}`;
120-
});
121-
122-
languageMatrix.buildCommand = `cd ${matrix[language].path} && yarn build:many '{${packageNames.join(',')},}'`;
115+
languageMatrix.buildCommand = `cd ${matrix[language].path} && yarn build`;
123116
languageMatrix.testsToStore = `${languageMatrix.testsToStore} ${testsRootFolder}/package.json`;
124117

125118
setOutput('JAVASCRIPT_DATA', JSON.stringify(languageMatrix));

templates/javascript/clients/algoliasearch/builds/models.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ import type {
9898
Widgets,
9999
} from '@algolia/client-search';
100100
import { apiClientVersion } from '@algolia/client-search';
101-
import {
101+
import type {
102102
Status,
103103
} from '@algolia/client-abtesting';
104-
import {
104+
import type {
105105
EventType,
106106
} from '@algolia/client-personalization';
107107

@@ -113,7 +113,7 @@ export * from '{{{dependencyPackage}}}';
113113
{{/dependencies}}
114114
export * from '@algolia/client-search';
115115

116-
export {
116+
export type {
117117
Action,
118118
AdvancedSyntaxFeatures,
119119
AlternativesAsExact,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import type { SearchForFacetsOptions } from './searchForFacetsOptions';
22
import type { SearchForHitsOptions } from './searchForHitsOptions';
3-
import { SearchParamsObject } from './searchParamsObject';
3+
import type { SearchParamsObject } from './searchParamsObject';

templates/javascript/clients/client/builds/definition.mustache

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
import { createXhrRequester } from '@algolia/requester-browser-xhr';
22
import { createHttpRequester } from '@algolia/requester-node-http';
33
import { createFetchRequester } from '@algolia/requester-fetch';
4-
import { createNullLogger, createMemoryCache, createFallbackableCache, createBrowserLocalStorageCache, createNullCache, ClientOptions, serializeQueryParameters, DEFAULT_CONNECT_TIMEOUT_NODE, DEFAULT_READ_TIMEOUT_NODE, DEFAULT_WRITE_TIMEOUT_NODE, DEFAULT_CONNECT_TIMEOUT_BROWSER, DEFAULT_READ_TIMEOUT_BROWSER, DEFAULT_WRITE_TIMEOUT_BROWSER } from '@algolia/client-common';
4+
import { createNullLogger, createMemoryCache, createFallbackableCache, createBrowserLocalStorageCache, createNullCache, serializeQueryParameters, DEFAULT_CONNECT_TIMEOUT_NODE, DEFAULT_READ_TIMEOUT_NODE, DEFAULT_WRITE_TIMEOUT_NODE, DEFAULT_CONNECT_TIMEOUT_BROWSER, DEFAULT_READ_TIMEOUT_BROWSER, DEFAULT_WRITE_TIMEOUT_BROWSER } from '@algolia/client-common';
5+
6+
import type { ClientOptions } from '@algolia/client-common';
57

68
import { create{{#lambda.titlecase}}{{clientName}}{{/lambda.titlecase}}, apiClientVersion } from '../src/{{clientName}}';
79

810
{{#hasRegionalHost}}
9-
import { Region, REGIONS, RegionOptions } from '../src/{{clientName}}';
11+
import { REGIONS } from '../src/{{clientName}}';
12+
import type { Region, RegionOptions } from '../src/{{clientName}}';
13+
14+
export type { Region, RegionOptions } from '../src/{{clientName}}';
1015
{{/hasRegionalHost}}
1116

1217
{{! We don't use `export *` to prevent exposing the factory, to avoid confusion for the user }}
1318
export {
1419
apiClientVersion,
15-
{{#hasRegionalHost}}
16-
Region,
17-
RegionOptions,
18-
{{/hasRegionalHost}}
1920
{{#isIngestionClient}}
2021
isOnDemandTrigger,
2122
isScheduleTrigger,
2223
isSubscriptionTrigger,
2324
{{/isIngestionClient}}
2425
} from '../src/{{clientName}}';
26+
2527
export * from '../model';
2628

2729
{{#isSearchClient}}
28-
import { GenerateSecuredApiKeyOptions, GetSecuredApiKeyRemainingValidityOptions, SearchClientNodeHelpers } from '../model';
30+
import type { GenerateSecuredApiKeyOptions, GetSecuredApiKeyRemainingValidityOptions, SearchClientNodeHelpers } from '../model';
2931
{{/isSearchClient}}
3032

3133
{{#nodeSearchHelpers}}

templates/javascript/clients/client/model/clientMethodProps.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{#apiInfo.apis.0}}
44

55
{{#imports}}
6-
import { {{classname}} } from '{{filename}}';
6+
import type { {{classname}} } from '{{filename}}';
77
{{/imports}}
88

99
{{! Imports for the legacy search method signature }}

0 commit comments

Comments
 (0)