netlify-cli 17.21.2 → 17.22.1

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.
Files changed (39) hide show
  1. package/dist/commands/deploy/deploy.d.ts.map +1 -1
  2. package/dist/commands/deploy/deploy.js +2 -3
  3. package/dist/commands/dev/dev.d.ts.map +1 -1
  4. package/dist/commands/dev/dev.js +4 -2
  5. package/dist/commands/functions/functions-serve.js +2 -2
  6. package/dist/commands/serve/index.d.ts.map +1 -1
  7. package/dist/commands/serve/index.js +1 -0
  8. package/dist/commands/serve/serve.d.ts.map +1 -1
  9. package/dist/commands/serve/serve.js +14 -5
  10. package/dist/lib/blobs/blobs.d.ts +16 -5
  11. package/dist/lib/blobs/blobs.d.ts.map +1 -1
  12. package/dist/lib/blobs/blobs.js +25 -7
  13. package/dist/lib/build.d.ts +2 -2
  14. package/dist/lib/build.d.ts.map +1 -1
  15. package/dist/lib/build.js +2 -2
  16. package/dist/lib/edge-functions/bootstrap.d.ts +2 -1
  17. package/dist/lib/edge-functions/bootstrap.d.ts.map +1 -1
  18. package/dist/lib/edge-functions/bootstrap.js +18 -2
  19. package/dist/lib/edge-functions/proxy.d.ts +2 -2
  20. package/dist/lib/edge-functions/proxy.d.ts.map +1 -1
  21. package/dist/lib/edge-functions/proxy.js +1 -7
  22. package/dist/lib/functions/netlify-function.d.ts.map +1 -1
  23. package/dist/lib/spinner.d.ts +7 -17
  24. package/dist/lib/spinner.d.ts.map +1 -1
  25. package/dist/lib/spinner.js +0 -14
  26. package/dist/tsconfig.tsbuildinfo +1 -1
  27. package/dist/utils/framework-server.d.ts.map +1 -1
  28. package/dist/utils/framework-server.js +0 -2
  29. package/dist/utils/proxy-server.d.ts +4 -3
  30. package/dist/utils/proxy-server.d.ts.map +1 -1
  31. package/dist/utils/proxy-server.js +2 -1
  32. package/dist/utils/proxy.d.ts +2 -1
  33. package/dist/utils/proxy.d.ts.map +1 -1
  34. package/dist/utils/proxy.js +29 -23
  35. package/dist/utils/run-build.d.ts +4 -5
  36. package/dist/utils/run-build.d.ts.map +1 -1
  37. package/dist/utils/run-build.js +1 -5
  38. package/npm-shrinkwrap.json +305 -224
  39. package/package.json +4 -3
@@ -1 +1 @@
1
- {"version":3,"file":"framework-server.d.ts","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAK3C,UAAU,iBAAiB;IACzB,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CAClB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB;SAI1B,MAAM;cACD,cAAc;MACtB,QAAQ,iBAAiB,CAqD5B,CAAA"}
1
+ {"version":3,"file":"framework-server.d.ts","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAK3C,UAAU,iBAAiB;IACzB,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CAClB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB;SAI1B,MAAM;cACD,cAAc;MACtB,QAAQ,iBAAiB,CAmD5B,CAAA"}
@@ -43,11 +43,9 @@ export const startFrameworkServer = async function ({ cwd, settings, }) {
43
43
  throw new Error(`Timed out waiting for port '${settings.frameworkPort}' to be open`);
44
44
  }
45
45
  }
46
- // @ts-expect-error TS(2345) FIXME: Argument of type '{ error: boolean; spinner: Ora; ... Remove this comment to see the full error message
47
46
  stopSpinner({ error: false, spinner });
48
47
  }
