netlify 22.1.0 → 22.1.2
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/dev/dev.d.ts.map +1 -1
- package/dist/commands/dev/dev.js +13 -2
- package/dist/commands/dev/dev.js.map +1 -1
- package/dist/commands/init/constants.d.ts +4 -0
- package/dist/commands/init/constants.d.ts.map +1 -0
- package/dist/commands/init/constants.js +3 -0
- package/dist/commands/init/constants.js.map +1 -0
- package/dist/commands/init/init.d.ts +8 -1
- package/dist/commands/init/init.d.ts.map +1 -1
- package/dist/commands/init/init.js +21 -8
- package/dist/commands/init/init.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/npm-shrinkwrap.json +3692 -6523
- package/package.json +10 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AA0BxC,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AA+CjD,eAAO,MAAM,GAAG,GAAU,SAAS,YAAY,EAAE,SAAS,WAAW,kBAoMpE,CAAA"}
|
package/dist/commands/dev/dev.js
CHANGED
|
@@ -4,7 +4,7 @@ import { BLOBS_CONTEXT_VARIABLE, encodeBlobsContext, getBlobsContextWithEdgeAcce
|
|
|
4
4
|
import { promptEditorHelper } from '../../lib/edge-functions/editor-helper.js';
|
|
5
5
|
import { startFunctionsServer } from '../../lib/functions/server.js';
|
|
6
6
|
import { printBanner } from '../../utils/dev-server-banner.js';
|
|
7
|
-
import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, log, normalizeConfig, } from '../../utils/command-helpers.js';
|
|
7
|
+
import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, log, normalizeConfig, netlifyCommand, } from '../../utils/command-helpers.js';
|
|
8
8
|
import detectServerSettings, { getConfigWithPlugins } from '../../utils/detect-server-settings.js';
|
|
9
9
|
import { UNLINKED_SITE_MOCK_ID, getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.js';
|
|
10
10
|
import { getEnvelopeEnv } from '../../utils/env/index.js';
|
|
@@ -64,7 +64,18 @@ export const dev = async (options, command) => {
|
|
|
64
64
|
if (needsLinkedSite) {
|
|
65
65
|
log(`Dependenc${packagesRequiringLinkedSite.length > 1 ? 'ies' : 'y'} ${packagesRequiringLinkedSite.join(', ')} require${packagesRequiringLinkedSite.length > 1 ? '' : 's'} a linked project, but you don't have one linked yet. Let's do that first.`);
|
|
66
66
|
const { init } = await import('../init/init.js');
|
|
67
|
-
await init
|
|
67
|
+
const { LINKED_NEW_SITE_EXIT_CODE, LINKED_EXISTING_SITE_EXIT_CODE } = await import('../init/constants.js');
|
|
68
|
+
await init(getBaseOptionValues(options), command, {
|
|
69
|
+
customizeExitMessage: (code, defaultMessage) => {
|
|
70
|
+
switch (code) {
|
|
71
|
+
case LINKED_NEW_SITE_EXIT_CODE:
|
|
72
|
+
// fallthrough
|
|
73
|
+
case LINKED_EXISTING_SITE_EXIT_CODE:
|
|
74
|
+
return `${defaultMessage !== '' ? `${defaultMessage}\n` : ''}You can run ${chalk.cyanBright.bold(`${netlifyCommand()} dev`)} again to start the local development server.`;
|
|
75
|
+
}
|
|
76
|
+
},
|
|
77
|
+
exitAfterConfiguringRepo: true,
|
|
78
|
+
});
|
|
68
79
|
}
|
|
69
80
|
const blobsContext = await getBlobsContextWithEdgeAccess({
|
|
70
81
|
debug: options.debug,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAG7B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAGhD,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAA;AACpH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAA;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACL,aAAa,EACb,aAAa,EACb,cAAc,EAEd,KAAK,EACL,GAAG,EACH,eAAe,
|
|
1
|
+
{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAG7B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAGhD,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAA;AACpH,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAA;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACL,aAAa,EACb,aAAa,EACb,cAAc,EAEd,KAAK,EACL,GAAG,EACH,eAAe,EACf,cAAc,GACf,MAAM,gCAAgC,CAAA;AACvC,OAAO,oBAAoB,EAAE,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAClG,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACtH,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC/E,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAGzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAIxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAA;AAEtE,MAAM,gBAAgB,GAAG,KAAK,EAAE,EAC9B,GAAG,EACH,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,KAAK,GAON,EAAE,EAAE;IACH,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;IAExB,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,UAAU,GAAG,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;QACnF,MAAM,IAAI,GAAG,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;QAEjD,IAAI,OAAO,GAAG,GAAG,cAAc,8BAA8B,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAA;QAEjF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,mCAAmC,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAA;QACtF,CAAC;QAED,GAAG,CAAC,OAAO,CAAC,CAAA;QAEZ,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC;YACvC,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,eAAe,EAAE,GAAG,CAAC,WAAW;YAChC,SAAS,EAAE,QAAQ,CAAC,IAAI;YACxB,IAAI;SACL,CAAC,CAAA;QAEF,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,UAAU,CAAA;QAEjC,OAAO,UAAU,CAAA;IACnB,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAE,OAAqB,EAAE,OAAoB,EAAE,EAAE;IACvE,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAA;IAC5F,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;IAC/D,MAAM,CAAC,KAAK,GAAG,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAA;IAClC,MAAM,SAAS,GAAc;QAC3B,SAAS,EAAE,OAAO;QAClB,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QACjC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,mBAAmB,IAAI;YAC/C,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,mBAAmB,CAAC,GAAG;YACtD,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,mBAAmB,CAAC,WAAW;SAClE,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,kBAAkB,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAC1E,GAAG,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QAC3F,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACrD,GAAG,MAAM,CAAC,GAAG;QACb,GAAG,OAAO;KACX,CAAA;IAED,IAAI,EAAE,GAAG,EAAE,GAAG,YAAY,CAAA;IAE1B,GAAG,CAAC,WAAW,GAAG,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;IAE1D,MAAM,CAAC,eAAe,EAAE,2BAA2B,CAAC,GAAG,MAAM,4BAA4B,CAAC;QACxF,OAAO;QACP,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;QAC1B,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ;KACnC,CAAC,CAAA;IACF,IAAI,eAAe,EAAE,CAAC;QACpB,GAAG,CACD,YAAY,2BAA2B,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,2BAA2B,CAAC,IAAI,CAClG,IAAI,CACL,WACC,2BAA2B,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAChD,4EAA4E,CAC7E,CAAA;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAA;QAChD,MAAM,EAAE,yBAAyB,EAAE,8BAA8B,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAA;QAE1G,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE;YAChD,oBAAoB,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,EAAE;gBAC7C,QAAQ,IAAI,EAAE,CAAC;oBACb,KAAK,yBAAyB,CAAC;oBAC/B,cAAc;oBACd,KAAK,8BAA8B;wBACjC,OAAO,GAAG,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,cAAc,IAAI,CAAC,CAAC,CAAC,EAAE,eAAe,KAAK,CAAC,UAAU,CAAC,IAAI,CAC9F,GAAG,cAAc,EAAE,MAAM,CAC1B,+CAA+C,CAAA;gBACpD,CAAC;YACH,CAAC;YACD,wBAAwB,EAAE,IAAI;SAC/B,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,6BAA6B,CAAC;QACvD,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,WAAW,EAAE,OAAO,CAAC,UAAU;QAC/B,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,qBAAqB;KACzC,CAAC,CAAA;IAEF,GAAG,CAAC,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAA;IAEhG,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QAC5C,GAAG,GAAG,MAAM,cAAc,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC5E,GAAG,CAAC,GAAG,aAAa,8CAA8C,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;IACjG,CAAC;IAED,GAAG,GAAG,MAAM,kBAAkB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;IACxD,kBAAkB,CAAC,GAAG,CAAC,CAAA;IACvB,MAAM,kBAAkB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAA;IAEtF,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,kBAAkB,CAAC;QAC1F,wCAAwC;QAExC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,GAAG;QACH,IAAI;QACJ,QAAQ;KACT,CAAC,CAAA;IAEF,IAAI,QAAwB,CAAA;IAC5B,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,oBAAoB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;QAElE,MAAM,EAAE,iCAAiC,EAAE,GAAG,OAAO,CAAC,GAAG,CAAA;QAEzD,IAAI,iCAAiC,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,iCAAiC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC5D,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBAClB,GAAG,CAAC,GAAG,aAAa,kCAAkC,iCAAiC,EAAE,CAAC,CAAA;YAC5F,CAAC;YACD,QAAQ,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAA;QAC9D,CAAC;QAED,qFAAqF;QACrF,sDAAsD;QACtD,YAAY,CAAC,MAAM,GAAG,oBAAoB,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC3E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;QACnC,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,OAAO,CAAC,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IAEnD,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAA;IAErF,MAAM,GAAG,GAAG,aAAa,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAA;IAElD,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAA;IACrB,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,GAAG,CAAA;IAE5B,GAAG,CAAC,GAAG,aAAa,8BAA8B,CAAC,CAAA;IAEnD,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,MAAM,cAAc,CAAC;QAC/E,OAAO;QACP,OAAO;QACP,QAAQ;QACR,GAAG,EAAE;YACH,GAAG,EAAE,GAAG;YACR,UAAU,EAAE,GAAG;SAChB;KACF,CAAC,CAAA;IAEF,4FAA4F;IAC5F,MAAM,aAAa,GAAkB,cAAc,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAE5E,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC;QACnD,YAAY;QACZ,OAAO;QACP,MAAM,EAAE,aAAa;QAErB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,QAAQ;QACR,IAAI;QACJ,QAAQ;QACR,OAAO;QACP,YAAY;QACZ,QAAQ;QACR,eAAe,EAAE,OAAO,CAAC,GAAG;QAC5B,UAAU,EAAE,OAAO,CAAC,OAAO;QAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,KAAK;QACL,SAAS;KACV,CAAC,CAAA;IAEF,yCAAyC;IACzC,IAAI,CAAC;QACH,MAAM,mBAAmB,CAAC,cAAc,CAAC,CAAA;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,QAAQ;IACV,CAAC;IAED,qEAAqE;IACrE,MAAM,gBAAgB,GAAG,KAAK,IAA2C,EAAE;QACzE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC;YACpD,GAAG,EAAE,OAAO,CAAC,UAAU;YACvB,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QACF,OAAO,eAAe,CAAC,SAAS,CAAC,CAAA;IACnC,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,uBAAuB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAE5F,MAAM,gBAAgB,CAAC;QACrB,UAAU;QACV,GAAG;QACH,YAAY;QACZ,OAAO;QACP,MAAM,EAAE,aAAa;QACrB,UAAU,EAAE,kBAAkB;QAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,oBAAoB,EAAE,OAAO,CAAC,4BAA4B;QAC1D,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,GAAG;QACH,gBAAgB;QAChB,eAAe;QACf,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ;QACR,IAAI;QACJ,QAAQ;QACR,KAAK;QACL,eAAe,EAAE,OAAO,CAAC,GAAG;QAC5B,UAAU,EAAE,OAAO,CAAC,OAAO;QAC3B,SAAS;QACT,iBAAiB;QACjB,cAAc;KACf,CAAC,CAAA;IAEF,IAAI,SAAS,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QACnC,MAAM,WAAW,CAAC,EAAE,GAAG,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;AACtB,CAAC,CAAA"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export declare const LINKED_NEW_SITE_EXIT_CODE = "LINKED_NEW_SITE";
|
|
2
|
+
export declare const LINKED_EXISTING_SITE_EXIT_CODE = "LINKED_EXISTING_SITE";
|
|
3
|
+
export type InitExitCode = typeof LINKED_NEW_SITE_EXIT_CODE | typeof LINKED_EXISTING_SITE_EXIT_CODE;
|
|
4
|
+
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/commands/init/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,oBAAoB,CAAA;AAE1D,eAAO,MAAM,8BAA8B,yBAAyB,CAAA;AAEpE,MAAM,MAAM,YAAY,GAAG,OAAO,yBAAyB,GAAG,OAAO,8BAA8B,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/commands/init/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAA;AAE1D,MAAM,CAAC,MAAM,8BAA8B,GAAG,sBAAsB,CAAA"}
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import { OptionValues } from 'commander';
|
|
2
2
|
import type BaseCommand from '../base-command.js';
|
|
3
3
|
import type { SiteInfo } from '../../utils/types.js';
|
|
4
|
-
|
|
4
|
+
import { type InitExitCode } from './constants.js';
|
|
5
|
+
type InitExitMessageCustomizer = (code: InitExitCode, defaultMessage: string) => string | undefined;
|
|
6
|
+
type InitExtraOptions = {
|
|
7
|
+
customizeExitMessage?: InitExitMessageCustomizer | undefined;
|
|
8
|
+
exitAfterConfiguringRepo?: boolean | undefined;
|
|
9
|
+
};
|
|
10
|
+
export declare const init: (options: OptionValues, command: BaseCommand, { customizeExitMessage, exitAfterConfiguringRepo }?: InitExtraOptions) => Promise<SiteInfo>;
|
|
11
|
+
export {};
|
|
5
12
|
//# sourceMappingURL=init.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AASxC,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AAGjD,OAAO,KAAK,EAAY,QAAQ,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AASxC,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AAGjD,OAAO,KAAK,EAAY,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE9D,OAAO,EAAE,KAAK,YAAY,EAA6D,MAAM,gBAAgB,CAAA;AA8M7G,KAAK,yBAAyB,GAAG,CAAC,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAA;AAEnG,KAAK,gBAAgB,GAAG;IACtB,oBAAoB,CAAC,EAAE,yBAAyB,GAAG,SAAS,CAAA;IAC5D,wBAAwB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC/C,CAAA;AAED,eAAO,MAAM,IAAI,GACf,SAAS,YAAY,EACrB,SAAS,WAAW,EACpB,qDAA4D,gBAAqB,KAChF,OAAO,CAAC,QAAQ,CAoDlB,CAAA"}
|
|
@@ -8,6 +8,7 @@ import { track } from '../../utils/telemetry/index.js';
|
|
|
8
8
|
import { link } from '../link/link.js';
|
|
9
9
|
import { sitesCreate } from '../sites/sites-create.js';
|
|
10
10
|
import { getBuildSettings, saveNetlifyToml } from '../../utils/init/utils.js';
|
|
11
|
+
import { LINKED_EXISTING_SITE_EXIT_CODE, LINKED_NEW_SITE_EXIT_CODE } from './constants.js';
|
|
11
12
|
const persistState = ({ siteInfo, state }) => {
|
|
12
13
|
// Save to .netlify/state.json file
|
|
13
14
|
state.set('siteId', siteInfo.id);
|
|
@@ -31,7 +32,7 @@ const logExistingAndExit = ({ siteInfo }) => {
|
|
|
31
32
|
/**
|
|
32
33
|
* Creates and new site and exits the process
|
|
33
34
|
*/
|
|
34
|
-
const createNewSiteAndExit = async ({ command, state, disableLinking, }) => {
|
|
35
|
+
const createNewSiteAndExit = async ({ command, state, disableLinking, customizeExitMessage, }) => {
|
|
35
36
|
const siteInfo = await sitesCreate({}, command);
|
|
36
37
|
log(`"${siteInfo.name}" project was created`);
|
|
37
38
|
log();
|
|
@@ -54,7 +55,8 @@ const createNewSiteAndExit = async ({ command, state, disableLinking, }) => {
|
|
|
54
55
|
}
|
|
55
56
|
}
|
|
56
57
|
log();
|
|
57
|
-
|
|
58
|
+
const defaultExitMesage = `To deploy to this project, run ${chalk.cyanBright.bold(`${netlifyCommand()} deploy`)}.`;
|
|
59
|
+
log(customizeExitMessage?.(LINKED_NEW_SITE_EXIT_CODE, defaultExitMesage) ?? defaultExitMesage);
|
|
58
60
|
return exit();
|
|
59
61
|
};
|
|
60
62
|
const logGitSetupInstructionsAndExit = () => {
|
|
@@ -92,7 +94,7 @@ const logGitSetupInstructionsAndExit = () => {
|
|
|
92
94
|
/**
|
|
93
95
|
* Handles the case where no git remote was found.
|
|
94
96
|
*/
|
|
95
|
-
const handleNoGitRemoteAndExit = async ({ command, error, state, disableLinking, }) => {
|
|
97
|
+
const handleNoGitRemoteAndExit = async ({ command, error, state, disableLinking, customizeExitMessage, }) => {
|
|
96
98
|
log();
|
|
97
99
|
log(chalk.yellow('No git remote was found, would you like to set one up?'));
|
|
98
100
|
log(`
|
|
@@ -119,7 +121,8 @@ git remote add origin https://github.com/YourUserName/RepoName.git
|
|
|
119
121
|
},
|
|
120
122
|
]);
|
|
121
123
|
if (noGitRemoteChoice === NEW_SITE_NO_GIT) {
|
|
122
|
-
|
|
124
|
+
// TODO(ndhoule): Shove a custom error message in here
|
|
125
|
+
return createNewSiteAndExit({ state, command, disableLinking, customizeExitMessage });
|
|
123
126
|
}
|
|
124
127
|
return logGitSetupInstructionsAndExit();
|
|
125
128
|
};
|
|
@@ -149,14 +152,15 @@ const createOrLinkSiteToRepo = async (command) => {
|
|
|
149
152
|
// run link command
|
|
150
153
|
return await link({}, command);
|
|
151
154
|
};
|
|
152
|
-
const logExistingRepoSetupAndExit = ({ repoUrl, siteName }) => {
|
|
155
|
+
const logExistingRepoSetupAndExit = ({ repoUrl, siteName, customizeExitMessage, }) => {
|
|
153
156
|
log();
|
|
154
157
|
log(chalk.underline.bold(`Success`));
|
|
155
|
-
|
|
158
|
+
const defaultExitMessage = `This project "${siteName}" is configured to automatically deploy via ${repoUrl}.`;
|
|
159
|
+
log(customizeExitMessage?.(LINKED_EXISTING_SITE_EXIT_CODE, defaultExitMessage) ?? defaultExitMessage);
|
|
156
160
|
// TODO add support for changing GitHub repo in site:config command
|
|
157
161
|
exit();
|
|
158
162
|
};
|
|
159
|
-
export const init = async (options, command) => {
|
|
163
|
+
export const init = async (options, command, { customizeExitMessage, exitAfterConfiguringRepo = false } = {}) => {
|
|
160
164
|
command.setAnalyticsPayload({ manual: options.manual, force: options.force });
|
|
161
165
|
const { repositoryRoot, state } = command.netlify;
|
|
162
166
|
const { siteInfo: existingSiteInfo } = command.netlify;
|
|
@@ -171,11 +175,13 @@ export const init = async (options, command) => {
|
|
|
171
175
|
// Look for local repo
|
|
172
176
|
const repoData = await getRepoData({ workingDir: command.workingDir, remoteName: options.gitRemoteName });
|
|
173
177
|
if ('error' in repoData) {
|
|
178
|
+
// TODO(ndhoule): Custom error messaage here
|
|
174
179
|
return await handleNoGitRemoteAndExit({
|
|
175
180
|
command,
|
|
176
181
|
error: repoData.error,
|
|
177
182
|
state,
|
|
178
183
|
disableLinking: options.disableLinking,
|
|
184
|
+
customizeExitMessage,
|
|
179
185
|
});
|
|
180
186
|
}
|
|
181
187
|
const siteInfo = isEmpty(existingSiteInfo) ? await createOrLinkSiteToRepo(command) : existingSiteInfo;
|
|
@@ -183,10 +189,17 @@ export const init = async (options, command) => {
|
|
|
183
189
|
// Check for existing CI setup
|
|
184
190
|
const remoteBuildRepo = getRepoUrl(siteInfo);
|
|
185
191
|
if (remoteBuildRepo && !options.force) {
|
|
186
|
-
logExistingRepoSetupAndExit({ siteName: siteInfo.name, repoUrl: remoteBuildRepo });
|
|
192
|
+
logExistingRepoSetupAndExit({ siteName: siteInfo.name, repoUrl: remoteBuildRepo, customizeExitMessage });
|
|
187
193
|
}
|
|
188
194
|
persistState({ state, siteInfo });
|
|
189
195
|
await configureRepo({ command, siteId: siteInfo.id, repoData, manual: options.manual });
|
|
196
|
+
if (exitAfterConfiguringRepo) {
|
|
197
|
+
const customErrorMessage = customizeExitMessage?.(LINKED_EXISTING_SITE_EXIT_CODE, '');
|
|
198
|
+
if (customErrorMessage) {
|
|
199
|
+
log(customErrorMessage);
|
|
200
|
+
}
|
|
201
|
+
return exit();
|
|
202
|
+
}
|
|
190
203
|
return siteInfo;
|
|
191
204
|
};
|
|
192
205
|
//# sourceMappingURL=init.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,OAAO,MAAM,mBAAmB,CAAA;AAEvC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AACjF,OAAO,WAAW,MAAM,8BAA8B,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAA;AAEtD,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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"}
|