Skip to content

Commit 87082b6

Browse files
committed
Merge master and update Node.js to 24.13.0
2 parents b1d719d + 72039bc commit 87082b6

File tree

91 files changed

+10458
-29534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+10458
-29534
lines changed

.bitmap

Lines changed: 247 additions & 247 deletions
Large diffs are not rendered by default.

.circleci/config.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: 2.1
77
# Base configurations
88
default_image: &default_image
99
docker:
10-
- image: cimg/node:24.6.0
10+
- image: cimg/node:24.13.0
1111

1212
default_resource_class: &default_resource_class
1313
resource_class: medium
@@ -244,13 +244,13 @@ commands:
244244
windows_set_node_version:
245245
parameters:
246246
version:
247-
default: 24.6.0
247+
default: 24.13.0
248248
type: string
249249
steps:
250250
- run: choco upgrade nvm -y
251251
- run: nvm -v
252-
- run: nvm install 24.6.0
253-
- run: nvm use 24.6.0
252+
- run: nvm install 24.13.0
253+
- run: nvm use 24.13.0
254254
- run: node -v
255255

256256
windows_add_bvm_to_path:
@@ -290,7 +290,7 @@ commands:
290290
default: 'BASE_IMAGE'
291291
type: string
292292
docker_build_base_image_arg_value:
293-
default: 'node:24.6.0'
293+
default: 'node:24.13.0'
294294
type: string
295295
image_name:
296296
default: 'bitcli/bit'
@@ -323,7 +323,7 @@ commands:
323323
default: 'BASE_IMAGE'
324324
type: string
325325
docker_build_base_image_arg_value:
326-
default: 'node:24.6.0'
326+
default: 'node:24.13.0'
327327
type: string
328328
image_name:
329329
default: 'bitcli/bit'
@@ -368,7 +368,7 @@ commands:
368368
- restore_cache:
369369
key: bitsrc-registry10
370370
- restore_cache:
371-
key: core-aspect-env-v0.0.80-v1
371+
key: core-aspect-env-v0.1.4-v1
372372
- run: npm view @teambit/bit version > ./version.txt
373373
- restore_cache:
374374
key: v3-linux-bvm-folder-{{ checksum "version.txt" }}
@@ -451,7 +451,7 @@ commands:
451451
- restore_cache:
452452
key: bitsrc-registry10
453453
- restore_cache:
454-
key: core-aspect-env-v0.0.80-v1
454+
key: core-aspect-env-v0.1.4-v1
455455
- run: npm view @teambit/bit version > ./version.txt
456456
- restore_cache:
457457
key: v3-linux-bvm-folder-{{ checksum "version.txt" }}
@@ -557,7 +557,7 @@ jobs:
557557
name: bbit install
558558
command: cd bit && bbit install
559559
- save_cache:
560-
key: core-aspect-env-v0.0.80-v1
560+
key: core-aspect-env-v0.1.4-v1
561561
paths:
562562
- /home/circleci/Library/Caches/Bit/capsules/caec9a107
563563
# - run: cd bit && bbit compile
@@ -612,7 +612,7 @@ jobs:
612612
- restore_cache:
613613
key: bitsrc-registry10
614614
- restore_cache:
615-
key: core-aspect-env-v0.0.80-v1
615+
key: core-aspect-env-v0.1.4-v1
616616
- run:
617617
name: 'check circular dependencies'
618618
command: 'cd bit && ./scripts/circular-deps-check/ci-check.sh'
@@ -975,8 +975,8 @@ jobs:
975975
- attach_workspace:
976976
at: ./
977977
- docker_build_and_push:
978-
docker_build_base_image_arg_value: "node:24.6.0"
979-
docker_tag_suffix: "-node-24.6.0"
978+
docker_build_base_image_arg_value: "node:24.13.0"
979+
docker_tag_suffix: "-node-24.13.0"
980980

981981
docker_non_root_build_node_24:
982982
machine:
@@ -985,10 +985,10 @@ jobs:
985985
- attach_workspace:
986986
at: ./
987987
- docker_build_and_push:
988-
docker_build_base_image_arg_value: "node:24.6.0"
988+
docker_build_base_image_arg_value: "node:24.13.0"
989989
image_name: "bitcli/bit-non-root"
990990
docker_file_name: "Dockerfile-bit-non-root"
991-
docker_tag_suffix: "-node-24.6.0"
991+
docker_tag_suffix: "-node-24.13.0"
992992

993993
docker_build_alpine:
994994
machine:
@@ -997,10 +997,10 @@ jobs:
997997
- attach_workspace:
998998
at: ./
999999
- docker_build_and_push:
1000-
docker_build_base_image_arg_value: "node:24.6.0-alpine"
1000+
docker_build_base_image_arg_value: "node:24.13.0-alpine"
10011001
# image_name: "bitcli/bit-alpine"
10021002
docker_file_name: "Dockerfile-bit-alpine"
1003-
docker_tag_suffix: "-alpine-node-24.6.0"
1003+
docker_tag_suffix: "-alpine-node-24.13.0"
10041004

10051005
server_docker_build_node_24:
10061006
machine:
@@ -1009,10 +1009,10 @@ jobs:
10091009
- attach_workspace:
10101010
at: ./
10111011
- docker_build_and_push:
1012-
docker_build_base_image_arg_value: "`npm show @teambit/bit version`-node-24.6.0"
1012+
docker_build_base_image_arg_value: "`npm show @teambit/bit version`-node-24.13.0"
10131013
image_name: "bitcli/bit-server"
10141014
docker_file_name: "Dockerfile-bit-server"
1015-
docker_tag_suffix: "-node-24.6.0"
1015+
docker_tag_suffix: "-node-24.13.0"
10161016

