Skip to content

Commit c6a6dcb

Browse files
committed
rebase and test deps
1 parent 266ee78 commit c6a6dcb

File tree

4 files changed

+97
-7
lines changed

4 files changed

+97
-7
lines changed

clients/algoliasearch-client-javascript/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ yarn-error.log
88
!.yarn/plugins
99

1010
node_modules
11+
12+
node_

clients/algoliasearch-client-javascript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"bundlesize2": "0.0.31",
3131
"execa": "5.1.1",
3232
"lerna": "5.3.0",
33-
"nx": "14.4.3",
33+
"nx": "14.5.4",
3434
"rollup": "2.77.2",
3535
"rollup-plugin-node-globals": "1.4.0",
3636
"rollup-plugin-terser": "7.0.2",

clients/algoliasearch-client-javascript/yarn.lock

Lines changed: 93 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ __metadata:
1313
"@algolia/requester-browser-xhr": 5.0.0-alpha.5
1414
"@algolia/requester-node-http": 5.0.0-alpha.5
1515
"@types/node": 16.11.47
16+
rollup: 2.77.0
1617
typescript: 4.7.4
1718
languageName: unknown
1819
linkType: soft
@@ -25,6 +26,7 @@ __metadata:
2526
"@algolia/requester-browser-xhr": 5.0.0-alpha.5
2627
"@algolia/requester-node-http": 5.0.0-alpha.5
2728
"@types/node": 16.11.47
29+
rollup: 2.77.0
2830
typescript: 4.7.4
2931
languageName: unknown
3032
linkType: soft
@@ -50,6 +52,7 @@ __metadata:
5052
"@algolia/requester-browser-xhr": 5.0.0-alpha.5
5153
"@algolia/requester-node-http": 5.0.0-alpha.5
5254
"@types/node": 16.11.47
55+
rollup: 2.77.0
5356
typescript: 4.7.4
5457
languageName: unknown
5558
linkType: soft
@@ -62,6 +65,7 @@ __metadata:
6265
"@algolia/requester-browser-xhr": 5.0.0-alpha.5
6366
"@algolia/requester-node-http": 5.0.0-alpha.5
6467
"@types/node": 16.11.47
68+
rollup: 2.77.0
6569
typescript: 4.7.4
6670
languageName: unknown
6771
linkType: soft
@@ -74,6 +78,7 @@ __metadata:
7478
"@algolia/requester-browser-xhr": 5.0.0-alpha.5
7579
"@algolia/requester-node-http": 5.0.0-alpha.5
7680
"@types/node": 16.11.47
81+
rollup: 2.77.0
7782
typescript: 4.7.4
7883
languageName: unknown
7984
linkType: soft
@@ -86,6 +91,7 @@ __metadata:
8691
"@algolia/requester-browser-xhr": 5.0.0-alpha.5
8792
"@algolia/requester-node-http": 5.0.0-alpha.5
8893
"@types/node": 16.11.47
94+
rollup: 2.77.0
8995
typescript: 4.7.4
9096
languageName: unknown
9197
linkType: soft
@@ -98,6 +104,7 @@ __metadata:
98104
"@algolia/requester-browser-xhr": 5.0.0-alpha.5
99105
"@algolia/requester-node-http": 5.0.0-alpha.5
100106
"@types/node": 16.11.47
107+
rollup: 2.77.0
101108
typescript: 4.7.4
102109
languageName: unknown
103110
linkType: soft
@@ -110,6 +117,7 @@ __metadata:
110117
"@algolia/requester-browser-xhr": 5.0.0-alpha.5
111118
"@algolia/requester-node-http": 5.0.0-alpha.5
112119
"@types/node": 16.11.47
120+
rollup: 2.77.0
113121
typescript: 4.7.4
114122
languageName: unknown
115123
linkType: soft
@@ -122,6 +130,7 @@ __metadata:
122130
"@algolia/requester-browser-xhr": 5.0.0-alpha.5
123131
"@algolia/requester-node-http": 5.0.0-alpha.5
124132
"@types/node": 16.11.47
133+
rollup: 2.77.0
125134
typescript: 4.7.4
126135
languageName: unknown
127136
linkType: soft
@@ -3123,6 +3132,15 @@ __metadata:
31233132
languageName: node
31243133
linkType: hard
31253134

3135+
"@nrwl/cli@npm:14.5.4":
3136+
version: 14.5.4
3137+
resolution: "@nrwl/cli@npm:14.5.4"
3138+
dependencies:
3139+
nx: 14.5.4
3140+
checksum: 13ec59473c0b40e1c314c7103b2790b0d9d12187fbe1c0e22e8a882273a620bf9ab8c95da4de0b8a98e10bb090628f0250b77ec91270c0cd59b7e999a14ed0b9
3141+
languageName: node
3142+
linkType: hard
3143+
31263144
"@nrwl/tao@npm:14.4.3":
31273145
version: 14.4.3
31283146
resolution: "@nrwl/tao@npm:14.4.3"
@@ -3134,6 +3152,17 @@ __metadata:
31343152
languageName: node
31353153
linkType: hard
31363154

