netlify-cli 20.0.3 → 20.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/build/index.d.ts.map +1 -1
- package/dist/commands/build/index.js +6 -2
- package/dist/commands/build/index.js.map +1 -1
- package/dist/commands/deploy/deploy.d.ts.map +1 -1
- package/dist/commands/deploy/deploy.js +13 -16
- package/dist/commands/deploy/deploy.js.map +1 -1
- package/dist/commands/deploy/index.d.ts.map +1 -1
- package/dist/commands/deploy/index.js +1 -1
- package/dist/commands/deploy/index.js.map +1 -1
- package/dist/commands/dev/index.d.ts.map +1 -1
- package/dist/commands/dev/index.js +4 -2
- package/dist/commands/dev/index.js.map +1 -1
- package/dist/commands/dev-exec/index.d.ts.map +1 -1
- package/dist/commands/dev-exec/index.js +6 -2
- package/dist/commands/dev-exec/index.js.map +1 -1
- package/dist/commands/env/env-get.js +2 -2
- package/dist/commands/env/env-list.js +2 -2
- package/dist/commands/env/env-set.js +5 -5
- package/dist/commands/env/env-set.js.map +1 -1
- package/dist/commands/env/env-unset.js +3 -3
- package/dist/commands/env/env.js +9 -9
- package/dist/commands/env/env.js.map +1 -1
- package/dist/commands/serve/index.d.ts.map +1 -1
- package/dist/commands/serve/index.js +8 -2
- package/dist/commands/serve/index.js.map +1 -1
- package/dist/lib/account.d.ts +2 -5
- package/dist/lib/account.d.ts.map +1 -1
- package/dist/lib/account.js +0 -11
- package/dist/lib/account.js.map +1 -1
- package/dist/lib/functions/runtimes/go/index.d.ts.map +1 -1
- package/dist/lib/functions/runtimes/go/index.js +1 -1
- package/dist/lib/functions/runtimes/go/index.js.map +1 -1
- package/dist/lib/functions/server.d.ts +1 -1
- package/dist/lib/functions/server.d.ts.map +1 -1
- package/dist/lib/images/proxy.d.ts +1 -1
- package/dist/lib/images/proxy.d.ts.map +1 -1
- package/dist/lib/images/proxy.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/utils/deploy/deploy-site.d.ts.map +1 -1
- package/dist/utils/deploy/deploy-site.js +1 -1
- package/dist/utils/deploy/deploy-site.js.map +1 -1
- package/dist/utils/dev.d.ts +13 -1
- package/dist/utils/dev.d.ts.map +1 -1
- package/dist/utils/dev.js +2 -5
- package/dist/utils/dev.js.map +1 -1
- package/dist/utils/env/index.d.ts +62 -25
- package/dist/utils/env/index.d.ts.map +1 -1
- package/dist/utils/env/index.js +56 -25
- package/dist/utils/env/index.js.map +1 -1
- package/dist/utils/proxy-server.d.ts +1 -1
- package/dist/utils/proxy-server.d.ts.map +1 -1
- package/dist/utils/temporary-file.d.ts +7 -0
- package/dist/utils/temporary-file.d.ts.map +1 -0
- package/dist/utils/temporary-file.js +16 -0
- package/dist/utils/temporary-file.js.map +1 -0
- package/npm-shrinkwrap.json +2 -124
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAIA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAgBvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAGjD,YAAY,EAAE,WAAW,EAAE,CAAA;AAS3B,eAAO,MAAM,UAAU,GACrB,SAAS,WAAW,EACpB,KAAK,QAAQ,EAEb,WAAM,EAEN,QAAG,EACH,oPAiCG;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAA;IACxC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB;;;;EAuIF,CAAA"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { rm } from 'fs/promises';
|
|
2
2
|
import cleanDeep from 'clean-deep';
|
|
3
|
-
import { temporaryDirectory } from 'tempy';
|
|
4
3
|
import { deployFileNormalizer, getDistPathIfExists, isEdgeFunctionFile } from '../../lib/edge-functions/deploy.js';
|
|
5
4
|
import { warn } from '../command-helpers.js';
|
|
6
5
|
import { DEFAULT_CONCURRENT_HASH, DEFAULT_CONCURRENT_UPLOAD, DEFAULT_DEPLOY_TIMEOUT, DEFAULT_MAX_RETRY, DEFAULT_SYNC_LIMIT, } from './constants.js';
|
|
@@ -9,6 +8,7 @@ import hashFiles from './hash-files.js';
|
|
|
9
8
|
import hashFns from './hash-fns.js';
|
|
10
9
|
import uploadFiles from './upload-files.js';
|
|
11
10
|
import { getUploadList, waitForDeploy, waitForDiff } from './util.js';
|
|
11
|
+
import { temporaryDirectory } from '../temporary-file.js';
|
|
12
12
|
const buildStatsString = (possibleParts) => {
|
|
13
13
|
const parts = possibleParts.filter(Boolean);
|
|
14
14
|
const message = parts.slice(0, -1).join(', ');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAA;AAEhC,OAAO,SAAS,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/dev.d.ts
CHANGED
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
import type { NetlifyAPI } from 'netlify';
|
|
2
|
+
type ApiAccount = Awaited<ReturnType<NetlifyAPI['listAccountsForUser']>>[number];
|
|
3
|
+
type Capabilities = NonNullable<ApiAccount['capabilities']> & {
|
|
4
|
+
background_functions?: {
|
|
5
|
+
included?: boolean | undefined;
|
|
6
|
+
} | undefined;
|
|
7
|
+
};
|
|
8
|
+
export type Capability = keyof Capabilities;
|
|
9
|
+
export type Account = ApiAccount & {
|
|
10
|
+
capabilities?: Capabilities;
|
|
11
|
+
};
|
|
1
12
|
/**
|
|
2
13
|
*
|
|
3
14
|
* @param {object} config
|
|
@@ -17,7 +28,7 @@ export declare const getSiteInformation: ({ api, offline, site, siteInfo }: {
|
|
|
17
28
|
[k: string]: any;
|
|
18
29
|
};
|
|
19
30
|
siteUrl: any;
|
|
20
|
-
accountId:
|
|
31
|
+
accountId: string | undefined;
|
|
21
32
|
capabilities: {
|
|
22
33
|
backgroundFunctions: boolean;
|
|
23
34
|
};
|
|
@@ -59,4 +70,5 @@ export declare const acquirePort: ({ configuredPort, defaultPort, errorMessage,
|
|
|
59
70
|
}) => Promise<number>;
|
|
60
71
|
export declare const processOnExit: (fn: any) => void;
|
|
61
72
|
export declare const UNLINKED_SITE_MOCK_ID = "unlinked";
|
|
73
|
+
export {};
|
|
62
74
|
//# sourceMappingURL=dev.d.ts.map
|
package/dist/utils/dev.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAgDzC,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;AAChF,KAAK,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,GAAG;IAE5D,oBAAoB,CAAC,EACjB;QACE,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAC/B,GACD,SAAS,CAAA;CACd,CAAA;AACD,MAAM,MAAM,UAAU,GAAG,MAAM,YAAY,CAAA;AAC3C,MAAM,MAAM,OAAO,GAAG,UAAU,GAAG;IACjC,YAAY,CAAC,EAAE,YAAY,CAAA;CAC5B,CAAA;AAmDD;;;;;;;;GAQG;AAEH,eAAO,MAAM,kBAAkB,GAAU;;;;;CAAgC;;;;;;;;;;;;;;;;;;;;;;;;EAgCxE,CAAA;AAUD;;;GAGG;AAEH,eAAO,MAAM,kBAAkB,GAAU;;;;CAAwB,iBAqBhE,CAAA;AAED;;;;GAIG;AAEH,eAAO,MAAM,kBAAkB,GAAI,QAAG,SAgCrC,CAAA;AAED,eAAO,MAAM,WAAW,GAAU,gDAI/B;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;CACrB,oBAMA,CAAA;AAGD,eAAO,MAAM,aAAa,GAAI,OAAE,SAK/B,CAAA;AAED,eAAO,MAAM,qBAAqB,aAAa,CAAA"}
|
package/dist/utils/dev.js
CHANGED
|
@@ -38,7 +38,6 @@ const validateSiteInfo = ({ site, siteInfo }) => {
|
|
|
38
38
|
return logAndThrowError(`Failed retrieving site information for site ${chalk.yellow(site.id)}. ${ERROR_CALL_TO_ACTION}`);
|
|
39
39
|
}
|
|
40
40
|
};
|
|
41
|
-
// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
|
|
42
41
|
const getAccounts = async ({ api }) => {
|
|
43
42
|
try {
|
|
44
43
|
const accounts = await api.listAccountsForUser();
|
|
@@ -67,13 +66,11 @@ const getAddonsInformation = ({ addons, siteInfo }) => {
|
|
|
67
66
|
const env = Object.assign({}, ...addons.map((addon) => addon.env));
|
|
68
67
|
return { urls, env };
|
|
69
68
|
};
|
|
70
|
-
// @ts-expect-error TS(7031) FIXME: Binding element 'accounts' implicitly has an 'any'... Remove this comment to see the full error message
|
|
71
69
|
const getSiteAccount = ({ accounts, siteInfo }) => {
|
|
72
|
-
// @ts-expect-error TS(7006) FIXME: Parameter 'account' implicitly has an 'any' type.
|
|
73
70
|
const siteAccount = accounts.find((account) => account.slug === siteInfo.account_slug);
|
|
74
71
|
if (!siteAccount) {
|
|
75
72
|
warn(`Could not find account for site '${siteInfo.name}' with account slug '${siteInfo.account_slug}'`);
|
|
76
|
-
return
|
|
73
|
+
return undefined;
|
|
77
74
|
}
|
|
78
75
|
return siteAccount;
|
|
79
76
|
};
|
|
@@ -100,7 +97,7 @@ export const getSiteInformation = async ({ api, offline, site, siteInfo }) => {
|
|
|
100
97
|
return {
|
|
101
98
|
addonsUrls,
|
|
102
99
|
siteUrl: siteInfo.ssl_url,
|
|
103
|
-
accountId: account
|
|
100
|
+
accountId: account?.id,
|
|
104
101
|
capabilities: {
|
|
105
102
|
backgroundFunctions: supportsBackgroundFunctions(account),
|
|
106
103
|
},
|
package/dist/utils/dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B,OAAO,OAAO,MAAM,UAAU,CAAA;AAC9B,OAAO,OAAO,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,32 +1,69 @@
|
|
|
1
1
|
import type { NetlifyAPI } from 'netlify';
|
|
2
|
-
import { $TSFixMe } from '../../commands/types.js';
|
|
3
2
|
import type { SiteInfo, EnvironmentVariableSource } from '../../utils/types.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
3
|
+
/**
|
|
4
|
+
* Supported values for the user-provided env `context` option.
|
|
5
|
+
* These all match possible `context` values returned by the Envelope API.
|
|
6
|
+
* Note that a user may also specify a branch name with the special `branch:my-branch-name` format.
|
|
7
|
+
*/
|
|
8
|
+
export declare const SUPPORTED_CONTEXTS: readonly ["all", "production", "deploy-preview", "branch-deploy", "dev"];
|
|
9
|
+
/**
|
|
10
|
+
* Supported values for the user-provided env `scope` option.
|
|
11
|
+
* These exactly match possible `scope` values returned by the Envelope API.
|
|
12
|
+
* Note that `any` is also supported.
|
|
13
|
+
*/
|
|
14
|
+
export declare const ALL_ENVELOPE_SCOPES: readonly ["builds", "functions", "runtime", "post_processing"];
|
|
15
|
+
type EnvelopeEnvVarScope = Exclude<NonNullable<Awaited<ReturnType<NetlifyAPI['getEnvVars']>>[number]['scopes']>[number], 'post-processing'> | 'post_processing';
|
|
16
|
+
type EnvelopeEnvVar = Awaited<ReturnType<NetlifyAPI['getEnvVars']>>[number] & {
|
|
17
|
+
scopes: EnvelopeEnvVarScope[];
|
|
18
|
+
};
|
|
19
|
+
type EnvelopeEnvVarContext = NonNullable<NonNullable<EnvelopeEnvVar['values']>[number]['context']>;
|
|
20
|
+
export type EnvelopeEnvVarValue = {
|
|
21
|
+
/**
|
|
22
|
+
* The deploy context of the this env var value
|
|
23
|
+
*/
|
|
24
|
+
context?: EnvelopeEnvVarContext;
|
|
25
|
+
/**
|
|
26
|
+
* For parameterized contexts (i.e. only `branch`), context parameter (i.e. the branch name)
|
|
27
|
+
*/
|
|
10
28
|
context_parameter?: string | undefined;
|
|
11
|
-
|
|
29
|
+
/**
|
|
30
|
+
* The value of the environment variable for this context. Note that this appears to be an empty string
|
|
31
|
+
* when the env var is not set for this context.
|
|
32
|
+
*/
|
|
33
|
+
value?: string | undefined;
|
|
34
|
+
};
|
|
35
|
+
export type EnvelopeItem = {
|
|
36
|
+
key: string;
|
|
37
|
+
scopes: EnvelopeEnvVarScope[];
|
|
38
|
+
values: EnvelopeEnvVarValue[];
|
|
12
39
|
};
|
|
40
|
+
type SupportedScope = EnvelopeEnvVarScope | 'post_processing' | 'any';
|
|
41
|
+
type ContextOrBranch = string;
|
|
13
42
|
/**
|
|
14
|
-
*
|
|
15
|
-
*
|
|
43
|
+
* Normalizes a user-provided "context". Note that this may be the special `branch:my-branch-name` format.
|
|
44
|
+
*
|
|
45
|
+
* - If this is a supported alias of a context, it will be normalized to the canonical context.
|
|
46
|
+
* - Valid canonical contexts are returned as is.
|
|
47
|
+
* - If this starts with `branch:`, it will be normalized to the branch name.
|
|
48
|
+
*
|
|
49
|
+
* @param context A user-provided context, context alias, or a string in the `branch:my-branch-name` format.
|
|
50
|
+
*
|
|
51
|
+
* @returns The normalized context name or just the branch name
|
|
16
52
|
*/
|
|
17
|
-
export declare const normalizeContext: (context: string) =>
|
|
53
|
+
export declare const normalizeContext: (context: string) => ContextOrBranch;
|
|
18
54
|
/**
|
|
19
|
-
* Finds a matching environment variable value
|
|
55
|
+
* Finds a matching environment variable value for a given context
|
|
56
|
+
* @private
|
|
20
57
|
*/
|
|
21
|
-
export declare const
|
|
58
|
+
export declare const getValueForContext: (
|
|
22
59
|
/**
|
|
23
60
|
* An array of environment variable values from Envelope
|
|
24
61
|
*/
|
|
25
|
-
values:
|
|
62
|
+
values: EnvelopeEnvVarValue[],
|
|
26
63
|
/**
|
|
27
64
|
* The deploy context or branch of the environment variable value
|
|
28
65
|
*/
|
|
29
|
-
|
|
66
|
+
contextOrBranch: ContextOrBranch) => EnvelopeEnvVarValue | undefined;
|
|
30
67
|
/**
|
|
31
68
|
* Finds environment variables that match a given source
|
|
32
69
|
* @param env - The dictionary of environment variables
|
|
@@ -58,13 +95,13 @@ export declare const filterEnvBySource: (env: object, source: EnvironmentVariabl
|
|
|
58
95
|
* }
|
|
59
96
|
*/
|
|
60
97
|
export declare const formatEnvelopeData: ({ context, envelopeItems, scope, source, }: {
|
|
61
|
-
context?:
|
|
62
|
-
envelopeItems:
|
|
63
|
-
scope?:
|
|
98
|
+
context?: ContextOrBranch;
|
|
99
|
+
envelopeItems: EnvelopeItem[];
|
|
100
|
+
scope?: SupportedScope;
|
|
64
101
|
source: string;
|
|
65
102
|
}) => Record<string, {
|
|
66
|
-
context:
|
|
67
|
-
branch: string;
|
|
103
|
+
context: ContextOrBranch;
|
|
104
|
+
branch: string | undefined;
|
|
68
105
|
scopes: string[];
|
|
69
106
|
sources: string[];
|
|
70
107
|
value: string;
|
|
@@ -82,11 +119,11 @@ export declare const formatEnvelopeData: ({ context, envelopeItems, scope, sourc
|
|
|
82
119
|
*/
|
|
83
120
|
export declare const getEnvelopeEnv: ({ api, context, env, key, raw, scope, siteInfo, }: {
|
|
84
121
|
api: NetlifyAPI;
|
|
85
|
-
context?:
|
|
122
|
+
context?: ContextOrBranch | undefined;
|
|
86
123
|
env: object;
|
|
87
124
|
key?: string | undefined;
|
|
88
125
|
raw?: boolean | undefined;
|
|
89
|
-
scope?:
|
|
126
|
+
scope?: SupportedScope | undefined;
|
|
90
127
|
siteInfo: SiteInfo;
|
|
91
128
|
}) => Promise<{}>;
|
|
92
129
|
/**
|
|
@@ -94,7 +131,7 @@ export declare const getEnvelopeEnv: ({ api, context, env, key, raw, scope, site
|
|
|
94
131
|
* @param scopes An array of scopes
|
|
95
132
|
* @returns A human-readable, comma-separated list of scopes
|
|
96
133
|
*/
|
|
97
|
-
export declare const getHumanReadableScopes: (scopes?:
|
|
134
|
+
export declare const getHumanReadableScopes: (scopes?: EnvelopeEnvVarScope[]) => string;
|
|
98
135
|
/**
|
|
99
136
|
* Translates a Mongo env into an Envelope env
|
|
100
137
|
* @param env The site's env as it exists in Mongo
|
|
@@ -102,9 +139,9 @@ export declare const getHumanReadableScopes: (scopes?: (EnvironmentVariableScope
|
|
|
102
139
|
*/
|
|
103
140
|
export declare const translateFromMongoToEnvelope: (env?: Record<string, string>) => {
|
|
104
141
|
key: string;
|
|
105
|
-
scopes:
|
|
142
|
+
scopes: readonly ["builds", "functions", "runtime", "post_processing"];
|
|
106
143
|
values: {
|
|
107
|
-
context:
|
|
144
|
+
context: "all";
|
|
108
145
|
value: string;
|
|
109
146
|
}[];
|
|
110
147
|
}[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/env/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/env/index.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/env/index.js
CHANGED
|
@@ -1,32 +1,53 @@
|
|
|
1
1
|
import { logAndThrowError } from '../command-helpers.js';
|
|
2
|
-
export const AVAILABLE_CONTEXTS = ['all', 'production', 'deploy-preview', 'branch-deploy', 'dev'];
|
|
3
|
-
export const AVAILABLE_SCOPES = ['builds', 'functions', 'runtime', 'post_processing'];
|
|
4
2
|
/**
|
|
5
|
-
*
|
|
6
|
-
*
|
|
3
|
+
* Supported values for the user-provided env `context` option.
|
|
4
|
+
* These all match possible `context` values returned by the Envelope API.
|
|
5
|
+
* Note that a user may also specify a branch name with the special `branch:my-branch-name` format.
|
|
6
|
+
*/
|
|
7
|
+
export const SUPPORTED_CONTEXTS = ['all', 'production', 'deploy-preview', 'branch-deploy', 'dev'];
|
|
8
|
+
/**
|
|
9
|
+
* Additional aliases for the user-provided env `context` option.
|
|
10
|
+
*/
|
|
11
|
+
const SUPPORTED_CONTEXT_ALIASES = {
|
|
12
|
+
dp: 'deploy-preview',
|
|
13
|
+
prod: 'production',
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* Supported values for the user-provided env `scope` option.
|
|
17
|
+
* These exactly match possible `scope` values returned by the Envelope API.
|
|
18
|
+
* Note that `any` is also supported.
|
|
19
|
+
*/
|
|
20
|
+
export const ALL_ENVELOPE_SCOPES = ['builds', 'functions', 'runtime', 'post_processing'];
|
|
21
|
+
/**
|
|
22
|
+
* Normalizes a user-provided "context". Note that this may be the special `branch:my-branch-name` format.
|
|
23
|
+
*
|
|
24
|
+
* - If this is a supported alias of a context, it will be normalized to the canonical context.
|
|
25
|
+
* - Valid canonical contexts are returned as is.
|
|
26
|
+
* - If this starts with `branch:`, it will be normalized to the branch name.
|
|
27
|
+
*
|
|
28
|
+
* @param context A user-provided context, context alias, or a string in the `branch:my-branch-name` format.
|
|
29
|
+
*
|
|
30
|
+
* @returns The normalized context name or just the branch name
|
|
7
31
|
*/
|
|
8
32
|
export const normalizeContext = (context) => {
|
|
9
33
|
if (!context) {
|
|
10
34
|
return context;
|
|
11
35
|
}
|
|
12
|
-
const CONTEXT_SYNONYMS = {
|
|
13
|
-
dp: 'deploy-preview',
|
|
14
|
-
prod: 'production',
|
|
15
|
-
};
|
|
16
36
|
context = context.toLowerCase();
|
|
17
|
-
if (context in
|
|
18
|
-
context =
|
|
37
|
+
if (context in SUPPORTED_CONTEXT_ALIASES) {
|
|
38
|
+
context = SUPPORTED_CONTEXT_ALIASES[context];
|
|
19
39
|
}
|
|
20
|
-
const forbiddenContexts =
|
|
40
|
+
const forbiddenContexts = SUPPORTED_CONTEXTS.map((ctx) => `branch:${ctx}`);
|
|
21
41
|
if (forbiddenContexts.includes(context)) {
|
|
22
42
|
return logAndThrowError(`The context ${context} includes a reserved keyword and is not allowed`);
|
|
23
43
|
}
|
|
24
44
|
return context.replace(/^branch:/, '');
|
|
25
45
|
};
|
|
26
46
|
/**
|
|
27
|
-
* Finds a matching environment variable value
|
|
47
|
+
* Finds a matching environment variable value for a given context
|
|
48
|
+
* @private
|
|
28
49
|
*/
|
|
29
|
-
export const
|
|
50
|
+
export const getValueForContext = (
|
|
30
51
|
/**
|
|
31
52
|
* An array of environment variable values from Envelope
|
|
32
53
|
*/
|
|
@@ -34,13 +55,20 @@ values,
|
|
|
34
55
|
/**
|
|
35
56
|
* The deploy context or branch of the environment variable value
|
|
36
57
|
*/
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
58
|
+
contextOrBranch) => {
|
|
59
|
+
const isSupportedContext = SUPPORTED_CONTEXTS.includes(contextOrBranch);
|
|
60
|
+
if (!isSupportedContext) {
|
|
61
|
+
const valueMatchingAsBranch = values.find((val) => val.context_parameter === contextOrBranch);
|
|
62
|
+
// This is a `branch` context, which is an override, so it takes precedence
|
|
63
|
+
if (valueMatchingAsBranch != null) {
|
|
64
|
+
return valueMatchingAsBranch;
|
|
65
|
+
}
|
|
66
|
+
const valueMatchingContext = values.find((val) => val.context === 'all' || val.context === 'branch-deploy');
|
|
67
|
+
return valueMatchingContext ?? undefined;
|
|
41
68
|
}
|
|
42
|
-
|
|
43
|
-
|
|
69
|
+
const valueMatchingAsContext = values.find((val) => val.context === 'all' || val.context === contextOrBranch);
|
|
70
|
+
return valueMatchingAsContext ?? undefined;
|
|
71
|
+
};
|
|
44
72
|
/**
|
|
45
73
|
* Finds environment variables that match a given source
|
|
46
74
|
* @param env - The dictionary of environment variables
|
|
@@ -48,7 +76,6 @@ context) => values.find((val) => {
|
|
|
48
76
|
* @returns The dictionary of env vars that match the given source
|
|
49
77
|
*/
|
|
50
78
|
export const filterEnvBySource = (env, source) => Object.fromEntries(Object.entries(env).filter(([, variable]) => variable.sources[0] === source));
|
|
51
|
-
// Fetches data from Envelope
|
|
52
79
|
const fetchEnvelopeItems = async function ({ accountId, api, key, siteId, }) {
|
|
53
80
|
if (accountId === undefined) {
|
|
54
81
|
return [];
|
|
@@ -57,10 +84,12 @@ const fetchEnvelopeItems = async function ({ accountId, api, key, siteId, }) {
|
|
|
57
84
|
// if a single key is passed, fetch that single env var
|
|
58
85
|
if (key) {
|
|
59
86
|
const envelopeItem = await api.getEnvVar({ accountId, key, siteId });
|
|
87
|
+
// See FIXME(serhalp) above
|
|
60
88
|
return [envelopeItem];
|
|
61
89
|
}
|
|
62
90
|
// otherwise, fetch the entire list of env vars
|
|
63
91
|
const envelopeItems = await api.getEnvVars({ accountId, siteId });
|
|
92
|
+
// See FIXME(serhalp) above
|
|
64
93
|
return envelopeItems;
|
|
65
94
|
}
|
|
66
95
|
catch {
|
|
@@ -94,22 +123,22 @@ const fetchEnvelopeItems = async function ({ accountId, api, key, siteId, }) {
|
|
|
94
123
|
*/
|
|
95
124
|
export const formatEnvelopeData = ({ context = 'dev', envelopeItems = [], scope = 'any', source, }) => envelopeItems
|
|
96
125
|
// filter by context
|
|
97
|
-
.filter(({ values }) => Boolean(
|
|
126
|
+
.filter(({ values }) => Boolean(getValueForContext(values, context)))
|
|
98
127
|
// filter by scope
|
|
99
128
|
.filter(({ scopes }) => (scope === 'any' ? true : scopes.includes(scope)))
|
|
100
129
|
// sort alphabetically, case insensitive
|
|
101
130
|
.sort((left, right) => (left.key.toLowerCase() < right.key.toLowerCase() ? -1 : 1))
|
|
102
131
|
// format the data
|
|
103
132
|
.reduce((acc, cur) => {
|
|
104
|
-
const val =
|
|
133
|
+
const val = getValueForContext(cur.values, context);
|
|
105
134
|
if (val === undefined) {
|
|
106
135
|
throw new TypeError(`failed to locate environment variable value for ${context} context`);
|
|
107
136
|
}
|
|
108
|
-
const { context:
|
|
137
|
+
const { context: itemContext, context_parameter: branch, value } = val;
|
|
109
138
|
return {
|
|
110
139
|
...acc,
|
|
111
140
|
[cur.key]: {
|
|
112
|
-
context:
|
|
141
|
+
context: itemContext,
|
|
113
142
|
branch,
|
|
114
143
|
scopes: cur.scopes,
|
|
115
144
|
sources: [source],
|
|
@@ -171,6 +200,8 @@ export const getHumanReadableScopes = (scopes) => {
|
|
|
171
200
|
functions: HUMAN_SCOPES[1],
|
|
172
201
|
runtime: HUMAN_SCOPES[2],
|
|
173
202
|
post_processing: HUMAN_SCOPES[3],
|
|
203
|
+
// TODO(serhalp) I believe this isn't needed, as `post-processing` is a user-provided
|
|
204
|
+
// CLI option, not a scope returned by the Envelope API.
|
|
174
205
|
'post-processing': HUMAN_SCOPES[3],
|
|
175
206
|
};
|
|
176
207
|
if (!scopes) {
|
|
@@ -192,7 +223,7 @@ export const getHumanReadableScopes = (scopes) => {
|
|
|
192
223
|
export const translateFromMongoToEnvelope = (env = {}) => {
|
|
193
224
|
const envVars = Object.entries(env).map(([key, value]) => ({
|
|
194
225
|
key,
|
|
195
|
-
scopes:
|
|
226
|
+
scopes: ALL_ENVELOPE_SCOPES,
|
|
196
227
|
values: [
|
|
197
228
|
{
|
|
198
229
|
context: 'all',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/env/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/env/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ interface InspectSettings {
|
|
|
12
12
|
}
|
|
13
13
|
export declare const generateInspectSettings: (edgeInspect: boolean | string, edgeInspectBrk: boolean | string) => InspectSettings;
|
|
14
14
|
export declare const startProxyServer: ({ accountId, addonsUrls, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }: {
|
|
15
|
-
accountId: string;
|
|
15
|
+
accountId: string | undefined;
|
|
16
16
|
addonsUrls: $TSFixMe;
|
|
17
17
|
api?: NetlifyOptions["api"];
|
|
18
18
|
blobsContext?: BlobsContextWithEdgeAccess;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,6BAA6B,CAAA;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAA;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAErE,OAAO,EAA4B,KAAK,4BAA4B,EAAE,MAAM,sBAAsB,CAAA;AAElG,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,UAAU,eAAe;IAEvB,OAAO,EAAE,OAAO,CAAA;IAEhB,KAAK,EAAE,OAAO,CAAA;IAEd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,uBAAuB,GAClC,aAAa,OAAO,GAAG,MAAM,EAC7B,gBAAgB,OAAO,GAAG,MAAM,KAC/B,eAiBF,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAU,uQAuBpC;IACD,SAAS,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,6BAA6B,CAAA;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAA;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAErE,OAAO,EAA4B,KAAK,4BAA4B,EAAE,MAAM,sBAAsB,CAAA;AAElG,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,UAAU,eAAe;IAEvB,OAAO,EAAE,OAAO,CAAA;IAEhB,KAAK,EAAE,OAAO,CAAA;IAEd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,uBAAuB,GAClC,aAAa,OAAO,GAAG,MAAM,EAC7B,gBAAgB,OAAO,GAAG,MAAM,KAC/B,eAiBF,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAU,uQAuBpC;IACD,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,UAAU,EAAE,QAAQ,CAAA;IACpB,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAA;IAC3B,YAAY,CAAC,EAAE,0BAA0B,CAAA;IACzC,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,4BAA4B,CAAA;IAEpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,OAAO,CAAA;IACd,oBAAoB,EAAE,OAAO,CAAA;IAC7B,GAAG,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAA;IAC1C,eAAe,EAAE,eAAe,CAAA;IAChC,gBAAgB,EAAE,MAAM,OAAO,CAAC,4BAA4B,CAAC,CAAA;IAC7D,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,cAAc,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,QAAQ,CAAA;IACd,QAAQ,EAAE,QAAQ,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,QAAQ,CAAA;IACf,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CACtC,oBA8BA,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"temporary-file.d.ts","sourceRoot":"","sources":["../../src/utils/temporary-file.ts"],"names":[],"mappings":"AASA,wBAAgB,aAAa,CAAC,EAAE,SAAS,EAAE,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,MAAM,CAIhF;AAED,wBAAgB,kBAAkB,CAAC,EAAE,MAAW,EAAE;;CAAK,GAAG,MAAM,CAG/D"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import * as path from 'node:path';
|
|
2
|
+
import * as os from 'node:os';
|
|
3
|
+
import * as crypto from 'node:crypto';
|
|
4
|
+
import * as fs from 'node:fs';
|
|
5
|
+
const uniqueString = () => crypto.randomBytes(8).toString('hex');
|
|
6
|
+
const tempDir = os.tmpdir();
|
|
7
|
+
export function temporaryFile({ extension } = {}) {
|
|
8
|
+
const baseName = uniqueString();
|
|
9
|
+
const ext = extension ? '.' + extension.replace(/^\./, '') : '';
|
|
10
|
+
return path.join(tempDir, baseName + ext);
|
|
11
|
+
}
|
|
12
|
+
export function temporaryDirectory({ prefix = '' } = {}) {
|
|
13
|
+
const directory = fs.mkdtempSync(`${tempDir}${path.sep}${prefix}`);
|
|
14
|
+
return directory;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=temporary-file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"temporary-file.js","sourceRoot":"","sources":["../../src/utils/temporary-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAA;AAC7B,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAA;AAE7B,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAEhE,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,EAAE,CAAA;AAE3B,MAAM,UAAU,aAAa,CAAC,EAAE,SAAS,KAA6B,EAAE;IACtE,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAA;IAC/B,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC/D,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,GAAG,CAAC,CAAA;AAC3C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,EAAE;IACrD,MAAM,SAAS,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,OAAO,GAAG,IAAI,CAAC,GAAG,GAAG,MAAM,EAAE,CAAC,CAAA;IAClE,OAAO,SAAS,CAAA;AAClB,CAAC"}
|