10171017
# ========== Windows Jobs ==========
10181018
windows_checkout_code:
@@ -1159,9 +1159,9 @@ jobs:
11591159
# - run: node -v
11601160
# - run: npm -v
11611161
# - run: yarn -v
1162-
# # - run: choco install nodejs --version 24.6.0
1162+
# # - run: choco install nodejs --version 24.13.0
11631163
# # - run: node -v
1164-
# - run: cinst nodejs --version 24.6.0
1164+
# - run: cinst nodejs --version 24.13.0
11651165
# - run: node -v
11661166

11671167
# ========================================

components/legacy/e2e-helper/excluded-fixtures/workspace-with-tsconfig-issue/workspace.jsonc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"packageManager": "teambit.dependencies/pnpm",
4040
"policy": {
4141
"dependencies": {
42-
"@teambit/mdx.ui.mdx-scope-context": "1.0.0",
43-
"@teambit/react.react-env": "1.0.77",
44-
"@teambit/typescript.typescript-compiler": "2.0.38"
42+
"@teambit/mdx.ui.mdx-scope-context": "1.0.7",
43+
"@teambit/react.react-env": "1.2.0",
44+
"@teambit/typescript.typescript-compiler": "2.0.64"
4545
},
4646
"peerDependencies": {}
4747
},

components/legacy/scope-api/lib/action.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
FetchMissingDeps,
99
PostSign,
1010
FetchMissingHistory,
11+
FetchVersionHistory,
1112
} from '@teambit/scope.remote-actions';
1213
import type { AuthData } from '@teambit/scope.network';
1314

@@ -36,6 +37,7 @@ export async function action(
3637
FetchMissingDeps,
3738
PostSign,
3839
FetchMissingHistory,
40+
FetchVersionHistory,
3941
];
4042
const ActionClass = actionList.find((a) => a.name === name);
4143
if (!ActionClass) {

components/legacy/scope/component-ops/scope-components-importer.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import type {
2121
BitObjectList,
2222
ObjectItemsStream,
2323
Repository,
24+
LaneHistory,
2425
} from '@teambit/objects';
2526
import { ObjectList, Ref } from '@teambit/objects';
2627
import type { ComponentDef } from '../repositories/sources';
@@ -505,7 +506,17 @@ export class ScopeComponentsImporter {
505506
await Promise.all(lanes.map((lane) => this.repo.remoteLanes.syncWithLaneObject(lane.scope as string, lane)));
506507
if (includeLaneHistory) {
507508
const laneHistories = bitObjects.getLaneHistories();
508-
await this.scope.objects.writeObjectsToTheFS(laneHistories);
509+
await Promise.all(
510+
laneHistories.map(async (laneHistory) => {
511+
const existingLaneHistory = (await this.repo.load(laneHistory.hash())) as LaneHistory | undefined;
512+
if (existingLaneHistory) {
513+
existingLaneHistory.merge(laneHistory);
514+
await this.scope.objects.writeObjectsToTheFS([existingLaneHistory]);
515+
} else {
516+
await this.scope.objects.writeObjectsToTheFS([laneHistory]);
517+
}
518+
})
519+
);
509520
}
510521
return lanes;
511522
}

components/scope/remotes/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ export { getRemoteByName } from './get-remote-by-name';
44
export { getScopeRemotes, fetchRemoteVersions } from './scope-remotes';
55
export { ScopeNotFoundOrDenied } from './exceptions';
66
export { GlobalRemotes } from './global-remotes';
7+
export { listScopesByOwner } from './remote-resolver/remote-resolver';

components/scope/remotes/remote-resolver/remote-resolver.ts

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,46 @@ async function getScope(name: string) {
7272
}
7373
}
7474

75+
const LIST_SCOPES = gql`
76+
query listScopes($owners: [String!]!, $limit: Int!, $offset: Int!) {
77+
listScopes(filters: { owners: $owners }, limit: $limit, offset: $offset) {
78+
id
79+
}
80+
}
81+
`;
82+
83+
/**
84+
* List all scopes owned by a specific owner from the central Bit Cloud hub.
85+
*/
86+
export async function listScopesByOwner(owner: string): Promise<string[]> {
87+
const token = getConfig(CFG_USER_TOKEN_KEY);
88+
const headers = token ? getAuthHeader(token) : {};
89+
const graphQlUrl = `${symphonyUrl}/graphql`;
90+
const graphQlFetcher = await getFetcherWithAgent(graphQlUrl);
91+
const client = new GraphQLClient(graphQlUrl, { headers, fetch: graphQlFetcher });
92+
93+
const limit = 100;
94+
let offset = 0;
95+
const allScopes: string[] = [];
96+
let hasMore = true;
97+
98+
while (hasMore) {
99+
const res = (await client.request(LIST_SCOPES, {
100+
owners: [owner],
101+
limit,
102+
offset,
103+
})) as { listScopes?: Array<{ id: string }> };
104+
105+
const scopes = res.listScopes?.map((s) => s.id) || [];
106+
allScopes.push(...scopes);
107+
108+
hasMore = scopes.length >= limit;
109+
offset += limit;
110+
}
111+
112+
return allScopes;
113+
}
114+
75115
const hubResolver = async (scopeName) => {
76116
// check if has harmony
77117
const scope = await getScope(scopeName);

0 commit comments

Comments
 (0)