@teambit/workspace 1.0.1060 → 1.0.1062

package/envs-subcommands/envs-unset.cmd.ts

@@ -16,8 +16,8 @@ export class EnvsUnsetCmd implements Command {
   options = [];
   group = 'component-config';
   extendedDescription = `keep in mind that this doesn't remove envs that are set via variants.
-in only removes envs that appear in the .bitmap file, which were previously configured via "bit env set".
-the purpose of this command is to reset previously assigned envs to either allow variants configure the env or use the base node env.
+it only removes envs that appear in the .bitmap file, which were previously configured via "bit env set".
+the purpose of this command is to reset previously assigned envs to either allow variants to configure the env or use the base node env.
 ${PATTERN_HELP('env unset')}`;
 
   constructor(private workspace: Workspace) {}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/workspace",
-  "version": "1.0.1060",
+  "version": "1.0.1062",
   "homepage": "https://bit.cloud/teambit/workspace/workspace",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.workspace",
     "name": "workspace",
-    "version": "1.0.1060"
+    "version": "1.0.1062"
   },
   "dependencies": {
     "lodash": "4.17.21",
@@ -30,43 +30,43 @@
     "reset-css": "5.0.1",
     "@teambit/component-id": "1.2.4",
     "@teambit/harmony": "0.4.12",
-    "@teambit/legacy.extension-data": "0.0.138",
-    "@teambit/legacy.scope": "0.0.136",
+    "@teambit/legacy.extension-data": "0.0.139",
+    "@teambit/legacy.scope": "0.0.137",
     "@teambit/component-version": "1.0.4",
-    "@teambit/legacy.consumer-component": "0.0.137",
-    "@teambit/legacy.consumer": "0.0.136",
+    "@teambit/legacy.consumer-component": "0.0.138",
+    "@teambit/legacy.consumer": "0.0.137",
     "@teambit/bit-error": "0.0.404",
     "@teambit/lane-id": "0.0.312",
-    "@teambit/legacy.bit-map": "0.0.193",
+    "@teambit/legacy.bit-map": "0.0.194",
     "@teambit/toolbox.fs.last-modified": "0.0.17",
     "@teambit/toolbox.path.path": "0.0.19",
     "@teambit/graph.cleargraph": "0.0.11",
-    "@teambit/logger": "0.0.1444",
-    "@teambit/cli": "0.0.1351",
-    "@teambit/config-store": "0.0.232",
+    "@teambit/logger": "0.0.1445",
+    "@teambit/cli": "0.0.1352",
+    "@teambit/config-store": "0.0.233",
     "@teambit/legacy.constants": "0.0.34",
     "@teambit/component.ui.component-status-resolver": "0.0.510",
     "@teambit/harmony.modules.load-trace": "0.0.6",
     "@teambit/harmony.modules.resolved-component": "0.0.518",
     "@teambit/legacy.utils": "0.0.42",
-    "@teambit/scope.remotes": "0.0.136",
-    "@teambit/config": "0.0.1526",
+    "@teambit/scope.remotes": "0.0.137",
+    "@teambit/config": "0.0.1527",
     "@teambit/harmony.modules.requireable-component": "0.0.518",
     "@teambit/toolbox.modules.module-resolver": "0.0.22",
-    "@teambit/workspace.modules.node-modules-linker": "0.0.367",
-    "@teambit/global-config": "0.0.1355",
-    "@teambit/legacy.consumer-config": "0.0.136",
-    "@teambit/variants": "0.0.1619",
+    "@teambit/workspace.modules.node-modules-linker": "0.0.368",
+    "@teambit/global-config": "0.0.1356",
+    "@teambit/legacy.consumer-config": "0.0.137",
+    "@teambit/variants": "0.0.1620",
     "@teambit/component-issues": "0.0.177",
-    "@teambit/component.sources": "0.0.188",
+    "@teambit/component.sources": "0.0.189",
     "@teambit/dependencies.modules.packages-excluder": "1.0.8",
     "@teambit/git.modules.git-executable": "0.0.35",
     "@teambit/harmony.modules.in-memory-cache": "0.0.38",
     "@teambit/legacy-bit-id": "1.1.3",
-    "@teambit/legacy.component-list": "0.0.190",
-    "@teambit/legacy.scope-api": "0.0.191",
+    "@teambit/legacy.component-list": "0.0.191",
+    "@teambit/legacy.scope-api": "0.0.192",
     "@teambit/toolbox.path.is-path-inside": "0.0.511",
-    "@teambit/workspace.modules.match-pattern": "0.0.525",
+    "@teambit/workspace.modules.match-pattern": "0.0.526",
     "@teambit/component.ui.component-drawer": "0.0.493",
     "@teambit/design.ui.tree": "0.0.16",
     "@teambit/lanes.hooks.use-lane-components": "0.0.306",
@@ -108,23 +108,23 @@
     "@teambit/cloud.hooks.use-cloud-scopes": "0.0.25",
     "@teambit/explorer.ui.gallery.component-grid": "0.0.496",
     "@teambit/workspace.ui.empty-workspace": "0.0.509",
-    "@teambit/component": "1.0.1060",
-    "@teambit/dependency-resolver": "1.0.1060",
-    "@teambit/envs": "1.0.1060",
-    "@teambit/objects": "0.0.567",
-    "@teambit/scope": "1.0.1060",
-    "@teambit/graph": "1.0.1060",
-    "@teambit/isolator": "1.0.1060",
-    "@teambit/component-tree": "1.0.1060",
-    "@teambit/watcher": "1.0.1060",
-    "@teambit/aspect-loader": "1.0.1060",
-    "@teambit/graphql": "1.0.1060",
-    "@teambit/bundler": "1.0.1060",
-    "@teambit/ui": "1.0.1060",
-    "@teambit/command-bar": "1.0.1060",
-    "@teambit/sidebar": "1.0.1060",
-    "@teambit/pubsub": "1.0.1060",
-    "@teambit/deprecation": "1.0.1060"
+    "@teambit/component": "1.0.1062",
+    "@teambit/dependency-resolver": "1.0.1062",
+    "@teambit/envs": "1.0.1062",
+    "@teambit/objects": "0.0.569",
+    "@teambit/scope": "1.0.1062",
+    "@teambit/graph": "1.0.1062",
+    "@teambit/isolator": "1.0.1062",
+    "@teambit/component-tree": "1.0.1062",
+    "@teambit/watcher": "1.0.1062",
+    "@teambit/aspect-loader": "1.0.1062",
+    "@teambit/graphql": "1.0.1062",
+    "@teambit/bundler": "1.0.1062",
+    "@teambit/ui": "1.0.1062",
+    "@teambit/command-bar": "1.0.1062",
+    "@teambit/sidebar": "1.0.1062",
+    "@teambit/pubsub": "1.0.1062",
+    "@teambit/deprecation": "1.0.1062"
   },
   "devDependencies": {
     "@types/lodash": "4.14.165",

package/scope-subcommands/scope-set.cmd.ts

@@ -18,7 +18,7 @@ export class ScopeSetCmd implements Command {
   options = [];
   group = 'component-config';
   extendedDescription = `default scopes for components are set in the bitmap file. the default scope for a workspace is set in the workspace.jsonc.
-a component is set with a scope (as oppose to default scope) only once it is versioned.'
+a component is set with a scope (as opposed to default scope) only once it is versioned.
 
 ${PATTERN_HELP('scope set scope-name')}`;
 

package/workspace-component/workspace-component-loader.ts

@@ -503,7 +503,18 @@ export class WorkspaceComponentLoader {
         this.componentLoadedSelfAsAspects.set(idStr, true);
       }
       const envsData = component.state.aspects.get(EnvsAspect.id);
-      if (opts.loadEnvs && (envsData?.data?.services || envsData?.data?.self || envsData?.data?.type === 'env')) {
+      // a component with an env plugin file (*.bit-env.*) is an env by definition. the env-data
+      // type can't be relied on when the env's own env was not loaded yet (e.g. a just-created
+      // env whose env-of-env is not installed) - the env-data falls back to the default env.
+      // it's the last operand on purpose - the files are scanned only when the env-data gave no
+      // answer.
+      if (
+        opts.loadEnvs &&
+        (envsData?.data?.services ||
+          envsData?.data?.self ||
+          envsData?.data?.type === 'env' ||
+          this.envs.hasEnvPluginFile(component))
+      ) {
         aspectIds.push(idStr);
         this.componentLoadedSelfAsAspects.set(idStr, true);
       }