49
48
  catch (error_) {
50
- // @ts-expect-error TS(2345) FIXME: Argument of type '{ error: boolean; spinner: Ora; ... Remove this comment to see the full error message
51
49
  stopSpinner({ error: true, spinner });
52
50
  log(NETLIFYDEVERR, `Netlify Dev could not start or connect to localhost:${settings.frameworkPort}.`);
53
51
  log(NETLIFYDEVERR, `Please make sure your framework server is running on port ${settings.frameworkPort}`);
@@ -1,6 +1,6 @@
1
1
  import BaseCommand from '../commands/base-command.js';
2
2
  import { $TSFixMe, NetlifyOptions } from '../commands/types.js';
3
- import { BlobsContext } from '../lib/blobs/blobs.js';
3
+ import { BlobsContextWithEdgeAccess } from '../lib/blobs/blobs.js';
4
4
  import { FunctionsRegistry } from '../lib/functions/registry.js';
5
5
  import type StateConfig from './state-config.js';
6
6
  import { ServerSettings } from './types.js';
@@ -10,14 +10,15 @@ interface InspectSettings {
10
10
  address?: string;
11
11
  }
12
12
  export declare const generateInspectSettings: (edgeInspect: boolean | string, edgeInspectBrk: boolean | string) => InspectSettings;
13
- export declare const startProxyServer: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }: {
13
+ export declare const startProxyServer: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }: {
14
14
  accountId: string;
15
15
  addonsUrls: $TSFixMe;
16
- blobsContext?: BlobsContext | undefined;
16
+ blobsContext?: BlobsContextWithEdgeAccess | undefined;
17
17
  command: BaseCommand;
18
18
  config: NetlifyOptions['config'];
19
19
  configPath?: string | undefined;
20
20
  debug: boolean;
21
+ disableEdgeFunctions: boolean;
21
22
  env: NetlifyOptions['cachedConfig']['env'];
22
23
  inspectSettings: InspectSettings;
23
24
  getUpdatedConfig: () => Promise<object>;
@@ -1 +1 @@
1
- {"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAIhE,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,UAAU,eAAe;IAEvB,OAAO,EAAE,OAAO,CAAA;IAEhB,KAAK,EAAE,OAAO,CAAA;IAEd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,uBAAuB,gBACrB,OAAO,GAAG,MAAM,kBACb,OAAO,GAAG,MAAM,KAC/B,eAiBF,CAAA;AAED,eAAO,MAAM,gBAAgB;eAsBhB,MAAM;gBACL,QAAQ;;aAEX,WAAW;YACZ,cAAc,CAAC,QAAQ,CAAC;;WAGzB,OAAO;SACT,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;qBACzB,eAAe;sBACd,MAAM,QAAQ,MAAM,CAAC;qBACtB,MAAM;gBACX,MAAM;cACR,cAAc;aACf,OAAO;UACV,QAAQ;cACJ,QAAQ;gBACN,MAAM;;WAEX,WAAW;;qBA8BnB,CAAA"}
1
+ {"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAIhE,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,UAAU,eAAe;IAEvB,OAAO,EAAE,OAAO,CAAA;IAEhB,KAAK,EAAE,OAAO,CAAA;IAEd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,uBAAuB,gBACrB,OAAO,GAAG,MAAM,kBACb,OAAO,GAAG,MAAM,KAC/B,eAiBF,CAAA;AAED,eAAO,MAAM,gBAAgB;eAuBhB,MAAM;gBACL,QAAQ;;aAEX,WAAW;YACZ,cAAc,CAAC,QAAQ,CAAC;;WAGzB,OAAO;0BACQ,OAAO;SACxB,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;qBACzB,eAAe;sBACd,MAAM,QAAQ,MAAM,CAAC;qBACtB,MAAM;gBACX,MAAM;cACR,cAAc;aACf,OAAO;UACV,QAAQ;cACJ,QAAQ;gBACN,MAAM;;WAEX,WAAW;;qBA+BnB,CAAA"}
@@ -17,7 +17,7 @@ export const generateInspectSettings = (edgeInspect, edgeInspectBrk) => {
17
17
  address: getAddress(),
18
18
  };
19
19
  };
