diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7be4fddca702..7ec26ee165f5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1232,6 +1232,9 @@ importers: array-difference: specifier: 0.0.2 version: 0.0.2 + assert: + specifier: 2.0.0 + version: 2.0.0 async-mutex: specifier: 0.3.1 version: 0.3.1 @@ -1746,8 +1749,8 @@ importers: specifier: 3.0.0 version: 3.0.0 npm: - specifier: 6.14.17 - version: 6.14.17 + specifier: 10.2.5 + version: 10.2.5 npm-run-all: specifier: 4.1.5 version: 4.1.5 @@ -1859,6 +1862,9 @@ importers: prompt: specifier: 1.1.0 version: 1.1.0 + punycode: + specifier: 2.1.1 + version: 2.1.1 puppeteer: specifier: 13.7.0 version: 13.7.0(bufferutil@4.0.3)(utf-8-validate@5.0.5) @@ -2009,6 +2015,9 @@ importers: string-format: specifier: 0.5.0 version: 0.5.0 + string_decoder: + specifier: 1.3.0 + version: 1.3.0 stringify-package: specifier: 1.0.1 version: 1.0.1 @@ -2078,6 +2087,9 @@ importers: unist-util-visit: specifier: 2.0.3 version: 2.0.3 + url: + specifier: 0.11.2 + version: 0.11.2 url-join: specifier: 4.0.1 version: 4.0.1 @@ -2087,6 +2099,9 @@ importers: utf-8-validate: specifier: 5.0.5 version: 5.0.5 + util: + specifier: 0.12.3 + version: 0.12.3 v8-compile-cache: specifier: 2.3.0 version: 2.3.0 @@ -21148,9 +21163,15 @@ importers: '@types/react-dom': specifier: ^17.0.21 version: 17.0.25 + assert: + specifier: 2.0.0 + version: 2.0.0 browserify-zlib: specifier: 0.2.0 version: 0.2.0 + buffer: + specifier: 6.0.3 + version: 6.0.3 camelcase: specifier: 6.2.0 version: 6.2.0 @@ -21205,6 +21226,9 @@ importers: process: specifier: 0.11.10 version: 0.11.10 + punycode: + specifier: 2.1.1 + version: 2.1.1 querystring-es3: specifier: 0.2.1 version: 0.2.1 @@ -21226,12 +21250,21 @@ importers: stream-http: specifier: 3.2.0 version: 3.2.0 + string_decoder: + specifier: 1.3.0 + version: 1.3.0 timers-browserify: specifier: 2.0.12 version: 2.0.12 tty-browserify: specifier: 0.0.1 version: 0.0.1 + url: + specifier: 0.11.2 + version: 0.11.2 + util: + specifier: 0.12.3 + version: 0.12.3 vm-browserify: specifier: 1.1.2 version: 1.1.2 @@ -58341,6 +58374,7 @@ packages: loose-envify: 1.4.0 object-assign: 4.1.1 dev: false + bundledDependencies: false /credentials-by-uri@2.0.0: resolution: {integrity: sha512-HptfRWLKfaeewvzKPybPFsR8TRbLSsu5MvHQLc6FWqvIS1CqFHze+IteKQlpLXzx4KwSteZa0MdsN/jEYESVXA==} @@ -67476,134 +67510,82 @@ packages: dependencies: path-key: 3.1.1 - /npm@6.14.17: - resolution: {integrity: sha512-CxEDn1ydVRPDl4tHrlnq+WevYAhv4GF2AEHzJKQ4prZDZ96IS3Uo6t0Sy6O9kB6XzqkI+J00WfYCqqk0p6IJ1Q==} - engines: {node: 6 >=6.2.0 || 8 || >=9.3.0} + /npm@10.2.5: + resolution: {integrity: sha512-lXdZ7titEN8CH5YJk9C/aYRU9JeDxQ4d8rwIIDsvH3SMjLjHTukB2CFstMiB30zXs4vCrPN2WH6cDq1yHBeJAw==} + engines: {node: ^18.17.0 || >=20.5.0} hasBin: true dev: false bundledDependencies: + - '@isaacs/string-locale-compare' + - '@npmcli/arborist' + - '@npmcli/config' + - '@npmcli/fs' + - '@npmcli/map-workspaces' + - '@npmcli/package-json' + - '@npmcli/promise-spawn' + - '@npmcli/run-script' + - '@sigstore/tuf' - abbrev - - ansicolors - - ansistyles - - aproba - archy - - bin-links - - bluebird - - byte-size - cacache - - call-limit - - chownr + - chalk - ci-info - cli-columns - cli-table3 - - cmd-shim - columnify - - config-chain - - debuglog - - detect-indent - - detect-newline - - dezalgo - - editor - - figgy-pudding - - find-npm-prefix - - fs-vacuum - - fs-write-stream-atomic - - gentle-fs + - fastest-levenshtein + - fs-minipass - glob - graceful-fs - - has-unicode - hosted-git-info - - iferr - - imurmurhash - - infer-owner - - inflight - - inherits - ini - init-package-json - is-cidr - - json-parse-better-errors - - JSONStream - - lazy-property - - libcipm - - libnpm + - json-parse-even-better-errors - libnpmaccess + - libnpmdiff + - libnpmexec + - libnpmfund - libnpmhook - libnpmorg + - libnpmpack + - libnpmpublish - libnpmsearch - libnpmteam - - libnpx - - lock-verify - - lockfile - - lodash._baseindexof - - lodash._baseuniq - - lodash._bindcallback - - lodash._cacheindexof - - lodash._createcache - - lodash._getnative - - lodash.clonedeep - - lodash.restparam - - lodash.union - - lodash.uniq - - lodash.without - - lru-cache - - meant - - mississippi - - mkdirp - - move-concurrently + - libnpmversion + - make-fetch-happen + - minimatch + - minipass + - minipass-pipeline + - ms - node-gyp - nopt - normalize-package-data - npm-audit-report - - npm-cache-filename - npm-install-checks - - npm-lifecycle - npm-package-arg - - npm-packlist - npm-pick-manifest - npm-profile - npm-registry-fetch - npm-user-validate - npmlog - - once - - opener - - osenv + - p-map - pacote - - path-is-inside - - promise-inflight + - parse-conflict-json + - proc-log - qrcode-terminal - - query-string - - qw - - read-cmd-shim - - read-installed - - read-package-json - - read-package-tree - read - - readable-stream - - readdir-scoped-modules - - request - - retry - - rimraf - - safe-buffer - semver - - sha - - slide - - sorted-object - - sorted-union-stream + - spdx-expression-parse - ssri - - stringify-package + - strip-ansi + - supports-color - tar - text-table - tiny-relative-date - - uid-number - - umask - - unique-filename - - unpipe - - update-notifier - - uuid - - validate-npm-package-license + - treeverse - validate-npm-package-name - which - - worker-farm - write-file-atomic /npmlog@4.1.2: diff --git a/scopes/component/dev-files/dev-files.main.runtime.ts b/scopes/component/dev-files/dev-files.main.runtime.ts index 94dc128ce152..af689ad4ba2f 100644 --- a/scopes/component/dev-files/dev-files.main.runtime.ts +++ b/scopes/component/dev-files/dev-files.main.runtime.ts @@ -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); diff --git a/scopes/html/html/html.main.runtime.ts b/scopes/html/html/html.main.runtime.ts index fe4c6676b8ed..975266e09496 100644 --- a/scopes/html/html/html.main.runtime.ts +++ b/scopes/html/html/html.main.runtime.ts @@ -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'; @@ -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(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); diff --git a/scopes/react/react-native/react-native.main.runtime.ts b/scopes/react/react-native/react-native.main.runtime.ts index 1e8293706450..d2637024c42d 100644 --- a/scopes/react/react-native/react-native.main.runtime.ts +++ b/scopes/react/react-native/react-native.main.runtime.ts @@ -123,7 +123,7 @@ export class ReactNativeMain { envs.registerEnv(reactNativeComposedEnv); // if (generator) { - // generator.registerComponentTemplate(componentTemplates); + // generator.registerComponentTemplate(componentTemplates); // } return new ReactNativeMain(react, reactNativeComposedEnv, envs); diff --git a/scopes/scope/scope/get-scope-options.ts b/scopes/scope/scope/get-scope-options.ts index 3c7bf4b22a8b..c126859da1ea 100644 --- a/scopes/scope/scope/get-scope-options.ts +++ b/scopes/scope/scope/get-scope-options.ts @@ -12,5 +12,5 @@ export type GetScopeOptions = { PaneWrapper?: ComponentType<{ children: ReactNode }>; overrideDrawers?: DrawerType[]; onSidebarToggle?: (callback: () => void) => void; - getComponentUrl?: ComponentUrlResolver + getComponentUrl?: ComponentUrlResolver; }; diff --git a/scripts/docker-teambit-bit/README-zh.md b/scripts/docker-teambit-bit/README-zh.md index cdb57ab97290..bb8daeda6334 100644 --- a/scripts/docker-teambit-bit/README-zh.md +++ b/scripts/docker-teambit-bit/README-zh.md @@ -1,4 +1,3 @@ - # Docker 容器运行 bit harmony _这些 Docker 容器不处理旧版的 bit (pre-harmony),对于旧版的 bit 请参考 [bit-docker](https://github.com/teambit/bit-docker)_ @@ -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 的界面。 diff --git a/workspace.jsonc b/workspace.jsonc index 965f438a53f8..193619035e57 100644 --- a/workspace.jsonc +++ b/workspace.jsonc @@ -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",