3155+
"@nrwl/tao@npm:14.5.4":
3156+
version: 14.5.4
3157+
resolution: "@nrwl/tao@npm:14.5.4"
3158+
dependencies:
3159+
nx: 14.5.4
3160+
bin:
3161+
tao: index.js
3162+
checksum: 53d75b6c354fe0fafe1e766ece828af94f0fc620acca58d52624d55099e24178dae3fe661e1c55a45f2ed4e2d5a709f388db2d2cb68e9b4eee6073fa30056be1
3163+
languageName: node
3164+
linkType: hard
3165+
31373166
"@octokit/auth-token@npm:^3.0.0":
31383167
version: 3.0.0
31393168
resolution: "@octokit/auth-token@npm:3.0.0"
@@ -3776,7 +3805,7 @@ __metadata:
37763805
bundlesize2: 0.0.31
37773806
execa: 5.1.1
37783807
lerna: 5.3.0
3779-
nx: 14.4.3
3808+
nx: 14.5.4
37803809
rollup: 2.77.2
37813810
rollup-plugin-node-globals: 1.4.0
37823811
rollup-plugin-terser: 7.0.2
@@ -3801,6 +3830,7 @@ __metadata:
38013830
"@types/jest": 28.1.6
38023831
"@types/node": 16.11.47
38033832
jest: 28.1.3
3833+
rollup: 2.77.0
38043834
ts-jest: 28.0.7
38053835
typescript: 4.7.4
38063836
languageName: unknown
@@ -7998,6 +8028,54 @@ __metadata:
79988028
languageName: node
79998029
linkType: hard
80008030

8031+
"nx@npm:14.5.4":
8032+
version: 14.5.4
8033+
resolution: "nx@npm:14.5.4"
8034+
dependencies:
8035+
"@nrwl/cli": 14.5.4
8036+
"@nrwl/tao": 14.5.4
8037+
"@parcel/watcher": 2.0.4
8038+
chalk: 4.1.0
8039+
chokidar: ^3.5.1
8040+
cli-cursor: 3.1.0
8041+
cli-spinners: 2.6.1
8042+
cliui: ^7.0.2
8043+
dotenv: ~10.0.0
8044+
enquirer: ~2.3.6
8045+
fast-glob: 3.2.7
8046+
figures: 3.2.0
8047+
flat: ^5.0.2
8048+
fs-extra: ^10.1.0
8049+
glob: 7.1.4
8050+
ignore: ^5.0.4
8051+
js-yaml: 4.1.0
8052+
jsonc-parser: 3.0.0
8053+
minimatch: 3.0.5
8054+
npm-run-path: ^4.0.1
8055+
open: ^8.4.0
8056+
semver: 7.3.4
8057+
string-width: ^4.2.3
8058+
tar-stream: ~2.2.0
8059+
tmp: ~0.2.1
8060+
tsconfig-paths: ^3.9.0
8061+
tslib: ^2.3.0
8062+
v8-compile-cache: 2.3.0
8063+
yargs: ^17.4.0
8064+
yargs-parser: 21.0.1
8065+
peerDependencies:
8066+
"@swc-node/register": ^1.4.2
8067+
"@swc/core": ^1.2.173
8068+
peerDependenciesMeta:
8069+
"@swc-node/register":
8070+
optional: true
8071+
"@swc/core":
8072+
optional: true
8073+
bin:
8074+
nx: bin/nx.js
8075+
checksum: 769636e609b8ed7da601c534a377cc00a5ecce96f9e0819e5c47cf0615795c0199fd85bcc00d99c39e4fa4fdc08fb683624237f6b5a5ea937614ca83286f2ebc
8076+
languageName: node
8077+
linkType: hard
8078+
80018079
"object-keys@npm:^1.1.1":
80028080
version: 1.1.1
80038081
resolution: "object-keys@npm:1.1.1"
@@ -8990,6 +9068,20 @@ __metadata:
89909068
languageName: node
89919069
linkType: hard
89929070

9071+
"rollup@npm:2.77.0":
9072+
version: 2.77.0
9073+
resolution: "rollup@npm:2.77.0"
9074+
dependencies:
9075+
fsevents: ~2.3.2
9076+
dependenciesMeta:
9077+
fsevents:
9078+
optional: true
9079+
bin:
9080+
rollup: dist/bin/rollup
9081+
checksum: 74ccc98429709984a89af636250833e7502d87f1d9c6d96ebfe4b52030ebf94b9f6b84b8ab476670329a61d54b681d35eecdc601bac5b5396b099b1ea69970ef
9082+
languageName: node
9083+
linkType: hard
9084+
89939085
"rollup@npm:2.77.2":
89949086
version: 2.77.2
89959087
resolution: "rollup@npm:2.77.2"

templates/javascript/clients/package.mustache

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@
2727
"{{{npmNamespace}}}/requester-node-http": "{{utilsPackageVersion}}"
2828
},
2929
"devDependencies": {
30-
<<<<<<< HEAD
3130
"@types/node": "16.11.47",
32-
=======
33-
"@types/node": "16.11.45",
34-
"rollup": "2.77.0",
35-
>>>>>>> 721d204a (fix(javascript): build)
31+
"rollup": "2.77.2",
3632
"typescript": "4.7.4"
3733
},
3834
{{/isAlgoliasearchClient}}

0 commit comments

Comments
 (0)