20
- export const startProxyServer = async ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }) => {
20
+ export const startProxyServer = async ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }) => {
21
21
  const url = await startProxy({
22
22
  addonsUrls,
23
23
  blobsContext,
@@ -25,6 +25,7 @@ export const startProxyServer = async ({ accountId, addonsUrls, blobsContext, co
25
25
  config,
26
26
  configPath: configPath || site.configPath,
27
27
  debug,
28
+ disableEdgeFunctions,
28
29
  env,
29
30
  functionsRegistry,
30
31
  geolocationMode,
@@ -2,8 +2,9 @@ import { BaseCommand } from '../commands/index.js';
2
2
  import { $TSFixMe } from '../commands/types.js';
3
3
  import { ServerSettings } from './types.js';
4
4
  export declare const getProxyUrl: (settings: Pick<ServerSettings, 'https' | 'port'>) => string;
5
- export declare const startProxy: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }: {
5
+ export declare const startProxy: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }: {
6
6
  command: BaseCommand;
7
7
  settings: ServerSettings;
8
+ disableEdgeFunctions: boolean;
8
9
  } & Record<string, any>) => Promise<string>;
9
10
  //# sourceMappingURL=proxy.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAkB/C,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAutB9D,eAAO,MAAM,WAAW,aAAuB,KAAK,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAED,eAAO,MAAM,UAAU;aAoBT,WAAW;cAAY,cAAc;2CA2FlD,CAAA"}
1
+ {"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAkB/C,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AA0tB9D,eAAO,MAAM,WAAW,aAAuB,KAAK,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU;aAqBT,WAAW;cAAY,cAAc;0BAAwB,OAAO;2CAoGjF,CAAA"}
@@ -531,7 +531,7 @@ const onRequest = async ({ addonsUrls, edgeFunctionsProxy, env, functionsRegistr
531
531
  if (isImageRequest(req)) {
532
532
  return imageProxy(req, res);
533
533
  }
534
- const edgeFunctionsProxyURL = await edgeFunctionsProxy(req, res);
534
+ const edgeFunctionsProxyURL = await edgeFunctionsProxy?.(req);
535
535
  if (edgeFunctionsProxyURL !== undefined) {
536
536
  return proxy.web(req, res, { target: edgeFunctionsProxyURL });
537
537
  }
@@ -593,30 +593,36 @@ export const getProxyUrl = function (settings) {
593
593
  const scheme = settings.https ? 'https' : 'http';
594
594
  return `${scheme}://localhost:${settings.port}`;
595
595
  };
596
- export const startProxy = async function ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }) {
596
+ export const startProxy = async function ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }) {
597
597
  const secondaryServerPort = settings.https ? await getAvailablePort() : null;
598
598
  const functionsServer = settings.functionsPort ? `http://127.0.0.1:${settings.functionsPort}` : null;
599
- const edgeFunctionsProxy = await initializeEdgeFunctionsProxy({
600
- command,
601
- blobsContext,
602
- config,
603
- configPath,
604
- debug,
605
- env,
606
- geolocationMode,
607
- geoCountry,
608
- getUpdatedConfig,
609
- inspectSettings,
610
- mainPort: settings.port,
611
- offline,
612
- passthroughPort: secondaryServerPort || settings.port,
613
- settings,
614
- projectDir,
615
- repositoryRoot,
616
- siteInfo,
617
- accountId,
618
- state,
619
- });
599
+ let edgeFunctionsProxy;
600
+ if (disableEdgeFunctions) {
601
+ log(NETLIFYDEVWARN, 'Edge functions are disabled. Run without the --internal-disable-edge-functions flag to enable them.');
602
+ }
603
+ else {
604
+ edgeFunctionsProxy = await initializeEdgeFunctionsProxy({
605
+ command,
606
+ blobsContext,
607
+ config,
608
+ configPath,
609
+ debug,
610
+ env,
611
+ geolocationMode,
612
+ geoCountry,
613
+ getUpdatedConfig,
614
+ inspectSettings,
615
+ mainPort: settings.port,
616
+ offline,
617
+ passthroughPort: secondaryServerPort || settings.port,
618
+ settings,
619
+ projectDir,
620
+ repositoryRoot,
621
+ siteInfo,
622
+ accountId,
623
+ state,
624
+ });
625
+ }
620
626
  const imageProxy = await initializeImageProxy({
621
627
  config,
622
628
  settings,
@@ -22,7 +22,8 @@ export declare const runNetlifyBuild: ({ command, env, options, settings, timeli
22
22
  configMutations: any;
23
23
  configPath?: undefined;
24
24
  }>;
25
- export declare const runDevTimeline: (options: Omit<Parameters<typeof runNetlifyBuild>[0], 'timeline'>) => Promise<{
25
+ type RunTimelineOptions = Omit<Parameters<typeof runNetlifyBuild>[0], 'timeline'>;
26
+ export declare const runDevTimeline: (options: RunTimelineOptions) => Promise<{
26
27
  configPath?: undefined;
27
28
  configMutations?: undefined;
28
29
  } | {
@@ -32,10 +33,7 @@ export declare const runDevTimeline: (options: Omit<Parameters<typeof runNetlify
32
33
  configMutations: any;
33
34
  configPath?: undefined;
34
35
  }>;
35
- /**
36
- * @param {Omit<Parameters<typeof runNetlifyBuild>[0], 'timeline'>} options
37
- */
38
- export declare const runBuildTimeline: (options: any) => Promise<{
36
+ export declare const runBuildTimeline: (options: RunTimelineOptions) => Promise<{
39
37
  configPath?: undefined;
40
38
  configMutations?: undefined;
41
39
  } | {
@@ -45,4 +43,5 @@ export declare const runBuildTimeline: (options: any) => Promise<{
45
43
  configMutations: any;
46
44
  configPath?: undefined;
47
45
  }>;
46
+ export {};
48
47
  //# sourceMappingURL=run-build.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"run-build.d.ts","sourceRoot":"","sources":["../../src/utils/run-build.ts"],"names":[],"mappings":";;;;;AAGA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAS/C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAqC3C,eAAO,MAAM,eAAe;aAOjB,WAAW;aAEX,QAAQ;cACP,cAAc;SACnB,OAAO,UAAU;cACZ,OAAO,GAAG,KAAK;;;;;;;;;;EAsG1B,CAAA;AAED,eAAO,MAAM,cAAc,YAAa,KAAK,WAAW,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC;;;;;;;;;EAC7C,CAAA;AAElD;;GAEG;AAEH,eAAO,MAAM,gBAAgB;;;;;;;;;EAAkE,CAAA"}
1
+ {"version":3,"file":"run-build.d.ts","sourceRoot":"","sources":["../../src/utils/run-build.ts"],"names":[],"mappings":";;;;;AAGA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAS/C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAqC3C,eAAO,MAAM,eAAe;aAOjB,WAAW;aAEX,QAAQ;cACP,cAAc;SACnB,OAAO,UAAU;cACZ,OAAO,GAAG,KAAK;;;;;;;;;;EAsG1B,CAAA;AAED,KAAK,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;AAEjF,eAAO,MAAM,cAAc,YAAa,kBAAkB;;;;;;;;;EAAqD,CAAA;AAE/G,eAAO,MAAM,gBAAgB,YAAa,kBAAkB;;;;;;;;;EAAuD,CAAA"}
@@ -57,7 +57,7 @@ export const runNetlifyBuild = async ({ command, env = {}, options, settings, ti
57
57
  cwd: cachedConfig.buildDir,
58
58
  quiet: options.quiet,
59
59
  saveConfig: options.saveConfig,
60
- edgeFunctionsBootstrapURL: getBootstrapURL(),
60
+ edgeFunctionsBootstrapURL: await getBootstrapURL(),
61
61
  };
62
62
  const devCommand = async (settingsOverrides = {}) => {
63
63
  let cwd = command.workingDir;
@@ -121,8 +121,4 @@ export const runNetlifyBuild = async ({ command, env = {}, options, settings, ti
121
121
  return { configMutations };
122
122
  };
123
123
  export const runDevTimeline = (options) => runNetlifyBuild({ ...options, timeline: 'dev' });
124
- /**
125
- * @param {Omit<Parameters<typeof runNetlifyBuild>[0], 'timeline'>} options
126
- */
127
- // @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
128
124
  export const runBuildTimeline = (options) => runNetlifyBuild({ ...options, timeline: 'build' });