Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update npm to v10 in dependencies #7128

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 70 additions & 88 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scopes/component/dev-files/dev-files.main.runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export class DevFilesMain {
const componentId = await this.workspace.resolveComponentId(consumerComponent.id);
// Do not change the storeInCache=false arg. if you think you need to change it, please talk to Gilad first
const component = await this.workspace.get(componentId, consumerComponent, true, false, {
loadExtensions: false
loadExtensions: false,
});
if (!component) throw Error(`failed to transform component ${consumerComponent.id.toString()} in harmony`);
const computedDevFiles = await this.computeDevFiles(component);
Expand Down
16 changes: 7 additions & 9 deletions scopes/html/html/html.main.runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Compiler } from '@teambit/compiler';
import { PackageJsonProps } from '@teambit/pkg';
import { EnvPolicyConfigObject } from '@teambit/dependency-resolver';
import { MainRuntime } from '@teambit/cli';
import { EnvsAspect, EnvsMain, EnvTransformer, Environment} from '@teambit/envs';
import { EnvsAspect, EnvsMain, EnvTransformer, Environment } from '@teambit/envs';
import { ReactAspect, ReactEnv, ReactMain } from '@teambit/react';
import { HtmlAspect } from './html.aspect';
import { HtmlEnv } from './html.env';
Expand Down Expand Up @@ -107,17 +107,15 @@ export class HtmlMain {
return this.envs.compose(this.envs.merge(targetEnv, this.htmlEnv), transformers);
}

static async provider(
[envs, react]: [EnvsMain, ReactMain],
// config,
// slots,
// harmony: Harmony
) {
static async provider([envs, react]: [EnvsMain, ReactMain]) // config,
// slots,
// harmony: Harmony
{
const htmlEnv: HtmlEnv = envs.merge<HtmlEnv, ReactEnv>(new HtmlEnv(), react.reactEnv);
envs.registerEnv(htmlEnv);
// if (generator) {
// const envContext = new EnvContext(ComponentID.fromString(ReactAspect.id), loggerAspect, workerMain, harmony);
// generator.registerComponentTemplate(getTemplates(envContext));
// const envContext = new EnvContext(ComponentID.fromString(ReactAspect.id), loggerAspect, workerMain, harmony);
// generator.registerComponentTemplate(getTemplates(envContext));
// }

return new HtmlMain(react, htmlEnv, envs);
Expand Down
2 changes: 1 addition & 1 deletion scopes/react/react-native/react-native.main.runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export class ReactNativeMain {
envs.registerEnv(reactNativeComposedEnv);

// if (generator) {
// generator.registerComponentTemplate(componentTemplates);
// generator.registerComponentTemplate(componentTemplates);
// }

return new ReactNativeMain(react, reactNativeComposedEnv, envs);
Expand Down
2 changes: 1 addition & 1 deletion scopes/scope/scope/get-scope-options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ export type GetScopeOptions = {
PaneWrapper?: ComponentType<{ children: ReactNode }>;
overrideDrawers?: DrawerType[];
onSidebarToggle?: (callback: () => void) => void;
getComponentUrl?: ComponentUrlResolver
getComponentUrl?: ComponentUrlResolver;
};
3 changes: 1 addition & 2 deletions scripts/docker-teambit-bit/README-zh.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Docker 容器运行 bit harmony

_这些 Docker 容器不处理旧版的 bit (pre-harmony),对于旧版的 bit 请参考 [bit-docker](https://github.com/teambit/bit-docker)_
Expand Down Expand Up @@ -26,7 +25,7 @@ Docker 镜像托管在 Dockerhub,链接是 [Dockerfile-bit](https://hub.docker
1. `docker run -it bitcli/bit:latest /bin/bash`
2. `bit -v` 查看 bit 版本以确保工作正常。

### 运行 server 容器
### 运行 server 容器

1. `docker run -it -p {host-port}:3000 bitcli/bit-server:latest` - 将 `{host-port}` 替换为主机要使用的端口,例如 5000。
2. 浏览 `http://localhost:{host-port}` 并确保可以看到 bit 的界面。
Expand Down
2 changes: 1 addition & 1 deletion workspace.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@
"multimatch": "5.0.0",
"nanoid": "3.1.20",
"nerf-dart": "1.0.0",
"npm": "6.14.17",
"npm": "10.2.5",
"p-limit": "3.1.0",
"p-locate": "5.0.0",
"parse-package-name": "0.1.0",
Expand Down