From 4fcf4907ba2a28eaebd0ef39c550d029f3fda95b Mon Sep 17 00:00:00 2001 From: Gilad Shoham Date: Tue, 21 May 2024 16:01:59 +0300 Subject: [PATCH 1/9] infra(node) - upgrade to node v22 --- .circleci/config.yml | 78 +++++++++++++------ scripts/docker-teambit-bit/Dockerfile-bit | 2 +- .../Dockerfile-bit-non-root | 2 +- workspace.jsonc | 4 +- 4 files changed, 57 insertions(+), 29 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d8c6ab465d2..bef1c90cad6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 default_image: &default_image docker: - - image: cimg/node:20.11.1 + - image: cimg/node:22.2.0 default_resource_class: &default_resource_class resource_class: medium @@ -87,7 +87,7 @@ commands: # reusable commands default: 'BASE_IMAGE' type: string docker_build_arg_value: - default: 'node:20.11.1' + default: 'node:22.2.0' type: string image_name: default: 'bitcli/bit' @@ -116,7 +116,7 @@ commands: # reusable commands default: 'BASE_IMAGE' type: string docker_build_arg_value: - default: 'node:20.11.1' + default: 'node:22.2.0' type: string image_name: default: 'bitcli/bit' @@ -198,13 +198,13 @@ commands: # reusable commands windows_set_node_version: parameters: version: - default: 20.11.1 + default: 22.2.0 type: string steps: - run: choco upgrade nvm -y - run: nvm -v - - run: nvm install 20.11.1 - - run: nvm use 20.11.1 + - run: nvm install 22.2.0 + - run: nvm use 22.2.0 - run: node -v windows_add_bvm_to_path: steps: @@ -272,8 +272,18 @@ jobs: - attach_workspace: at: ./ - docker_build_and_push: - docker_build_arg_value: "node:20.11.1" - docker_tag_suffix: "-node-20.11.1" + docker_build_arg_value: "node:20.13.1" + docker_tag_suffix: "-node-20.13.1" + + docker_build_node_22: + machine: + image: ubuntu-2004:202111-02 + steps: + - attach_workspace: + at: ./ + - docker_build_and_push: + docker_build_arg_value: "node:22.2.0" + docker_tag_suffix: "-node-22.2.0" # docker_non_root_build: # machine: @@ -285,19 +295,20 @@ jobs: # image_name: "bitcli/bit-non-root" # docker_file_name: "Dockerfile-bit-non-root" - docker_non_root_build_node_20: + docker_non_root_build_node_22: machine: image: ubuntu-2004:202111-02 steps: - attach_workspace: at: ./ - docker_build_and_push: - docker_build_arg_value: "node:20.11.1" + docker_build_arg_value: "node:22.2.0" image_name: "bitcli/bit-non-root" docker_file_name: "Dockerfile-bit-non-root" - docker_tag_suffix: "-node-20.11.1" + docker_tag_suffix: "-node-22.2.0" + - server_docker_build_node_20: + server_docker_build_node_22: machine: image: ubuntu-2004:202111-02 steps: @@ -305,11 +316,10 @@ jobs: at: ./ - docker_build_and_push: docker_build_arg_name: "BIT_IMAGE" - docker_build_arg_value: "`npm show @teambit/bit version`-node-20.11.1" + docker_build_arg_value: "`npm show @teambit/bit version`-node-22.2.0" image_name: "bitcli/bit-server" docker_file_name: "Dockerfile-bit-server" - docker_tag_suffix: "-node-20.11.1" - + docker_tag_suffix: "-node-22.2.0" set_ssh_key: <<: *defaults working_directory: ~/.ssh @@ -923,9 +933,9 @@ jobs: # - run: node -v # - run: npm -v # - run: yarn -v - # # - run: choco install nodejs --version 20.11.1 + # # - run: choco install nodejs --version 22.2.0 # # - run: node -v - # - run: cinst nodejs --version 20.11.1 + # - run: cinst nodejs --version 22.2.0 # - run: node -v windows_checkout_code: @@ -1364,15 +1374,21 @@ workflows: # - server_docker_build_node_18: # requires: # - docker_build_node_18 - - docker_build_node_20: + # - docker_build_node_20: + # requires: + # - harmony_publish_to_gcloud + - docker_build_node_22: requires: - harmony_publish_to_gcloud - - docker_non_root_build_node_20: + - docker_non_root_build_node_22: requires: - harmony_publish_to_gcloud - - server_docker_build_node_20: + # - server_docker_build_node_20: + # requires: + # - docker_build_node_20 + - server_docker_build_node_22: requires: - - docker_build_node_20 + - docker_build_node_22 windows-nightly: triggers: @@ -1513,18 +1529,30 @@ workflows: # requires: # - harmony_deploy_approval_job # - docker_build_node_18 - - docker_build_node_20: + # - docker_build_node_20: + # requires: + # - harmony_deploy_approval_job + # - harmony_publish_to_gcloud + # - docker_non_root_build_node_20: + # requires: + # - harmony_deploy_approval_job + # - harmony_publish_to_gcloud + # - server_docker_build_node_20: + # requires: + # - harmony_deploy_approval_job + # - docker_build_node_20 + - docker_build_node_22: requires: - harmony_deploy_approval_job - harmony_publish_to_gcloud - - docker_non_root_build_node_20: + - docker_non_root_build_node_22: requires: - harmony_deploy_approval_job - harmony_publish_to_gcloud - - server_docker_build_node_20: + - server_docker_build_node_22: requires: - harmony_deploy_approval_job - - docker_build_node_20 + - docker_build_node_22 # uncomment to update esbuild arm64 cache # get_arm64_workflow_packages: diff --git a/scripts/docker-teambit-bit/Dockerfile-bit b/scripts/docker-teambit-bit/Dockerfile-bit index a2d3aba2137f..57613f690726 100644 --- a/scripts/docker-teambit-bit/Dockerfile-bit +++ b/scripts/docker-teambit-bit/Dockerfile-bit @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=node:20.11.1 +ARG BASE_IMAGE=node:22.2.0 FROM $BASE_IMAGE USER root diff --git a/scripts/docker-teambit-bit/Dockerfile-bit-non-root b/scripts/docker-teambit-bit/Dockerfile-bit-non-root index f9b398a7650a..325d5ebfdd1c 100644 --- a/scripts/docker-teambit-bit/Dockerfile-bit-non-root +++ b/scripts/docker-teambit-bit/Dockerfile-bit-non-root @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=node:20.11.1 +ARG BASE_IMAGE=node:22.2.0 FROM $BASE_IMAGE RUN adduser --disabled-password --gecos '' user RUN chown -R user /usr/local/ diff --git a/workspace.jsonc b/workspace.jsonc index 2c0a475685bf..40692dcf9838 100644 --- a/workspace.jsonc +++ b/workspace.jsonc @@ -524,7 +524,7 @@ "minio@7.0": "7.1.1" }, "rootComponents": true, - "nodeVersion": "20.11.1", + "nodeVersion": "22.2.0", "engineStrict": true, // This is a temporary workaround to fix "bit compile" on macOS and Windows. // "bit compile" breaks node_modules when hard links are used. @@ -608,7 +608,7 @@ "packageJson": { "name": "@teambit/{name}", // @teambit/discovery.ui.sidebar "bvm": { - "node": "20.11.1" + "node": "22.2.0" }, "bin": { "bbit": "bin/bit" From c6326d683818c35bfe93956528dd2fe27aaff900 Mon Sep 17 00:00:00 2001 From: Gilad Shoham Date: Tue, 21 May 2024 16:36:16 +0300 Subject: [PATCH 2/9] fixes --- src/bootstrap.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap.ts b/src/bootstrap.ts index 278db69c4ab5..949b9ef1b565 100644 --- a/src/bootstrap.ts +++ b/src/bootstrap.ts @@ -11,8 +11,8 @@ import HooksManager from './hooks'; import { printWarning, shouldDisableConsole, shouldDisableLoader } from './logger/logger'; import loader from './cli/loader'; -const RECOMMENDED_NODE_VERSIONS = '>=18.12.0 <21.0.0'; -const SUPPORTED_NODE_VERSIONS = '>=16.0.0 <21.0.0'; +const RECOMMENDED_NODE_VERSIONS = '>=18.12.0 <230.0'; +const SUPPORTED_NODE_VERSIONS = '>=16.0.0 <23.0.0'; process.env.MEMFS_DONT_WARN = 'true'; // suppress fs experimental warnings from memfs From 06fc9ab4097238ea04460dabb591220745aaf970 Mon Sep 17 00:00:00 2001 From: Gilad Shoham Date: Wed, 22 May 2024 13:47:54 +0300 Subject: [PATCH 3/9] fix recommend version number --- src/bootstrap.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap.ts b/src/bootstrap.ts index 949b9ef1b565..68aad358fac5 100644 --- a/src/bootstrap.ts +++ b/src/bootstrap.ts @@ -11,7 +11,7 @@ import HooksManager from './hooks'; import { printWarning, shouldDisableConsole, shouldDisableLoader } from './logger/logger'; import loader from './cli/loader'; -const RECOMMENDED_NODE_VERSIONS = '>=18.12.0 <230.0'; +const RECOMMENDED_NODE_VERSIONS = '>=18.12.0 <23.0.0'; const SUPPORTED_NODE_VERSIONS = '>=16.0.0 <23.0.0'; process.env.MEMFS_DONT_WARN = 'true'; // suppress fs experimental warnings from memfs From ff8585d1a38cd2877f8fe8a4100f7137ce6462da Mon Sep 17 00:00:00 2001 From: Gilad Shoham Date: Wed, 22 May 2024 14:18:17 +0300 Subject: [PATCH 4/9] add overrides - "uri-js": "npm:uri-js-replace" --- workspace.jsonc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/workspace.jsonc b/workspace.jsonc index bb5382be7dd4..657336e61fd1 100644 --- a/workspace.jsonc +++ b/workspace.jsonc @@ -521,7 +521,11 @@ "signal-exit@4": "^4.0.2", "@types/react": "^17.0.67", "@types/react-dom": "^17.0.21", - "minio@7.0": "7.1.1" + "minio@7.0": "7.1.1", + // See more info here - + // https://github.com/garycourt/uri-js/pull/95 + // https://github.com/garycourt/uri-js/issues/97 + "uri-js": "npm:uri-js-replace" }, "rootComponents": true, "nodeVersion": "22.2.0", From 4174752f7e0751aab8444ac2c183a58beac53f6b Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 22 May 2024 14:12:16 +0200 Subject: [PATCH 5/9] fix: override uri-js for bvm --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60b04087eb1d..bff502a8e5b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -230,7 +230,7 @@ commands: # reusable commands name: Install pnpm command: > npm config set prefix '~/.npm-global' && - npm install --global pnpm@8.10.4 && + npm install --global pnpm@9.1.2 && echo 'export PATH=~/.npm-global/bin:$PATH' >> $BASH_ENV compress_bit: @@ -677,6 +677,7 @@ jobs: echo "registry=https://node-registry.bit.cloud" >> .npmrc && pnpm dlx @ialdama/jsonmod --key pnpm.supportedArchitectures.os --values linux --values linux && pnpm dlx @ialdama/jsonmod --key pnpm.supportedArchitectures.cpu --values x64 --values x64 && + pnpm dlx @ialdama/jsonmod --key pnpm.overrides.uri-js --values npm:uri-js-replace && pnpm add @teambit/bit - compress_bit - run: @@ -723,6 +724,7 @@ jobs: echo "registry=https://node-registry.bit.cloud" >> .npmrc && pnpm dlx @ialdama/jsonmod --key pnpm.supportedArchitectures.os --values darwin --values darwin && pnpm dlx @ialdama/jsonmod --key pnpm.supportedArchitectures.cpu --values x64 --values x64 && + pnpm dlx @ialdama/jsonmod --key pnpm.overrides.uri-js --values npm:uri-js-replace && pnpm add @teambit/bit - compress_bit - run: @@ -771,6 +773,7 @@ jobs: pnpm dlx @ialdama/jsonmod --key pnpm.supportedArchitectures.os --values win32 --values win32 && pnpm dlx @ialdama/jsonmod --key pnpm.supportedArchitectures.cpu --values x64 --values x64 && pnpm dlx @ialdama/jsonmod --key pnpm.neverBuiltDependencies --values cpu-features --values ssh2 && + pnpm dlx @ialdama/jsonmod --key pnpm.overrides.uri-js --values npm:uri-js-replace && pnpm add @teambit/bit - compress_bit - run: From 65ca0e6a7396576527a10bc9f9e978cfaf461973 Mon Sep 17 00:00:00 2001 From: Gilad Shoham Date: Mon, 25 Nov 2024 22:34:22 +0200 Subject: [PATCH 6/9] bump node to 22.11.0 --- .circleci/config.yml | 28 +++++++++---------- scripts/docker-teambit-bit/Dockerfile-bit | 2 +- .../Dockerfile-bit-non-root | 2 +- workspace.jsonc | 4 +-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3fcee4482ade..11e0bf0da523 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 default_image: &default_image docker: - - image: cimg/node:22.2.0 + - image: cimg/node:22.11.0 default_resource_class: &default_resource_class resource_class: medium @@ -87,7 +87,7 @@ commands: # reusable commands default: 'BASE_IMAGE' type: string docker_build_arg_value: - default: 'node:22.2.0' + default: 'node:22.11.0' type: string image_name: default: 'bitcli/bit' @@ -116,7 +116,7 @@ commands: # reusable commands default: 'BASE_IMAGE' type: string docker_build_arg_value: - default: 'node:22.2.0' + default: 'node:22.11.0' type: string image_name: default: 'bitcli/bit' @@ -198,13 +198,13 @@ commands: # reusable commands windows_set_node_version: parameters: version: - default: 22.2.0 + default: 22.11.0 type: string steps: - run: choco upgrade nvm -y - run: nvm -v - - run: nvm install 22.2.0 - - run: nvm use 22.2.0 + - run: nvm install 22.11.0 + - run: nvm use 22.11.0 - run: node -v windows_add_bvm_to_path: steps: @@ -282,8 +282,8 @@ jobs: - attach_workspace: at: ./ - docker_build_and_push: - docker_build_arg_value: "node:22.2.0" - docker_tag_suffix: "-node-22.2.0" + docker_build_arg_value: "node:22.11.0" + docker_tag_suffix: "-node-22.11.0" # docker_non_root_build: # machine: @@ -302,10 +302,10 @@ jobs: - attach_workspace: at: ./ - docker_build_and_push: - docker_build_arg_value: "node:22.2.0" + docker_build_arg_value: "node:22.11.0" image_name: "bitcli/bit-non-root" docker_file_name: "Dockerfile-bit-non-root" - docker_tag_suffix: "-node-22.2.0" + docker_tag_suffix: "-node-22.11.0" server_docker_build_node_22: @@ -316,10 +316,10 @@ jobs: at: ./ - docker_build_and_push: docker_build_arg_name: "BIT_IMAGE" - docker_build_arg_value: "`npm show @teambit/bit version`-node-22.2.0" + docker_build_arg_value: "`npm show @teambit/bit version`-node-22.11.0" image_name: "bitcli/bit-server" docker_file_name: "Dockerfile-bit-server" - docker_tag_suffix: "-node-22.2.0" + docker_tag_suffix: "-node-22.11.0" set_ssh_key: <<: *defaults working_directory: ~/.ssh @@ -936,9 +936,9 @@ jobs: # - run: node -v # - run: npm -v # - run: yarn -v - # # - run: choco install nodejs --version 22.2.0 + # # - run: choco install nodejs --version 22.11.0 # # - run: node -v - # - run: cinst nodejs --version 22.2.0 + # - run: cinst nodejs --version 22.11.0 # - run: node -v windows_checkout_code: diff --git a/scripts/docker-teambit-bit/Dockerfile-bit b/scripts/docker-teambit-bit/Dockerfile-bit index 57613f690726..88660c7d2b01 100644 --- a/scripts/docker-teambit-bit/Dockerfile-bit +++ b/scripts/docker-teambit-bit/Dockerfile-bit @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=node:22.2.0 +ARG BASE_IMAGE=node:22.11.0 FROM $BASE_IMAGE USER root diff --git a/scripts/docker-teambit-bit/Dockerfile-bit-non-root b/scripts/docker-teambit-bit/Dockerfile-bit-non-root index 325d5ebfdd1c..9fd2708ec8e4 100644 --- a/scripts/docker-teambit-bit/Dockerfile-bit-non-root +++ b/scripts/docker-teambit-bit/Dockerfile-bit-non-root @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=node:22.2.0 +ARG BASE_IMAGE=node:22.11.0 FROM $BASE_IMAGE RUN adduser --disabled-password --gecos '' user RUN chown -R user /usr/local/ diff --git a/workspace.jsonc b/workspace.jsonc index c39a0ca390a3..1234937368da 100644 --- a/workspace.jsonc +++ b/workspace.jsonc @@ -535,7 +535,7 @@ "uri-js": "npm:uri-js-replace" }, "rootComponents": true, - "nodeVersion": "22.2.0", + "nodeVersion": "22.11.0", "engineStrict": true, // This is a temporary workaround to fix "bit compile" on macOS and Windows. // "bit compile" breaks node_modules when hard links are used. @@ -620,7 +620,7 @@ "packageJson": { "name": "@teambit/{name}", // @teambit/discovery.ui.sidebar "bvm": { - "node": "22.2.0" + "node": "22.11.0" }, "bin": { "bbit": "bin/bit" From 46dc66c5be51be432008f27916ef8b20b634f7da Mon Sep 17 00:00:00 2001 From: Gilad Shoham Date: Tue, 26 Nov 2024 10:46:26 +0200 Subject: [PATCH 7/9] suppress punycode deprecation warning --- scopes/harmony/bit/bootstrap.ts | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/scopes/harmony/bit/bootstrap.ts b/scopes/harmony/bit/bootstrap.ts index cd6136f595fe..f58447b6f4ed 100644 --- a/scopes/harmony/bit/bootstrap.ts +++ b/scopes/harmony/bit/bootstrap.ts @@ -21,6 +21,39 @@ require('regenerator-runtime/runtime'); // eslint-disable-next-line @typescript-eslint/no-misused-promises process.on('unhandledRejection', async (err: any) => handleUnhandledRejection(err)); +const originalEmit = process.emit; +// @ts-expect-error - TS complains about the return type of originalEmit.apply +process.emit = function (name, data) { + // -------------------------------------------- + // this fix is based on yarn fix for the similar issue, see code here: + // https://github.com/yarnpkg/berry/blob/2cf0a8fe3e4d4bd7d4d344245d24a85a45d4c5c9/packages/yarnpkg-pnp/sources/loader/applyPatch.ts#L414-L435 + // ignore punycode deprecation warning + // ignoring this warning for now, as the main issue is that + // this package https://www.npmjs.com/package/uri-js?activeTab=readme is using it and it's deprecated + // the package have the correct punycode version as a dependency from the user land + // but it uses it incorrectly, it should use it with a trailing slash + // the require in their code is require('punycode') and not require('punycode/') (with trailing slash) + // As this package is not maintained anymore, we can't fix it from our side + // see more at: + // https://github.com/garycourt/uri-js/issues/97 + // https://github.com/garycourt/uri-js/pull/95 + // on the bit repo we overriding the uri-js package with a fixed version (see overrides in workspace.jsonc) + // "uri-js": "npm:uri-js-replace" + // but we don't want to override it automatically for all the users + // there are many other packages (like webpack, eslint, etc) that are using this uri-js package + // so if we won't ignore it, all users will get this warning + if ( + name === `warning` && + typeof data === `object` && + ((data.name === `DeprecationWarning` && data.message.includes(`punycode`)) || data.code === `DEP0040`) + ) + return false; + // -------------------------------------------- + + // eslint-disable-next-line prefer-rest-params + return originalEmit.apply(process, arguments as unknown as Parameters); +}; + // by default Bluebird enables the longStackTraces when env is `development`, or when // BLUEBIRD_DEBUG is set. // the drawback of enabling it all the time is a performance hit. (see http://bluebirdjs.com/docs/api/promise.longstacktraces.html) From 630c0621f65badbea5be4db28c1fd51141ea2006 Mon Sep 17 00:00:00 2001 From: Gilad Shoham Date: Tue, 26 Nov 2024 11:21:23 +0200 Subject: [PATCH 8/9] rollback unrelated formatting changes --- scopes/component/forking/forking.main.runtime.ts | 2 +- scopes/component/merging/merging.main.runtime.ts | 7 ++++--- scopes/component/stash/stash-data.ts | 5 +---- scopes/component/stash/stash.main.runtime.ts | 7 ++++--- .../dependencies/dependencies/dependencies.main.runtime.ts | 2 +- scopes/harmony/aspect-loader/aspect-loader.main.runtime.ts | 2 +- scopes/harmony/cli-reference/cli-reference.docs.mdx | 3 ++- scopes/preview/preview/strategies/env-strategy.ts | 6 +----- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/scopes/component/forking/forking.main.runtime.ts b/scopes/component/forking/forking.main.runtime.ts index c90ca8b6c4ee..39a7fd2e3dd4 100644 --- a/scopes/component/forking/forking.main.runtime.ts +++ b/scopes/component/forking/forking.main.runtime.ts @@ -393,7 +393,7 @@ the reason is that the refactor changes the components using ${sourceId.toString GraphqlMain, RefactoringMain, PkgMain, - InstallMain, + InstallMain ]) { const forkingMain = new ForkingMain( workspace, diff --git a/scopes/component/merging/merging.main.runtime.ts b/scopes/component/merging/merging.main.runtime.ts index 2ddb6e04f234..4d3aa164de1e 100644 --- a/scopes/component/merging/merging.main.runtime.ts +++ b/scopes/component/merging/merging.main.runtime.ts @@ -269,8 +269,9 @@ export class MergingMain { let workspaceConfigConflictWriteError: Error | undefined; if (workspaceDepsConflicts) { - workspaceConfigConflictWriteError = - await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully(workspaceDepsConflicts); + workspaceConfigConflictWriteError = await this.configMerger.writeWorkspaceJsoncWithConflictsGracefully( + workspaceDepsConflicts + ); } if (this.workspace) await this.configMerger.generateConfigMergeConflictFileForAll(allConfigMerge); @@ -720,7 +721,7 @@ export class MergingMain { RemoveMain, GlobalConfigMain, ConfigMergerMain, - DependencyResolverMain, + DependencyResolverMain ]) { const logger = loggerMain.createLogger(MergingAspect.id); const merging = new MergingMain( diff --git a/scopes/component/stash/stash-data.ts b/scopes/component/stash/stash-data.ts index b8835ff8020e..bd65bec726f0 100644 --- a/scopes/component/stash/stash-data.ts +++ b/scopes/component/stash/stash-data.ts @@ -10,10 +10,7 @@ export type StashDataObj = { }; export class StashData { - constructor( - readonly metadata: StashMetadata, - readonly stashCompsData: StashCompData[] - ) {} + constructor(readonly metadata: StashMetadata, readonly stashCompsData: StashCompData[]) {} toObject(): StashDataObj { return { diff --git a/scopes/component/stash/stash.main.runtime.ts b/scopes/component/stash/stash.main.runtime.ts index 62a1ae853b00..576b3721ded3 100644 --- a/scopes/component/stash/stash.main.runtime.ts +++ b/scopes/component/stash/stash.main.runtime.ts @@ -138,8 +138,9 @@ export class StashMain { if (!consumerComponent.log) { consumerComponent.log = await getBasicLog(); } - const { version, files } = - await this.workspace.scope.legacyScope.sources.consumerComponentToVersion(consumerComponent); + const { version, files } = await this.workspace.scope.legacyScope.sources.consumerComponentToVersion( + consumerComponent + ); if (previousVersion) { // set the parent, we need it for the "stash-load" to function as the "base" version for the three-way-merge. const modelComponent = consumerComponent.modelComponent; @@ -162,7 +163,7 @@ export class StashMain { Workspace, CheckoutMain, SnappingMain, - RemoveMain, + RemoveMain ]) { const stashMain = new StashMain(workspace, checkout, snapping, remove); const stashCmd = new StashCmd(stashMain); diff --git a/scopes/dependencies/dependencies/dependencies.main.runtime.ts b/scopes/dependencies/dependencies/dependencies.main.runtime.ts index eeb789bfc055..e693bfdd76aa 100644 --- a/scopes/dependencies/dependencies/dependencies.main.runtime.ts +++ b/scopes/dependencies/dependencies/dependencies.main.runtime.ts @@ -414,7 +414,7 @@ export class DependenciesMain { AspectLoaderMain, ScopeMain, GraphMain, - LoggerMain, + LoggerMain ]) { const logger = loggerMain.createLogger(DependenciesAspect.id); const depsMain = new DependenciesMain(workspace, scope, depsResolver, devFiles, aspectLoader, graph, logger); diff --git a/scopes/harmony/aspect-loader/aspect-loader.main.runtime.ts b/scopes/harmony/aspect-loader/aspect-loader.main.runtime.ts index 40a909f581f7..300bd0b5f997 100644 --- a/scopes/harmony/aspect-loader/aspect-loader.main.runtime.ts +++ b/scopes/harmony/aspect-loader/aspect-loader.main.runtime.ts @@ -884,7 +884,7 @@ export class AspectLoaderMain { [onAspectLoadErrorSlot, onLoadRequireableExtensionSlot, pluginSlot]: [ OnAspectLoadErrorSlot, OnLoadRequireableExtensionSlot, - PluginDefinitionSlot, + PluginDefinitionSlot ], harmony: Harmony ) { diff --git a/scopes/harmony/cli-reference/cli-reference.docs.mdx b/scopes/harmony/cli-reference/cli-reference.docs.mdx index 0d7463fa35e0..df8e6353345a 100644 --- a/scopes/harmony/cli-reference/cli-reference.docs.mdx +++ b/scopes/harmony/cli-reference/cli-reference.docs.mdx @@ -1,4 +1,5 @@ --- -description: 'Bit command synopses. Bit version: 1.8.123' +description: 'Bit command synopses. Bit version: 1.8.124' labels: ['cli', 'mdx', 'docs'] --- + diff --git a/scopes/preview/preview/strategies/env-strategy.ts b/scopes/preview/preview/strategies/env-strategy.ts index 1285afb32d34..8e6c5765ee83 100644 --- a/scopes/preview/preview/strategies/env-strategy.ts +++ b/scopes/preview/preview/strategies/env-strategy.ts @@ -22,11 +22,7 @@ export const ENV_STRATEGY_ARTIFACT_NAME = 'preview'; export class EnvBundlingStrategy implements BundlingStrategy { name = 'env'; - constructor( - private preview: PreviewMain, - private pkg: PkgMain, - private dependencyResolver: DependencyResolverMain - ) {} + constructor(private preview: PreviewMain, private pkg: PkgMain, private dependencyResolver: DependencyResolverMain) {} async computeTargets(context: ComputeTargetsContext, previewDefs: PreviewDefinition[]) { const outputPath = this.getOutputPath(context); From 970e001904eeece8770158f1f416e3b0f217d67e Mon Sep 17 00:00:00 2001 From: Gilad Shoham Date: Tue, 26 Nov 2024 11:23:07 +0200 Subject: [PATCH 9/9] rollback unrelated formatting changes --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 84c102a59f87..b094955e0516 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,12 @@ You can use Bit components to build new projects or reuse components to moderniz - [Backend services](https://bit.dev/docs/quick-start/platforms) - [Design systems](https://bit.dev/docs/quick-start/design-system) - [Composable platforms](https://bit.dev/docs/composable-platforms) -- [Shell applications](https://bit.dev/docs/quick-start/react) +- [Shell applications](https://bit.dev/docs/quick-start/react) - [Micro frontends](https://bit.dev/docs/micro-frontends/react-micro-frontends) Bit supports all tooling in the JS ecosystem and comes out of the box with official dev environments for [NodeJS](https://bit.dev/docs/backend-intro), [React](https://bit.dev/docs/react-intro), [Angular](https://bit.dev/docs/angular-introduction), [Vue](https://bit.dev/docs/vue-intro), [React Native](https://bit.dev/docs/react-native-intro), [NextJS](https://bit.dev/docs/quick-start/hello-world-nextjs) and [far more](https://bit.dev/docs). All are native to TypeScript and ESM and equipped with the best dev tooling. -Bit is a fit to every codebase structure. You can use Bit components in a monorepo, polyrepo, or even without repositories at all. +Bit is a fit to every codebase structure. You can use Bit components in a monorepo, polyrepo, or even without repositories at all. ## Getting started @@ -73,7 +73,7 @@ bit create react hello-world You can find simple guides for creating NodeJS modules, UI components and apps, backend services and more on the [Create Component docs](https://bit.dev/docs/getting-started/composing/creating-components/). Run the Bit UI to preview components using the following command: ``` -bit start +bit start ``` Use `bit run` to preview applications during development. To create an application, follow the [Create App docs section](https://bit.dev/docs/getting-started/composing/create-apps/).