Skip to content

Commit 544d919

Browse files
phani-srikarphani-srikar
committed
chore: remove glob from utility script
1 parent 8fdf1a7 commit 544d919

File tree

4 files changed

+89
-93
lines changed

4 files changed

+89
-93
lines changed

‎.codebuild/e2e_workflow.yml‎

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -79,203 +79,201 @@ batch:
7979
depend-on:
8080
- publish_to_local_registry
8181
- identifier: >-
82-
l_remove_codegen_ios_remove_codegen_android_graphql_codegen_js_graphql_codegen_android
82+
l_add_codegen_ios_configure_codegen_android_configure_codegen_js_graphql_codegen_android
8383
buildspec: .codebuild/run_e2e_tests.yml
8484
env:
8585
compute-type: BUILD_GENERAL1_LARGE
8686
variables:
8787
TEST_SUITE: >-
88-
src/__tests__/remove-codegen-ios.test.ts|src/__tests__/remove-codegen-android.test.ts|src/__tests__/graphql-codegen-js.test.ts|src/__tests__/graphql-codegen-android.test.ts
88+
src/__tests__/add-codegen-ios.test.ts|src/__tests__/configure-codegen-android.test.ts|src/__tests__/configure-codegen-js.test.ts|src/__tests__/graphql-codegen-android.test.ts
8989
CLI_REGION: us-east-1
9090
depend-on:
9191
- publish_to_local_registry
9292
- identifier: >-
93-
l_configure_codegen_js_configure_codegen_android_add_codegen_ios_graphql_codegen_ios
93+
l_graphql_codegen_js_remove_codegen_android_remove_codegen_ios_add_codegen_android
9494
buildspec: .codebuild/run_e2e_tests.yml
9595
env:
9696
compute-type: BUILD_GENERAL1_LARGE
9797
variables:
9898
TEST_SUITE: >-
99-
src/__tests__/configure-codegen-js.test.ts|src/__tests__/configure-codegen-android.test.ts|src/__tests__/add-codegen-ios.test.ts|src/__tests__/graphql-codegen-ios.test.ts
99+
src/__tests__/graphql-codegen-js.test.ts|src/__tests__/remove-codegen-android.test.ts|src/__tests__/remove-codegen-ios.test.ts|src/__tests__/add-codegen-android.test.ts
100100
CLI_REGION: us-east-2
101101
depend-on:
102102
- publish_to_local_registry
103103
- identifier: >-
104-
l_feature_flags_datastore_modelgen_js_datastore_modelgen_android_configure_codegen_ios
104+
l_configure_codegen_ios_datastore_modelgen_android_datastore_modelgen_js_feature_flags
105105
buildspec: .codebuild/run_e2e_tests.yml
106106
env:
107107
compute-type: BUILD_GENERAL1_LARGE
108108
variables:
109109
TEST_SUITE: >-
110-
src/__tests__/feature-flags.test.ts|src/__tests__/datastore-modelgen-js.test.ts|src/__tests__/datastore-modelgen-android.test.ts|src/__tests__/configure-codegen-ios.test.ts
110+
src/__tests__/configure-codegen-ios.test.ts|src/__tests__/datastore-modelgen-android.test.ts|src/__tests__/datastore-modelgen-js.test.ts|src/__tests__/feature-flags.test.ts
111111
CLI_REGION: us-west-2
112112
depend-on:
113113
- publish_to_local_registry
114114
- identifier: >-
115-
l_add_codegen_android_remove_codegen_js_datastore_modelgen_ios_add_codegen_js
115+
l_graphql_codegen_ios_add_codegen_js_datastore_modelgen_ios_remove_codegen_js
116116
buildspec: .codebuild/run_e2e_tests.yml
117117
env:
118118
compute-type: BUILD_GENERAL1_LARGE
119119
variables:
120120
TEST_SUITE: >-
121-
src/__tests__/add-codegen-android.test.ts|src/__tests__/remove-codegen-js.test.ts|src/__tests__/datastore-modelgen-ios.test.ts|src/__tests__/add-codegen-js.test.ts
121+
src/__tests__/graphql-codegen-ios.test.ts|src/__tests__/add-codegen-js.test.ts|src/__tests__/datastore-modelgen-ios.test.ts|src/__tests__/remove-codegen-js.test.ts
122122
CLI_REGION: eu-west-2
123123
depend-on:
124124
- publish_to_local_registry
125125
- identifier: >-
126-
l_model_introspection_codegen_env_codegen_datastore_modelgen_flutter_push_codegen_ios
126+
l_datastore_modelgen_flutter_env_codegen_model_introspection_codegen_pull_codegen
127127
buildspec: .codebuild/run_e2e_tests.yml
128128
env:
129129
compute-type: BUILD_GENERAL1_LARGE
130130
variables:
131131
TEST_SUITE: >-
132-
src/__tests__/model-introspection-codegen.test.ts|src/__tests__/env-codegen.test.ts|src/__tests__/datastore-modelgen-flutter.test.ts|src/__tests__/push-codegen-ios.test.ts
132+
src/__tests__/datastore-modelgen-flutter.test.ts|src/__tests__/env-codegen.test.ts|src/__tests__/model-introspection-codegen.test.ts|src/__tests__/pull-codegen.test.ts
133133
CLI_REGION: eu-central-1
134134
depend-on:
135135
- publish_to_local_registry
136136
- identifier: >-
137-
l_pull_codegen_push_codegen_android_push_codegen_js_graphql_documents_generator
137+
l_push_codegen_ios_push_codegen_android_graphql_documents_generator_push_codegen_js
138138
buildspec: .codebuild/run_e2e_tests.yml
139139
env:
140140
compute-type: BUILD_GENERAL1_LARGE
141141
variables:
142142
TEST_SUITE: >-
143-
src/__tests__/pull-codegen.test.ts|src/__tests__/push-codegen-android.test.ts|src/__tests__/push-codegen-js.test.ts|src/__tests__/graphql-documents-generator.test.ts
143+
src/__tests__/push-codegen-ios.test.ts|src/__tests__/push-codegen-android.test.ts|src/__tests__/graphql-documents-generator.test.ts|src/__tests__/push-codegen-js.test.ts
144144
CLI_REGION: ap-northeast-1
145145
depend-on:
146146
- publish_to_local_registry
147147
- identifier: >-
148-
l_build_app_ts_uninitialized_project_modelgen_js_uninitialized_project_modelgen_ios_uninitialized_project_modelgen_flutter
148+
l_build_app_ts_uninitialized_project_codegen_js_uninitialized_project_modelgen_android_uninitialized_project_modelgen_flutter
149149
buildspec: .codebuild/run_e2e_tests.yml
150150
env:
151151
compute-type: BUILD_GENERAL1_LARGE
152152
variables:
153153
TEST_SUITE: >-
154-
src/__tests__/build-app-ts.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts|src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-flutter.test.ts
154+
src/__tests__/build-app-ts.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts|src/__tests__/uninitialized-project-modelgen-android.test.ts|src/__tests__/uninitialized-project-modelgen-flutter.test.ts
155155
CLI_REGION: ap-southeast-1
156156
DISABLE_ESLINT_PLUGIN: true
157157
depend-on:
158158
- publish_to_local_registry
159-
- identifier: >-
160-
l_uninitialized_project_modelgen_android_uninitialized_project_codegen_js
159+
- identifier: l_uninitialized_project_modelgen_ios_uninitialized_project_modelgen_js
161160
buildspec: .codebuild/run_e2e_tests.yml
162161
env:
163162
compute-type: BUILD_GENERAL1_LARGE
164163
variables:
165164
TEST_SUITE: >-
166-
src/__tests__/uninitialized-project-modelgen-android.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts
165+
src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts
167166
CLI_REGION: ap-southeast-2
168167
depend-on:
169168
- publish_to_local_registry
170169
- identifier: >-
171-
w_remove_codegen_ios_remove_codegen_android_graphql_codegen_js_graphql_codegen_android
170+
w_add_codegen_ios_configure_codegen_android_configure_codegen_js_graphql_codegen_android
172171
buildspec: .codebuild/run_e2e_tests_windows.yml
173172
env:
174173
compute-type: BUILD_GENERAL1_LARGE
175174
image: $WINDOWS_IMAGE_2019
176175
type: WINDOWS_SERVER_2019_CONTAINER
177176
variables:
178177
TEST_SUITE: >-
179-
src/__tests__/remove-codegen-ios.test.ts|src/__tests__/remove-codegen-android.test.ts|src/__tests__/graphql-codegen-js.test.ts|src/__tests__/graphql-codegen-android.test.ts
178+
src/__tests__/add-codegen-ios.test.ts|src/__tests__/configure-codegen-android.test.ts|src/__tests__/configure-codegen-js.test.ts|src/__tests__/graphql-codegen-android.test.ts
180179
CLI_REGION: us-east-1
181180
depend-on:
182181
- publish_to_local_registry
183182
- build_windows
184183
- identifier: >-
185-
w_configure_codegen_js_configure_codegen_android_add_codegen_ios_graphql_codegen_ios
184+
w_graphql_codegen_js_remove_codegen_android_remove_codegen_ios_add_codegen_android
186185
buildspec: .codebuild/run_e2e_tests_windows.yml
187186
env:
188187
compute-type: BUILD_GENERAL1_LARGE
189188
image: $WINDOWS_IMAGE_2019
190189
type: WINDOWS_SERVER_2019_CONTAINER
191190
variables:
192191
TEST_SUITE: >-
193-
src/__tests__/configure-codegen-js.test.ts|src/__tests__/configure-codegen-android.test.ts|src/__tests__/add-codegen-ios.test.ts|src/__tests__/graphql-codegen-ios.test.ts
192+
src/__tests__/graphql-codegen-js.test.ts|src/__tests__/remove-codegen-android.test.ts|src/__tests__/remove-codegen-ios.test.ts|src/__tests__/add-codegen-android.test.ts
194193
CLI_REGION: us-east-1
195194
depend-on:
196195
- publish_to_local_registry
197196
- build_windows
198197
- identifier: >-
199-
w_feature_flags_datastore_modelgen_js_datastore_modelgen_android_configure_codegen_ios
198+
w_configure_codegen_ios_datastore_modelgen_android_datastore_modelgen_js_feature_flags
200199
buildspec: .codebuild/run_e2e_tests_windows.yml
201200
env:
202201
compute-type: BUILD_GENERAL1_LARGE
203202
image: $WINDOWS_IMAGE_2019
204203
type: WINDOWS_SERVER_2019_CONTAINER
205204
variables:
206205
TEST_SUITE: >-
207-
src/__tests__/feature-flags.test.ts|src/__tests__/datastore-modelgen-js.test.ts|src/__tests__/datastore-modelgen-android.test.ts|src/__tests__/configure-codegen-ios.test.ts
206+
src/__tests__/configure-codegen-ios.test.ts|src/__tests__/datastore-modelgen-android.test.ts|src/__tests__/datastore-modelgen-js.test.ts|src/__tests__/feature-flags.test.ts
208207
CLI_REGION: us-east-1
209208
depend-on:
210209
- publish_to_local_registry
211210
- build_windows
212211
- identifier: >-
213-
w_add_codegen_android_remove_codegen_js_datastore_modelgen_ios_add_codegen_js
212+
w_graphql_codegen_ios_add_codegen_js_datastore_modelgen_ios_remove_codegen_js
214213
buildspec: .codebuild/run_e2e_tests_windows.yml
215214
env:
216215
compute-type: BUILD_GENERAL1_LARGE
217216
image: $WINDOWS_IMAGE_2019
218217
type: WINDOWS_SERVER_2019_CONTAINER
219218
variables:
220219
TEST_SUITE: >-
221-
src/__tests__/add-codegen-android.test.ts|src/__tests__/remove-codegen-js.test.ts|src/__tests__/datastore-modelgen-ios.test.ts|src/__tests__/add-codegen-js.test.ts
220+
src/__tests__/graphql-codegen-ios.test.ts|src/__tests__/add-codegen-js.test.ts|src/__tests__/datastore-modelgen-ios.test.ts|src/__tests__/remove-codegen-js.test.ts
222221
CLI_REGION: us-east-1
223222
depend-on:
224223
- publish_to_local_registry
225224
- build_windows
226225
- identifier: >-
227-
w_model_introspection_codegen_env_codegen_datastore_modelgen_flutter_push_codegen_ios
226+
w_datastore_modelgen_flutter_env_codegen_model_introspection_codegen_pull_codegen
228227
buildspec: .codebuild/run_e2e_tests_windows.yml
229228
env:
230229
compute-type: BUILD_GENERAL1_LARGE
231230
image: $WINDOWS_IMAGE_2019
232231
type: WINDOWS_SERVER_2019_CONTAINER
233232
variables:
234233
TEST_SUITE: >-
235-
src/__tests__/model-introspection-codegen.test.ts|src/__tests__/env-codegen.test.ts|src/__tests__/datastore-modelgen-flutter.test.ts|src/__tests__/push-codegen-ios.test.ts
234+
src/__tests__/datastore-modelgen-flutter.test.ts|src/__tests__/env-codegen.test.ts|src/__tests__/model-introspection-codegen.test.ts|src/__tests__/pull-codegen.test.ts
236235
CLI_REGION: us-east-1
237236
depend-on:
238237
- publish_to_local_registry
239238
- build_windows
240239
- identifier: >-
241-
w_pull_codegen_push_codegen_android_push_codegen_js_graphql_documents_generator
240+
w_push_codegen_ios_push_codegen_android_graphql_documents_generator_push_codegen_js
242241
buildspec: .codebuild/run_e2e_tests_windows.yml
243242
env:
244243
compute-type: BUILD_GENERAL1_LARGE
245244
image: $WINDOWS_IMAGE_2019
246245
type: WINDOWS_SERVER_2019_CONTAINER
247246
variables:
248247
TEST_SUITE: >-
249-
src/__tests__/pull-codegen.test.ts|src/__tests__/push-codegen-android.test.ts|src/__tests__/push-codegen-js.test.ts|src/__tests__/graphql-documents-generator.test.ts
248+
src/__tests__/push-codegen-ios.test.ts|src/__tests__/push-codegen-android.test.ts|src/__tests__/graphql-documents-generator.test.ts|src/__tests__/push-codegen-js.test.ts
250249
CLI_REGION: us-east-1
251250
depend-on:
252251
- publish_to_local_registry
253252
- build_windows
254253
- identifier: >-
255-
w_build_app_ts_uninitialized_project_modelgen_js_uninitialized_project_modelgen_ios_uninitialized_project_modelgen_flutter
254+
w_build_app_ts_uninitialized_project_codegen_js_uninitialized_project_modelgen_android_uninitialized_project_modelgen_flutter
256255
buildspec: .codebuild/run_e2e_tests_windows.yml
257256
env:
258257
compute-type: BUILD_GENERAL1_LARGE
259258
image: $WINDOWS_IMAGE_2019
260259
type: WINDOWS_SERVER_2019_CONTAINER
261260
variables:
262261
TEST_SUITE: >-
263-
src/__tests__/build-app-ts.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts|src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-flutter.test.ts
262+
src/__tests__/build-app-ts.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts|src/__tests__/uninitialized-project-modelgen-android.test.ts|src/__tests__/uninitialized-project-modelgen-flutter.test.ts
264263
CLI_REGION: us-east-1
265264
DISABLE_ESLINT_PLUGIN: true
266265
depend-on:
267266
- publish_to_local_registry
268267
- build_windows
269-
- identifier: >-
270-
w_uninitialized_project_modelgen_android_uninitialized_project_codegen_js
268+
- identifier: w_uninitialized_project_modelgen_ios_uninitialized_project_modelgen_js
271269
buildspec: .codebuild/run_e2e_tests_windows.yml
272270
env:
273271
compute-type: BUILD_GENERAL1_LARGE
274272
image: $WINDOWS_IMAGE_2019
275273
type: WINDOWS_SERVER_2019_CONTAINER
276274
variables:
277275
TEST_SUITE: >-
278-
src/__tests__/uninitialized-project-modelgen-android.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts
276+
src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts
279277
CLI_REGION: us-east-1
280278
depend-on:
281279
- publish_to_local_registry
@@ -286,4 +284,4 @@ batch:
286284
compute-type: BUILD_GENERAL1_MEDIUM
287285
depend-on:
288286
- >-
289-
l_remove_codegen_ios_remove_codegen_android_graphql_codegen_js_graphql_codegen_android
287+
l_add_codegen_ios_configure_codegen_android_configure_codegen_js_graphql_codegen_android

