netlify-cli 20.1.0 → 20.1.1-pre.f4a9e6a
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/bin/run.js +1 -0
- package/dist/commands/api/index.js +1 -1
- package/dist/commands/api/index.js.map +1 -1
- package/dist/commands/blobs/blobs.d.ts.map +1 -1
- package/dist/commands/blobs/blobs.js +7 -0
- package/dist/commands/blobs/blobs.js.map +1 -1
- package/dist/commands/build/index.d.ts.map +1 -1
- package/dist/commands/build/index.js +7 -0
- package/dist/commands/build/index.js.map +1 -1
- package/dist/commands/completion/index.js +1 -1
- package/dist/commands/completion/index.js.map +1 -1
- package/dist/commands/database/constants.d.ts +3 -0
- package/dist/commands/database/constants.d.ts.map +1 -0
- package/dist/commands/database/constants.js +3 -0
- package/dist/commands/database/constants.js.map +1 -0
- package/dist/commands/database/database.d.ts +18 -0
- package/dist/commands/database/database.d.ts.map +1 -0
- package/dist/commands/database/database.js +20 -0
- package/dist/commands/database/database.js.map +1 -0
- package/dist/commands/database/drizzle.d.ts +3 -0
- package/dist/commands/database/drizzle.d.ts.map +1 -0
- package/dist/commands/database/drizzle.js +109 -0
- package/dist/commands/database/drizzle.js.map +1 -0
- package/dist/commands/database/index.d.ts +2 -0
- package/dist/commands/database/index.d.ts.map +1 -0
- package/dist/commands/database/index.js +2 -0
- package/dist/commands/database/index.js.map +1 -0
- package/dist/commands/database/init.d.ts +4 -0
- package/dist/commands/database/init.d.ts.map +1 -0
- package/dist/commands/database/init.js +111 -0
- package/dist/commands/database/init.js.map +1 -0
- package/dist/commands/database/status.d.ts +4 -0
- package/dist/commands/database/status.d.ts.map +1 -0
- package/dist/commands/database/status.js +71 -0
- package/dist/commands/database/status.js.map +1 -0
- package/dist/commands/database/utils.d.ts +67 -0
- package/dist/commands/database/utils.d.ts.map +1 -0
- package/dist/commands/database/utils.js +140 -0
- package/dist/commands/database/utils.js.map +1 -0
- package/dist/commands/deploy/deploy.d.ts.map +1 -1
- package/dist/commands/deploy/deploy.js +2 -2
- 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 +22 -4
- package/dist/commands/deploy/index.js.map +1 -1
- package/dist/commands/dev/dev.d.ts.map +1 -1
- package/dist/commands/dev/dev.js +3 -4
- package/dist/commands/dev/dev.js.map +1 -1
- package/dist/commands/dev/index.d.ts.map +1 -1
- package/dist/commands/dev/index.js +7 -0
- package/dist/commands/dev/index.js.map +1 -1
- package/dist/commands/dev-exec/dev-exec.d.ts.map +1 -1
- package/dist/commands/dev-exec/dev-exec.js +0 -1
- package/dist/commands/dev-exec/dev-exec.js.map +1 -1
- package/dist/commands/env/env-unset.js.map +1 -1
- package/dist/commands/env/env.d.ts.map +1 -1
- package/dist/commands/env/env.js +7 -0
- package/dist/commands/env/env.js.map +1 -1
- package/dist/commands/functions/functions-create.js +1 -1
- package/dist/commands/functions/functions-create.js.map +1 -1
- package/dist/commands/functions/functions-serve.js +1 -1
- package/dist/commands/functions/functions-serve.js.map +1 -1
- package/dist/commands/functions/functions.d.ts.map +1 -1
- package/dist/commands/functions/functions.js +7 -0
- package/dist/commands/functions/functions.js.map +1 -1
- package/dist/commands/init/index.d.ts.map +1 -1
- package/dist/commands/init/index.js +7 -0
- package/dist/commands/init/index.js.map +1 -1
- package/dist/commands/init/init.js +1 -1
- package/dist/commands/link/index.d.ts.map +1 -1
- package/dist/commands/link/index.js +7 -0
- package/dist/commands/link/index.js.map +1 -1
- package/dist/commands/login/index.d.ts.map +1 -1
- package/dist/commands/login/index.js +7 -0
- package/dist/commands/login/index.js.map +1 -1
- package/dist/commands/logout/logout.d.ts +1 -1
- package/dist/commands/logout/logout.d.ts.map +1 -1
- package/dist/commands/logout/logout.js +1 -1
- package/dist/commands/logout/logout.js.map +1 -1
- package/dist/commands/logs/build.d.ts +1 -1
- package/dist/commands/logs/build.d.ts.map +1 -1
- package/dist/commands/logs/build.js +1 -1
- package/dist/commands/logs/build.js.map +1 -1
- package/dist/commands/main.d.ts.map +1 -1
- package/dist/commands/main.js +14 -10
- package/dist/commands/main.js.map +1 -1
- package/dist/commands/open/open-site.d.ts +1 -1
- package/dist/commands/open/open-site.d.ts.map +1 -1
- package/dist/commands/open/open-site.js +1 -1
- package/dist/commands/open/open-site.js.map +1 -1
- package/dist/commands/serve/serve.js +1 -1
- package/dist/commands/serve/serve.js.map +1 -1
- package/dist/commands/sites/sites.js +1 -1
- package/dist/commands/sites/sites.js.map +1 -1
- package/dist/commands/switch/switch.d.ts +1 -1
- package/dist/commands/switch/switch.d.ts.map +1 -1
- package/dist/commands/switch/switch.js +1 -1
- package/dist/commands/switch/switch.js.map +1 -1
- package/dist/commands/unlink/index.d.ts.map +1 -1
- package/dist/commands/unlink/index.js +7 -0
- package/dist/commands/unlink/index.js.map +1 -1
- package/dist/commands/unlink/unlink.d.ts +1 -1
- package/dist/commands/unlink/unlink.d.ts.map +1 -1
- package/dist/commands/unlink/unlink.js +1 -1
- package/dist/commands/unlink/unlink.js.map +1 -1
- package/dist/lib/functions/registry.d.ts +1 -6
- package/dist/lib/functions/registry.d.ts.map +1 -1
- package/dist/lib/functions/registry.js +3 -16
- package/dist/lib/functions/registry.js.map +1 -1
- package/dist/lib/functions/runtimes/index.d.ts +0 -4
- package/dist/lib/functions/runtimes/index.d.ts.map +1 -1
- package/dist/lib/functions/runtimes/index.js.map +1 -1
- package/dist/lib/functions/runtimes/js/index.d.ts +7 -4
- package/dist/lib/functions/runtimes/js/index.d.ts.map +1 -1
- package/dist/lib/functions/runtimes/js/index.js +0 -24
- package/dist/lib/functions/runtimes/js/index.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/utils/command-helpers.d.ts +1 -1
- package/dist/utils/command-helpers.d.ts.map +1 -1
- package/dist/utils/command-helpers.js +6 -4
- package/dist/utils/command-helpers.js.map +1 -1
- package/dist/utils/{banner.d.ts → dev-server-banner.d.ts} +1 -1
- package/dist/utils/dev-server-banner.d.ts.map +1 -0
- package/dist/utils/dev-server-banner.js +15 -0
- package/dist/utils/dev-server-banner.js.map +1 -0
- package/dist/utils/dev.d.ts +3 -5
- package/dist/utils/dev.d.ts.map +1 -1
- package/dist/utils/dev.js +7 -9
- package/dist/utils/dev.js.map +1 -1
- package/dist/utils/framework-server.d.ts.map +1 -1
- package/dist/utils/framework-server.js +19 -8
- package/dist/utils/framework-server.js.map +1 -1
- package/dist/utils/init/utils.d.ts.map +1 -1
- package/dist/utils/shell.d.ts.map +1 -1
- package/dist/utils/shell.js +4 -9
- package/dist/utils/shell.js.map +1 -1
- package/npm-shrinkwrap.json +51 -68
- package/package.json +6 -6
- package/scripts/postinstall.js +28 -32
- package/dist/lib/functions/runtimes/js/builders/netlify-lambda.d.ts +0 -21
- package/dist/lib/functions/runtimes/js/builders/netlify-lambda.d.ts.map +0 -1
- package/dist/lib/functions/runtimes/js/builders/netlify-lambda.js +0 -65
- package/dist/lib/functions/runtimes/js/builders/netlify-lambda.js.map +0 -1
- package/dist/utils/banner.d.ts.map +0 -1
- package/dist/utils/banner.js +0 -12
- package/dist/utils/banner.js.map +0 -1
|
@@ -14,7 +14,7 @@ export declare const padLeft: (str: any, count: any, filler?: string) => any;
|
|
|
14
14
|
export declare const version: string;
|
|
15
15
|
export declare const USER_AGENT: string;
|
|
16
16
|
export declare const NETLIFY_CYAN: import("chalk").ChalkInstance;
|
|
17
|
-
export declare const
|
|
17
|
+
export declare const NETLIFY_CYAN_HEX = "#28b5ac";
|
|
18
18
|
export declare const NETLIFYDEVLOG: string;
|
|
19
19
|
export declare const NETLIFYDEVWARN: string;
|
|
20
20
|
export declare const NETLIFYDEVERR: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-helpers.d.ts","sourceRoot":"","sources":["../../src/utils/command-helpers.ts"],"names":[],"mappings":"AAOA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAI/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAQzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAmBnD,eAAO,MAAM,KAAK,+BAAqC,CAAA;AAEvD;;;;;;GAMG;AAEH,eAAO,MAAM,OAAO,GAAI,QAAG,EAAE,UAAK,EAAE,eAAY,QAA6C,CAAA;AAO7F,eAAO,MAAM,OAAO,QAAiB,CAAA;AACrC,eAAO,MAAM,UAAU,QAAmE,CAAA;AAK1F,eAAO,MAAM,YAAY,+BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"command-helpers.d.ts","sourceRoot":"","sources":["../../src/utils/command-helpers.ts"],"names":[],"mappings":"AAOA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAI/B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAQzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAmBnD,eAAO,MAAM,KAAK,+BAAqC,CAAA;AAEvD;;;;;;GAMG;AAEH,eAAO,MAAM,OAAO,GAAI,QAAG,EAAE,UAAK,EAAE,eAAY,QAA6C,CAAA;AAO7F,eAAO,MAAM,OAAO,QAAiB,CAAA;AACrC,eAAO,MAAM,UAAU,QAAmE,CAAA;AAK1F,eAAO,MAAM,YAAY,+BAA0B,CAAA;AACnD,eAAO,MAAM,gBAAgB,YAAY,CAAA;AAIzC,eAAO,MAAM,aAAa,QAAyB,CAAA;AACnD,eAAO,MAAM,cAAc,QAA0B,CAAA;AACrD,eAAO,MAAM,aAAa,QAAuB,CAAA;AAEjD,eAAO,MAAM,IAAI,QAA2C,CAAA;AAE5D;;;;;;;GAOG;AAEH,eAAO,MAAM,WAAW,GAAI,YAAO,EAAE,YAAO,QAM3C,CAAA;AAKD,eAAO,MAAM,YAAY,GAAU,kBAGhC;IACD,GAAG,EAAE,UAAU,CAAA;IACf,MAAM,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACvF,oBAwBA,CAAA;AACD;;;;GAIG;AAEH,MAAM,MAAM,UAAU,GAAG,CAAC,MAAM,GAAG,IAAI,EAAE,aAAa,CAAC,CAAA;AAEvD,eAAO,MAAM,QAAQ,GAAU,mBAAmB,MAAM,KAAG,OAAO,CAAC,UAAU,CAkB5E,CAAA;AAMD;;GAEG;AACH,eAAO,MAAM,OAAO,GAAI,UAAS,OAAY,SAI5C,CAAA;AAED,eAAO,MAAM,GAAG,GAAI,gBAAY,EAAE,GAAG,MAAM,MAAM,EAAE,SAOlD,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,gBAAY,EAAE,GAAG,MAAM,MAAM,EAAE,SAIxD,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,IAAI,GAAI,gBAAY,SAGhC,CAAA;AAUD,eAAO,MAAM,gBAAgB,GAAI,SAAS,OAAO,KAAG,KAInD,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,SAAS,OAAO,KAAG,IAS3C,CAAA;AAED,eAAO,MAAM,IAAI,GAAI,aAAQ,KAAG,KAE/B,CAAA;AAED;;;;;;GAMG;AACH,MAAM,MAAM,4BAA4B,GACpC,YAAY,CAAC,QAAQ,CAAC,GACtB,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,GAAG;IACvC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,SAAS,GAAG,eAAe,CAAC,CAAA;CAC1E,CAAC,CAAA;AACN,eAAO,MAAM,eAAe,GAAI,QAAQ,YAAY,CAAC,QAAQ,CAAC,KAAG,4BAKhE,CAAA;AAID,UAAU,qBAAqB;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAC7B,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IACjC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IACpC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;CACrC;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,GACzB,QAAQ,MAAM,GAAG,MAAM,EAAE,EACzB,+CAAyE,qBAAqB,gCA6C/F,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,EAAE,KAAK,MAAM,KAAG,MACK,CAAA;AAEjE,eAAO,MAAM,WAAW,GAAI,KAAK,OAAO,KAAG,GAAG,IAAI,MAAM,CAAC,cAAsC,CAAA;AAE/F,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,OAAO,CAAC,KAAG,KAAK,IAAI,WAAW,CAAC,CAAC,CAA0C,CAAA;AAE1G,eAAO,MAAM,IAAI,YAEhB,CAAA;AAED,MAAM,WAAW,QAAS,SAAQ,KAAK;IACrC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,qBAAa,cAAe,SAAQ,KAAK;IACvC,MAAM,EAAE,MAAM,CAAA;gBAEF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAK5C;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,EAAE,MAAM,MAAM,YAQ9D,CAAA;AAED,eAAO,MAAM,kBAAkB,sFAAsF,CAAA;AACrH,eAAO,MAAM,iBAAiB,mCAAmC,CAAA"}
|
|
@@ -47,10 +47,12 @@ export const USER_AGENT = `${name}/${version} ${platform}-${arch} node-${process
|
|
|
47
47
|
/** A list of base command flags that needs to be sorted down on documentation and on help pages */
|
|
48
48
|
const BASE_FLAGS = new Set(['--debug', '--http-proxy', '--http-proxy-certificate-filename']);
|
|
49
49
|
export const NETLIFY_CYAN = chalk.rgb(40, 180, 170);
|
|
50
|
-
export const
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
export const
|
|
50
|
+
export const NETLIFY_CYAN_HEX = '#28b5ac';
|
|
51
|
+
// TODO(serhalp) I *think* this "dev" naming is a vestige of the predecessor of the CLI? Rename to avoid
|
|
52
|
+
// confusion with `netlify dev` command?
|
|
53
|
+
export const NETLIFYDEVLOG = chalk.greenBright('⬥');
|
|
54
|
+
export const NETLIFYDEVWARN = chalk.yellowBright('⬥');
|
|
55
|
+
export const NETLIFYDEVERR = chalk.redBright('⬥');
|
|
54
56
|
export const BANG = process.platform === 'win32' ? '»' : '›';
|
|
55
57
|
/**
|
|
56
58
|
* Sorts two options so that the base flags are at the bottom of the list
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-helpers.js","sourceRoot":"","sources":["../../src/utils/command-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,GAAG,MAAM,QAAQ,CAAA;AACxB,OAAO,QAAQ,MAAM,oBAAoB,CAAA;AAEzC,OAAO,YAAY,MAAM,eAAe,CAAA;AAExC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAE9D,OAAO,oBAAoB,MAAM,8BAA8B,CAAA;AAC/D,OAAO,iBAAiB,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAIzD,0EAA0E;AAC1E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAClC;;;;;GAKG;AACH,sFAAsF;AACtF,MAAM,SAAS,GAAG,UAAU,QAAQ;IAClC,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,cAAc,GAAG,IAAI,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;QAC9C,OAAO,cAAc,CAAA;IACvB,CAAC;IACD,OAAO,IAAI,KAAK,EAAE,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;AAEvD;;;;;;GAMG;AACH,iFAAiF;AACjF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,MAAM,CAAC,CAAA;AAE7F,MAAM,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAA;AAC5C,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAA;AAErD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,iBAAiB,EAAE,CAAA;AAEnE,MAAM,CAAC,MAAM,OAAO,GAAG,cAAc,CAAA;AACrC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,IAAI,IAAI,OAAO,IAAI,QAAQ,IAAI,IAAI,SAAS,OAAO,CAAC,OAAO,EAAE,CAAA;AAE1F,mGAAmG;AACnG,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,cAAc,EAAE,mCAAmC,CAAC,CAAC,CAAA;AAE5F,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"command-helpers.js","sourceRoot":"","sources":["../../src/utils/command-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-server-banner.d.ts","sourceRoot":"","sources":["../../src/utils/dev-server-banner.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,GAAI,SAAS;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,KAAG,IAatD,CAAA"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import boxen from 'boxen';
|
|
2
|
+
import { chalk, log, NETLIFY_CYAN_HEX } from './command-helpers.js';
|
|
3
|
+
export const printBanner = (options) => {
|
|
4
|
+
log(boxen(`Local dev server ready: ${chalk.inverse.cyan(options.url)}`, {
|
|
5
|
+
padding: 1,
|
|
6
|
+
margin: 1,
|
|
7
|
+
textAlignment: 'center',
|
|
8
|
+
borderStyle: 'round',
|
|
9
|
+
borderColor: NETLIFY_CYAN_HEX,
|
|
10
|
+
// This is an intentional half-width space to work around a unicode padding math bug in boxen
|
|
11
|
+
title: '⬥ ',
|
|
12
|
+
titleAlignment: 'center',
|
|
13
|
+
}));
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=dev-server-banner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dev-server-banner.js","sourceRoot":"","sources":["../../src/utils/dev-server-banner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEnE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAwB,EAAQ,EAAE;IAC5D,GAAG,CACD,KAAK,CAAC,2BAA2B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE;QAClE,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,CAAC;QACT,aAAa,EAAE,QAAQ;QACvB,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,gBAAgB;QAC7B,6FAA6F;QAC7F,KAAK,EAAE,IAAI;QACX,cAAc,EAAE,QAAQ;KACzB,CAAC,CACH,CAAA;AACH,CAAC,CAAA"}
|
package/dist/utils/dev.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { NetlifyAPI } from 'netlify';
|
|
2
|
+
import type { EnvironmentVariables } from './types.js';
|
|
2
3
|
type ApiAccount = Awaited<ReturnType<NetlifyAPI['listAccountsForUser']>>[number];
|
|
3
4
|
type Capabilities = NonNullable<ApiAccount['capabilities']> & {
|
|
4
5
|
background_functions?: {
|
|
@@ -50,19 +51,16 @@ export declare const getSiteInformation: ({ api, offline, site, siteInfo }: {
|
|
|
50
51
|
}>;
|
|
51
52
|
/**
|
|
52
53
|
* @param {{devConfig: any, env: Record<string, { sources: string[], value: string}>, site: any}} param0
|
|
53
|
-
* @returns {Promise<Record<string, { sources: string[], value: string}>>}
|
|
54
54
|
*/
|
|
55
55
|
export declare const getDotEnvVariables: ({ devConfig, env, site }: {
|
|
56
56
|
devConfig: any;
|
|
57
57
|
env: any;
|
|
58
58
|
site: any;
|
|
59
|
-
}) => Promise<
|
|
59
|
+
}) => Promise<EnvironmentVariables>;
|
|
60
60
|
/**
|
|
61
61
|
* Takes a set of environment variables in the format provided by @netlify/config and injects them into `process.env`
|
|
62
|
-
* @param {Record<string, { sources: string[], value: string}>} env
|
|
63
|
-
* @return {void}
|
|
64
62
|
*/
|
|
65
|
-
export declare const injectEnvVariables: (env:
|
|
63
|
+
export declare const injectEnvVariables: (env: EnvironmentVariables) => void;
|
|
66
64
|
export declare const acquirePort: ({ configuredPort, defaultPort, errorMessage, }: {
|
|
67
65
|
configuredPort?: number;
|
|
68
66
|
defaultPort: number;
|
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":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAMzC,OAAO,KAAK,EAAE,oBAAoB,EAAY,MAAM,YAAY,CAAA;AA0ChE,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;;GAEG;AAEH,eAAO,MAAM,kBAAkB,GAAU;;;;CAAwB,KAAG,OAAO,CAAC,oBAAoB,CAqB/F,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAI,KAAK,oBAAoB,KAAG,IAmC9D,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
|
@@ -126,7 +126,6 @@ const getEnvSourceName = (source) => {
|
|
|
126
126
|
};
|
|
127
127
|
/**
|
|
128
128
|
* @param {{devConfig: any, env: Record<string, { sources: string[], value: string}>, site: any}} param0
|
|
129
|
-
* @returns {Promise<Record<string, { sources: string[], value: string}>>}
|
|
130
129
|
*/
|
|
131
130
|
// @ts-expect-error TS(7031) FIXME: Binding element 'devConfig' implicitly has an 'any... Remove this comment to see the full error message
|
|
132
131
|
export const getDotEnvVariables = async ({ devConfig, env, site }) => {
|
|
@@ -149,19 +148,14 @@ export const getDotEnvVariables = async ({ devConfig, env, site }) => {
|
|
|
149
148
|
};
|
|
150
149
|
/**
|
|
151
150
|
* Takes a set of environment variables in the format provided by @netlify/config and injects them into `process.env`
|
|
152
|
-
* @param {Record<string, { sources: string[], value: string}>} env
|
|
153
|
-
* @return {void}
|
|
154
151
|
*/
|
|
155
|
-
// @ts-expect-error TS(7006) FIXME: Parameter 'env' implicitly has an 'any' type.
|
|
156
152
|
export const injectEnvVariables = (env) => {
|
|
153
|
+
const envVarsToLogByUsedSource = {};
|
|
157
154
|
for (const [key, variable] of Object.entries(env)) {
|
|
158
155
|
const existsInProcess = process.env[key] !== undefined;
|
|
159
|
-
// @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
|
|
160
156
|
const [usedSource, ...overriddenSources] = existsInProcess ? ['process', ...variable.sources] : variable.sources;
|
|
161
157
|
const usedSourceName = getEnvSourceName(usedSource);
|
|
162
|
-
// @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
|
|
163
158
|
const isInternal = variable.sources.includes('internal');
|
|
164
|
-
// @ts-expect-error TS(7006) FIXME: Parameter 'source' implicitly has an 'any' type.
|
|
165
159
|
overriddenSources.forEach((source) => {
|
|
166
160
|
const sourceName = getEnvSourceName(source);
|
|
167
161
|
log(chalk.dim(`${NETLIFYDEVLOG} Ignored ${chalk.bold(sourceName)} env var: ${chalk.yellow(key)} (defined in ${usedSourceName})`));
|
|
@@ -169,12 +163,16 @@ export const injectEnvVariables = (env) => {
|
|
|
169
163
|
if (!existsInProcess || isInternal) {
|
|
170
164
|
// Omitting `general` and `internal` env vars to reduce noise in the logs.
|
|
171
165
|
if (usedSource !== 'general' && !isInternal) {
|
|
172
|
-
|
|
166
|
+
envVarsToLogByUsedSource[usedSource] ??= [];
|
|
167
|
+
envVarsToLogByUsedSource[usedSource].push(key);
|
|
173
168
|
}
|
|
174
|
-
// @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
|
|
175
169
|
process.env[key] = variable.value;
|
|
176
170
|
}
|
|
177
171
|
}
|
|
172
|
+
for (const [source, keys] of Object.entries(envVarsToLogByUsedSource)) {
|
|
173
|
+
const sourceName = getEnvSourceName(source);
|
|
174
|
+
log(`${NETLIFYDEVLOG} Injected ${sourceName} env vars: ${keys.map((key) => chalk.yellow(key)).join(', ')}`);
|
|
175
|
+
}
|
|
178
176
|
};
|
|
179
177
|
export const acquirePort = async ({ configuredPort, defaultPort, errorMessage, }) => {
|
|
180
178
|
const acquiredPort = await getPort({ port: configuredPort || defaultPort });
|
package/dist/utils/dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/utils/dev.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"framework-server.d.ts","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAKhD,UAAU,iBAAiB;IACzB,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CAClB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAmB,oBAGjD;IACD,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,cAAc,CAAA;CACzB,KAAG,OAAO,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"framework-server.d.ts","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAKhD,UAAU,iBAAiB;IACzB,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CAClB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAmB,oBAGjD;IACD,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,cAAc,CAAA;CACzB,KAAG,OAAO,CAAC,iBAAiB,CA0E5B,CAAA"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { rm } from 'node:fs/promises';
|
|
2
2
|
import waitPort from 'wait-port';
|
|
3
3
|
import { startSpinner, stopSpinner } from '../lib/spinner.js';
|
|
4
|
-
import { logAndThrowError, log, NETLIFYDEVERR, NETLIFYDEVLOG } from './command-helpers.js';
|
|
4
|
+
import { logAndThrowError, log, NETLIFYDEVERR, NETLIFYDEVLOG, chalk } from './command-helpers.js';
|
|
5
5
|
import { runCommand } from './shell.js';
|
|
6
6
|
import { startStaticServer } from './static-server.js';
|
|
7
|
-
|
|
8
|
-
const
|
|
7
|
+
const FRAMEWORK_PORT_TIMEOUT_MS = 10 * 60 * 1000;
|
|
8
|
+
const FRAMEWORK_PORT_WARN_TIMEOUT_MS = 5 * 1000;
|
|
9
9
|
/**
|
|
10
10
|
* Start a static server if the `useStaticServer` is provided or a framework specific server
|
|
11
11
|
*/
|
|
@@ -17,9 +17,10 @@ export const startFrameworkServer = async function ({ cwd, settings, }) {
|
|
|
17
17
|
const { family } = await startStaticServer({ settings });
|
|
18
18
|
return { ipVersion: family === 'IPv6' ? 6 : 4 };
|
|
19
19
|
}
|
|
20
|
-
log(
|
|
20
|
+
log('');
|
|
21
|
+
log(`${NETLIFYDEVLOG} Starting ${settings.framework || 'framework'} dev server`);
|
|
21
22
|
const spinner = startSpinner({
|
|
22
|
-
text: `Waiting for
|
|
23
|
+
text: `Waiting for ${settings.framework || 'framework'} dev server to be ready on port ${settings.frameworkPort}`,
|
|
23
24
|
});
|
|
24
25
|
if (settings.clearPublishDirectory && settings.dist) {
|
|
25
26
|
await rm(settings.dist, { recursive: true, force: true });
|
|
@@ -35,24 +36,34 @@ export const startFrameworkServer = async function ({ cwd, settings, }) {
|
|
|
35
36
|
port = { open: true, ipVersion };
|
|
36
37
|
}
|
|
37
38
|
else {
|
|
38
|
-
|
|
39
|
+
const waitPortPromise = waitPort({
|
|
39
40
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
40
41
|
port: settings.frameworkPort,
|
|
41
42
|
host: 'localhost',
|
|
42
43
|
output: 'silent',
|
|
43
|
-
timeout:
|
|
44
|
+
timeout: FRAMEWORK_PORT_TIMEOUT_MS,
|
|
44
45
|
...(settings.pollingStrategies?.includes('HTTP') && { protocol: 'http' }),
|
|
45
46
|
});
|
|
47
|
+
const timerId = setTimeout(() => {
|
|
48
|
+
if (!port?.open) {
|
|
49
|
+
spinner.update({
|
|
50
|
+
text: `Still waiting for server on port ${settings.frameworkPort} to be ready. Are you sure this is the correct port${settings.framework ? ` for ${settings.framework}` : ''}? Change this with the ${chalk.yellow('targetPort')} option in your ${chalk.yellow('netlify.toml')}.`,
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
}, FRAMEWORK_PORT_WARN_TIMEOUT_MS);
|
|
54
|
+
port = await waitPortPromise;
|
|
55
|
+
clearTimeout(timerId);
|
|
46
56
|
if (!port.open) {
|
|
47
57
|
throw new Error(`Timed out waiting for port '${settings.frameworkPort}' to be open`);
|
|
48
58
|
}
|
|
49
59
|
}
|
|
50
|
-
|
|
60
|
+
spinner.success(`${settings.framework || 'framework'} dev server ready on port ${settings.frameworkPort}`);
|
|
51
61
|
}
|
|
52
62
|
catch (error_) {
|
|
53
63
|
stopSpinner({ error: true, spinner });
|
|
54
64
|
log(NETLIFYDEVERR, `Netlify Dev could not start or connect to localhost:${settings.frameworkPort}.`);
|
|
55
65
|
log(NETLIFYDEVERR, `Please make sure your framework server is running on port ${settings.frameworkPort}`);
|
|
66
|
+
log(NETLIFYDEVERR, `If not, you can configure it using the ${chalk.yellow('targetPort')} option in your ${chalk.yellow('netlify.toml')}.`);
|
|
56
67
|
return logAndThrowError(error_);
|
|
57
68
|
}
|
|
58
69
|
return { ipVersion: port.ipVersion };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"framework-server.js","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAErC,OAAO,QAAQ,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE7D,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"framework-server.js","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/init/utils.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEzC,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAA;AAI7D,OAAO,EAAgC,KAAK,4BAA4B,EAAQ,MAAM,uBAAuB,CAAA;AAC7G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAMzC;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,GAClC,UAAU,WAAW,EACrB,mBAAkB,MAAM,EAAO,EAC/B,qBAAoB,MAAM,EAAO,aASlC,CAAA;AAiDD,eAAO,MAAM,gBAAgB,GAAU,sBAGpC;IACD,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,4BAA4B,CAAA;CACrC;;;;;;;;EA4BA,CAAA;AA6BD,eAAO,MAAM,eAAe,GAAU,oFAQnC;IACD,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,4BAA4B,CAAA;IACpC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,cAAc,EAAE,MAAM,CAAA;CACvB,kBAoCA,CAAA;AAGD,eAAO,MAAM,kBAAkB,GAAI;;;CAAkB,WAGpD,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAA;AAE1E,eAAO,MAAM,eAAe,GAAU,SAAS;IAAE,GAAG,EAAE,UAAU,CAAA;CAAE,KAAG,OAAO,CAAC,SAAS,CAQrF,CAAA;AAGD,KAAK,qBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,CAAA;AAEpG,eAAO,MAAM,UAAU,GAAU,2BAI9B;IACD,GAAG,EAAE,UAAU,CAAA;IACf,OAAO,EAAE,qBAAqB,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;CACf;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils/init/utils.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEzC,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAA;AAI7D,OAAO,EAAgC,KAAK,4BAA4B,EAAQ,MAAM,uBAAuB,CAAA;AAC7G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAMzC;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,GAClC,UAAU,WAAW,EACrB,mBAAkB,MAAM,EAAO,EAC/B,qBAAoB,MAAM,EAAO,aASlC,CAAA;AAiDD,eAAO,MAAM,gBAAgB,GAAU,sBAGpC;IACD,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,4BAA4B,CAAA;CACrC;;;;;;;;EA4BA,CAAA;AA6BD,eAAO,MAAM,eAAe,GAAU,oFAQnC;IACD,OAAO,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,4BAA4B,CAAA;IACpC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,cAAc,EAAE,MAAM,CAAA;CACvB,kBAoCA,CAAA;AAGD,eAAO,MAAM,kBAAkB,GAAI;;;CAAkB,WAGpD,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAA;AAE1E,eAAO,MAAM,eAAe,GAAU,SAAS;IAAE,GAAG,EAAE,UAAU,CAAA;CAAE,KAAG,OAAO,CAAC,SAAS,CAQrF,CAAA;AAGD,KAAK,qBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,CAAA;AAEpG,eAAO,MAAM,UAAU,GAAU,2BAI9B;IACD,GAAG,EAAE,UAAU,CAAA;IACf,OAAO,EAAE,qBAAqB,CAAA;IAC9B,MAAM,EAAE,MAAM,CAAA;CACf;;;;;;;;;;;;;;;;;;;;;;;uBAiC8m0B,iDAAsB;;;;;;;;;;;;YAAwQ,CAAC;uBAAyB,CAAC;;;qBAAqD,iDAAsB;;;oBAAyF,CAAC;;;;;EAzB5k1B,CAAA;AAED,eAAO,MAAM,SAAS,GAAU,yDAM7B;IACD,GAAG,EAAE,UAAU,CAAA;IACf,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,gBAAgB,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACvC,IAAI,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAA;IAChD,MAAM,EAAE,MAAM,CAAA;CACf;;;;;;;;;;;;;;;;;;;;;;;uBAW8m0B,iDAAsB;;;;;;;;;;;;YAAwQ,CAAC;uBAAyB,CAAC;;;qBAAqD,iDAAsB;;;oBAAyF,CAAC;;;;;EAD5k1B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/utils/shell.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,
|
|
1
|
+
{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/utils/shell.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAkChD,eAAO,MAAM,UAAU,GACrB,SAAS,MAAM,EACf,SAAS;IACP,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,GAAG,EAAE,MAAM,CAAA;CACZ,oCAkEF,CAAA"}
|
package/dist/utils/shell.js
CHANGED
|
@@ -2,7 +2,6 @@ import process from 'process';
|
|
|
2
2
|
import { Transform } from 'stream';
|
|
3
3
|
import { stripVTControlCharacters } from 'util';
|
|
4
4
|
import execa from 'execa';
|
|
5
|
-
import { stopSpinner } from '../lib/spinner.js';
|
|
6
5
|
import { chalk, log, NETLIFYDEVERR, NETLIFYDEVWARN } from './command-helpers.js';
|
|
7
6
|
import { processOnExit } from './dev.js';
|
|
8
7
|
const isErrnoException = (value) => value instanceof Error && Object.hasOwn(value, 'code');
|
|
@@ -26,6 +25,8 @@ const cleanupBeforeExit = async ({ exitCode } = {}) => {
|
|
|
26
25
|
}
|
|
27
26
|
}
|
|
28
27
|
};
|
|
28
|
+
// TODO(serhalp): Move (or at least rename). This sounds like a generic shell util but it's specific
|
|
29
|
+
// to `netlify dev`...
|
|
29
30
|
export const runCommand = (command, options) => {
|
|
30
31
|
const { cwd, env = {}, spinner } = options;
|
|
31
32
|
const commandProcess = execa.command(command, {
|
|
@@ -43,15 +44,9 @@ export const runCommand = (command, options) => {
|
|
|
43
44
|
});
|
|
44
45
|
// Ensure that an active spinner stays at the bottom of the commandline
|
|
45
46
|
// even though the actual framework command might be outputting stuff
|
|
46
|
-
if (spinner?.isSpinning) {
|
|
47
|
-
// The spinner is initially "started" in the usual sense (rendering frames on an interval).
|
|
48
|
-
// In this case, we want to manually control when to clear and when to render a frame, so we turn this off.
|
|
49
|
-
stopSpinner({ error: false, spinner });
|
|
50
|
-
}
|
|
51
47
|
const pipeDataWithSpinner = (writeStream, chunk) => {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
48
|
+
// Clear the spinner, write the framework command line, then resume spinning
|
|
49
|
+
spinner?.clear();
|
|
55
50
|
writeStream.write(chunk, () => {
|
|
56
51
|
spinner?.spin();
|
|
57
52
|
});
|
package/dist/utils/shell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/utils/shell.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,EAAE,wBAAwB,EAAE,MAAM,MAAM,CAAA;AAE/C,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/utils/shell.ts"],"names":[],"mappings":"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"}
|