@nx-extend/vercel 4.2.0 → 4.2.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.
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [4.2.1](https://github.com/TriPSs/nx-extend/compare/vercel@4.2.0...vercel@4.2.1) (2023-07-27)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
5
9
|
# [4.2.0](https://github.com/TriPSs/nx-extend/compare/vercel@4.1.0...vercel@4.2.0) (2023-07-22)
|
|
6
10
|
|
|
7
11
|
|
package/package.json
CHANGED
|
@@ -27,8 +27,7 @@ function buildExecutor(options, context) {
|
|
|
27
27
|
if (!((_b = (_a = targets[buildTarget]) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.outputPath)) {
|
|
28
28
|
throw new Error(`"${buildTarget}" target has no "outputPath" configured!`);
|
|
29
29
|
}
|
|
30
|
-
if (options.buildConfig &&
|
|
31
|
-
!((_c = targets[buildTarget]) === null || _c === void 0 ? void 0 : _c.configurations[options.buildConfig])) {
|
|
30
|
+
if (options.buildConfig && !((_c = targets[buildTarget]) === null || _c === void 0 ? void 0 : _c.configurations[options.buildConfig])) {
|
|
32
31
|
throw new Error(`"${buildTarget}" target has no configuration "${options.buildConfig}"!`);
|
|
33
32
|
}
|
|
34
33
|
const vercelDirectory = '.vercel';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/vercel/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,uCAAwD;AACxD,0CAAqE;AACrE,2BAAuC;AACvC,+BAA2B;AAI3B,qFAA6E;AAC7E,+EAAwE;AACxE,2DAAqD;AACrD,2DAAsD;AACtD,uEAAiE;AAajE,SAAgB,aAAa,CAC3B,OAAqB,EACrB,OAAwB;;IAExB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACnE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,QAAQ,CAAA;IAC/C,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/vercel/src/executors/build/build.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,8 +28,7 @@ export function buildExecutor(
|
|
|
28
28
|
): Promise<{ success: boolean }> {
|
|
29
29
|
const { targets } = context.workspace.projects[context.projectName]
|
|
30
30
|
const framework = options.framework || 'nextjs'
|
|
31
|
-
const buildTarget =
|
|
32
|
-
options.buildTarget || (framework === 'nextjs' ? 'build-next' : 'build')
|
|
31
|
+
const buildTarget = options.buildTarget || (framework === 'nextjs' ? 'build-next' : 'build')
|
|
33
32
|
|
|
34
33
|
if (!options.orgId) {
|
|
35
34
|
throw new Error(`"orgId" option is required!`)
|
|
@@ -49,10 +48,7 @@ export function buildExecutor(
|
|
|
49
48
|
throw new Error(`"${buildTarget}" target has no "outputPath" configured!`)
|
|
50
49
|
}
|
|
51
50
|
|
|
52
|
-
if (
|
|
53
|
-
options.buildConfig &&
|
|
54
|
-
!targets[buildTarget]?.configurations[options.buildConfig]
|
|
55
|
-
) {
|
|
51
|
+
if (options.buildConfig && !targets[buildTarget]?.configurations[options.buildConfig]) {
|
|
56
52
|
throw new Error(
|
|
57
53
|
`"${buildTarget}" target has no configuration "${options.buildConfig}"!`
|
|
58
54
|
)
|
|
@@ -74,19 +70,16 @@ export function buildExecutor(
|
|
|
74
70
|
settings: {}
|
|
75
71
|
})
|
|
76
72
|
|
|
77
|
-
const vercelEnironment =
|
|
78
|
-
context.configurationName === 'production' ? 'production' : 'preview'
|
|
73
|
+
const vercelEnironment = context.configurationName === 'production' ? 'production' : 'preview'
|
|
79
74
|
|
|
80
75
|
// Pull latest
|
|
81
|
-
const { success: pullSuccess } = execCommand(
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
vercelToken && `--token=${vercelToken}`,
|
|
76
|
+
const { success: pullSuccess } = execCommand(buildCommand([
|
|
77
|
+
'npx vercel pull --yes',
|
|
78
|
+
`--environment=${vercelEnironment}`,
|
|
79
|
+
vercelToken && `--token=${vercelToken}`,
|
|
86
80
|
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
)
|
|
81
|
+
options.debug && '--debug'
|
|
82
|
+
]))
|
|
90
83
|
|
|
91
84
|
if (!pullSuccess) {
|
|
92
85
|
throw new Error(`Was unable to pull!`)
|
|
@@ -124,16 +117,14 @@ export function buildExecutor(
|
|
|
124
117
|
}
|
|
125
118
|
})
|
|
126
119
|
|
|
127
|
-
const { success } = execCommand(
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
vercelToken && `--token=${vercelToken}`,
|
|
120
|
+
const { success } = execCommand(buildCommand([
|
|
121
|
+
'npx vercel build',
|
|
122
|
+
`--output ${targets[buildTarget].options.outputPath}/.vercel/output`,
|
|
123
|
+
context.configurationName === 'production' && '--prod',
|
|
124
|
+
vercelToken && `--token=${vercelToken}`,
|
|
133
125
|
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
)
|
|
126
|
+
options.debug && '--debug'
|
|
127
|
+
]))
|
|
137
128
|
|
|
138
129
|
if (success) {
|
|
139
130
|
// Write the project.json to the .vercel directory
|