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

Env Vars and Dotenv #8198

Merged
merged 95 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
7a835bd
initial commit
ranm8 May 3, 2023
e41d7f7
Merge branch 'master' into static-single-install
GiladShoham May 4, 2023
86384d0
Merge branch 'master' into static-single-install
GiladShoham May 8, 2023
ee360fc
load env's deps correctly for components even when node_modules are e…
GiladShoham May 9, 2023
94a52ea
Merge branch 'master' into static-single-install
GiladShoham May 11, 2023
4906e77
add env package to the env root dir
GiladShoham May 11, 2023
190aca3
Merge branch 'master' into static-single-install
GiladShoham May 14, 2023
a44cf99
restore some code
GiladShoham May 14, 2023
9a87763
load envs from root folders
GiladShoham May 15, 2023
7b35cda
Merge branch 'master' into static-single-install
GiladShoham May 16, 2023
76b31c0
fixes for envs loading
GiladShoham May 16, 2023
8ad819d
do not add missing packages that are resolved from component from the…
GiladShoham May 16, 2023
a9ff7ec
fixes for calc dev vs runtime missing deps into the install manifest
GiladShoham May 17, 2023
e357d9e
more fixes for calc where to load envs from
GiladShoham May 17, 2023
7c82d48
fix check if dependencies changes as part of the install process
GiladShoham May 17, 2023
53336bb
fix calculate env id for old components
GiladShoham May 17, 2023
ad47672
add p-locate package
GiladShoham May 18, 2023
9ee7dd6
fix env id calculation - take env.jsonc into account when searching f…
GiladShoham May 18, 2023
6a2cfb5
fix for hasEnvManifest
GiladShoham May 21, 2023
d95a71e
fixes for calc missing deps into the install manifest when they are a…
GiladShoham May 22, 2023
4d4a7a1
fix calc of missing deps into the manifest for install
GiladShoham May 22, 2023
3f1b45f
fix resolve aspects for workspace comps
GiladShoham May 22, 2023
9ebeeab
fix calc of getRuntimeModulePath
GiladShoham May 22, 2023
d86aaea
only load aspects from the graph in case the root aspect is not a plugin
GiladShoham May 22, 2023
cb1c334
more fixes for envs loading
GiladShoham May 22, 2023
343362d
improve calc env id for core envs
GiladShoham May 22, 2023
c9e2cfe
show non loaded envs for bit envs command
GiladShoham May 22, 2023
880b3d6
show real env for bit show (and not loaded indication)
GiladShoham May 22, 2023
356b940
add issue in bit status for failed loading env
GiladShoham May 22, 2023
0cc990a
Merge branch 'master' into static-single-install
GiladShoham May 23, 2023
e0629e2
fix use case when the workspace contain only old envs
GiladShoham May 23, 2023
32fa8d7
improve non loaded envs warnings
GiladShoham May 23, 2023
50ee1b1
remove duplicate envs' API
GiladShoham May 23, 2023
25c24f7
* add warning in bit install in case there are old non loaded envs
GiladShoham May 23, 2023
4c56e41
linting
GiladShoham May 23, 2023
1ffaa80
fix tests
GiladShoham May 23, 2023
4393fbe
improve aspect loading errors
GiladShoham May 24, 2023
318a311
improve calculation of failed to load envs
GiladShoham May 24, 2023
963d45d
add target to e2e-fixture-helper.copyFixtureExtensions API
GiladShoham May 24, 2023
1f60b22
add runInstall, targetFolder, id to e2e-env-helper.setCustomNewEnv API
GiladShoham May 24, 2023
7fbdc15
fix root components tests
GiladShoham May 24, 2023
7e70057
fixes for env id calculation
GiladShoham May 24, 2023
cdad8fd
fix wrong creation of missing packages issue
GiladShoham May 24, 2023
536c102
add support for format solution to component issue
GiladShoham May 24, 2023
d23f82d
add new component issue type for ExternalEnvWithoutVersion
GiladShoham May 24, 2023
387ae32
Merge branch 'master' of github.com:teambit/bit
ranm8 May 30, 2023
609ffb9
Merge branch 'master' of github.com:teambit/bit
ranm8 Jun 5, 2023
1229720
Merge branch 'master' of github.com:teambit/bit
ranm8 Jun 11, 2023
7ed26db
Merge branch 'master' of github.com:teambit/bit
ranm8 Jun 12, 2023
aac5954
Merge branch 'master' of github.com:teambit/bit
ranm8 Jun 19, 2023
eaaf49a
Merge branch 'master' of github.com:teambit/bit
ranm8 Jun 28, 2023
333043a
Merge branch 'master' of github.com:teambit/bit
ranm8 Jun 29, 2023
da6eeaa
Merge branch 'master' of github.com:teambit/bit
ranm8 Jul 2, 2023
4d70927
Merge branch 'master' of github.com:teambit/bit
ranm8 Jul 19, 2023
91f28de
Merge branch 'master' of github.com:teambit/bit
ranm8 Aug 2, 2023
bda1ae4
Merge branch 'master' of github.com:teambit/bit
ranm8 Aug 7, 2023
c8048c9
Merge branch 'master' of github.com:teambit/bit
ranm8 Aug 13, 2023
71327c0
Merge branch 'master' of github.com:teambit/bit
ranm8 Aug 14, 2023
90fc1ae
testing typos
ranm8 Aug 21, 2023
8a8358e
Merge branch 'master' of github.com:teambit/bit
ranm8 Aug 21, 2023
9a51604
Merge branch 'master' of github.com:teambit/bit
ranm8 Sep 14, 2023
7802037
Merge branch 'master' of github.com:teambit/bit
ranm8 Sep 19, 2023
f4a7709
Merge branch 'master' of github.com:teambit/bit
ranm8 Sep 20, 2023
116cfd6
Merge branch 'master' of github.com:teambit/bit
ranm8 Sep 27, 2023
fa80544
Merge branch 'master' of github.com:teambit/bit
ranm8 Sep 29, 2023
e24f38b
Merge branch 'master' of github.com:teambit/bit
ranm8 Oct 9, 2023
ec90357
Merge branch 'master' of github.com:teambit/bit
ranm8 Oct 15, 2023
30bb73d
fix: linking package.json files to injected directories
zkochan Oct 19, 2023
b610996
style: fix
zkochan Oct 19, 2023
0472709
test: fix
zkochan Oct 19, 2023
d6fc66a
style: fix
zkochan Oct 19, 2023
861f4a2
Merge branch 'master' into fix-link-pkg-json
zkochan Oct 19, 2023
9b27216
Merge branch 'master' of github.com:teambit/bit
ranm8 Oct 20, 2023
05a6d6c
Merge branch 'fix-link-pkg-json' of github.com:teambit/bit
ranm8 Oct 20, 2023
9a550b5
Merge branch 'master' of github.com:teambit/bit
ranm8 Oct 27, 2023
b4202ec
Merge branch 'master' of github.com:teambit/bit
ranm8 Nov 7, 2023
b32019c
Merge branch 'master' of github.com:teambit/bit
ranm8 Nov 7, 2023
9d0e477
Merge branch 'master' of github.com:teambit/bit
ranm8 Nov 7, 2023
94eab57
Merge branch 'master' of github.com:teambit/bit
ranm8 Nov 8, 2023
c95f50a
Merge branch 'master' of github.com:teambit/bit
ranm8 Nov 13, 2023
b199abc
Merge branch 'master' of github.com:teambit/bit
ranm8 Nov 23, 2023
2fa40a3
apps initial
ranm8 Nov 24, 2023
2daacbe
default to last in exports
ranm8 Nov 24, 2023
0debae5
type fix
ranm8 Nov 24, 2023
3cea230
esm
ranm8 Nov 27, 2023
aa7334a
Merge branch 'master' of github.com:teambit/bit into apps
ranm8 Nov 27, 2023
5cdc652
type changes
ranm8 Nov 27, 2023
1dbe90e
app types
ranm8 Nov 27, 2023
a4aed62
type fix
ranm8 Nov 27, 2023
e1dceec
type fix
ranm8 Nov 27, 2023
e7ee147
env vars
ranm8 Nov 27, 2023
55926b1
Merge branch 'master' into apps
GiladShoham Nov 28, 2023
1d355fc
Update esm.mjs
GiladShoham Nov 28, 2023
5082ae5
Update constants.ts
GiladShoham Nov 28, 2023
6fd9dea
Merge branch 'master' into apps
GiladShoham Nov 28, 2023
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
8 changes: 7 additions & 1 deletion scopes/harmony/application/app-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ export class AppContext extends ExecutionContext {
* path to the application component in the workspace
*/
readonly workspaceComponentPath?: string,

/**
* list of env variables to include.
*/
readonly envVariables: Record<string, string> = {}
) {
super(execContext.upper, execContext.envRuntime, execContext.components);
}
Expand Down Expand Up @@ -85,7 +90,8 @@ export class AppContext extends ExecutionContext {
overrides?.execContext || appContext?.execContext,
overrides?.hostRootDir || appContext?.hostRootDir,
overrides?.port || appContext?.port,
overrides?.workspaceComponentPath || appContext?.workspaceComponentPath,
overrides?.workspaceComponentPath || appContext?.workspaceComponentPath,
overrides?.envVariables || appContext?.envVariables,
);
}
}
3 changes: 3 additions & 0 deletions src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,9 @@ export const MergeConfigFilename = 'merge-conflict';
* if you want to ignore only from component's root-dir, use `IGNORE_ROOT_ONLY_LIST` constant.
*/
export const IGNORE_LIST = [
'**/.env',
'**/.env.local',
'**/.env.**.local',
'**/.bit.map.json',
'**/.bitmap',
'**/.gitignore',
Expand Down