‎package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
"@microsoft/api-extractor": "^7.33.5",
8080
"@types/cli-progress": "3.11.0",
8181
"@types/fs-extra": "^8.0.1",
82-
"@types/glob": "^7.2.0",
8382
"@types/jest": "^27.0.0",
8483
"@types/js-yaml": "^4.0.0",
8584
"@typescript-eslint/eslint-plugin": "^4.0.0",
@@ -104,7 +103,7 @@
104103
"eslint-plugin-react": "^7.21.5",
105104
"eslint-plugin-spellcheck": "^0.0.17",
106105
"execa": "^5.1.1",
107-
"glob": "^9.3.5",
106+
"globby": "^11.1.0",
108107
"graphql-transformer-core": "^8.0.0",
109108
"husky": "^3.0.3",
110109
"jest": "^27.0.0",
@@ -129,8 +128,7 @@
129128
"glob-parent": "^6.0.2",
130129
"parse-url": "^8.1.0",
131130
"graphql": "15.8.0",
132-
"xml2js": "0.5.0",
133-
"glob": "^9.3.5"
131+
"xml2js": "0.5.0"
134132
},
135133
"config": {
136134
"commitizen": {

‎scripts/split-e2e-tests.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as glob from 'glob';
1+
import { sync } from 'globby';
22
import * as fs from 'fs-extra';
33
import { join } from 'path';
44
import * as yaml from 'js-yaml';
@@ -41,7 +41,7 @@ export function loadTestTimings(): { timingData: { test: string; medianRuntime:
4141
return JSON.parse(fs.readFileSync(TEST_TIMINGS_PATH, 'utf-8'));
4242
}
4343
function getTestFiles(dir: string, pattern = 'src/**/*.test.ts'): string[] {
44-
return glob.globSync(pattern, { cwd: dir });
44+
return sync(pattern, { cwd: dir });
4545
}
4646
type COMPUTE_TYPE = 'BUILD_GENERAL1_MEDIUM' | 'BUILD_GENERAL1_LARGE';
4747
type BatchBuildJob = {

0 commit comments

Comments
 (0)