@netlify/build 28.0.0-rc → 28.0.0
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.js +5 -0
- package/lib/core/bin.js +66 -0
- package/lib/core/build.js +355 -0
- package/lib/core/config.js +121 -0
- package/lib/core/constants.js +116 -0
- package/lib/core/dev.js +27 -0
- package/lib/core/dry.js +21 -0
- package/lib/core/feature_flags.js +19 -0
- package/lib/core/flags.js +201 -0
- package/lib/core/lingering.js +68 -0
- package/lib/core/main.js +123 -0
- package/lib/core/missing_side_file.js +17 -0
- package/lib/core/normalize_flags.js +59 -0
- package/lib/core/severity.js +20 -0
- package/lib/core/user_node_version.js +32 -0
- package/lib/env/changes.js +43 -0
- package/lib/env/main.js +14 -0
- package/lib/env/metadata.js +68 -0
- package/lib/error/api.js +37 -0
- package/lib/error/build.js +36 -0
- package/{src → lib}/error/cancel.js +5 -6
- package/lib/error/colors.js +9 -0
- package/lib/error/handle.js +46 -0
- package/lib/error/info.js +37 -0
- package/lib/error/monitor/location.js +16 -0
- package/lib/error/monitor/normalize.js +86 -0
- package/lib/error/monitor/print.js +20 -0
- package/lib/error/monitor/report.js +120 -0
- package/lib/error/monitor/start.js +58 -0
- package/lib/error/parse/clean_stack.js +70 -0
- package/lib/error/parse/location.js +50 -0
- package/lib/error/parse/normalize.js +24 -0
- package/lib/error/parse/parse.js +67 -0
- package/lib/error/parse/plugin.js +55 -0
- package/lib/error/parse/properties.js +16 -0
- package/lib/error/parse/serialize_log.js +34 -0
- package/lib/error/parse/serialize_status.js +18 -0
- package/lib/error/parse/stack.js +34 -0
- package/lib/error/type.js +171 -0
- package/lib/install/functions.js +20 -0
- package/lib/install/local.js +45 -0
- package/lib/install/main.js +67 -0
- package/lib/install/missing.js +54 -0
- package/{src → lib}/log/colors.js +15 -22
- package/lib/log/description.js +21 -0
- package/lib/log/header.js +14 -0
- package/lib/log/header_func.js +13 -0
- package/lib/log/logger.js +130 -0
- package/lib/log/messages/compatibility.js +120 -0
- package/lib/log/messages/config.js +91 -0
- package/lib/log/messages/core.js +50 -0
- package/lib/log/messages/core_steps.js +75 -0
- package/lib/log/messages/dry.js +41 -0
- package/lib/log/messages/install.js +25 -0
- package/lib/log/messages/ipc.js +29 -0
- package/lib/log/messages/mutations.js +62 -0
- package/{src → lib}/log/messages/plugins.js +18 -32
- package/lib/log/messages/status.js +14 -0
- package/lib/log/messages/steps.js +18 -0
- package/lib/log/old_version.js +32 -0
- package/lib/log/serialize.js +10 -0
- package/lib/log/stream.js +68 -0
- package/lib/log/theme.js +25 -0
- package/lib/plugins/child/diff.js +46 -0
- package/lib/plugins/child/error.js +26 -0
- package/lib/plugins/child/lazy.js +15 -0
- package/lib/plugins/child/load.js +22 -0
- package/lib/plugins/child/logic.js +57 -0
- package/lib/plugins/child/main.js +37 -0
- package/lib/plugins/child/run.js +19 -0
- package/lib/plugins/child/status.js +63 -0
- package/lib/plugins/child/typescript.js +28 -0
- package/lib/plugins/child/utils.js +42 -0
- package/lib/plugins/child/validate.js +31 -0
- package/lib/plugins/compatibility.js +104 -0
- package/{src → lib}/plugins/error.js +31 -35
- package/{src → lib}/plugins/events.js +7 -12
- package/lib/plugins/expected_version.js +81 -0
- package/lib/plugins/ipc.js +120 -0
- package/lib/plugins/list.js +73 -0
- package/lib/plugins/load.js +50 -0
- package/lib/plugins/manifest/check.js +85 -0
- package/lib/plugins/manifest/load.js +38 -0
- package/lib/plugins/manifest/main.js +17 -0
- package/lib/plugins/manifest/path.js +24 -0
- package/lib/plugins/manifest/validate.js +91 -0
- package/lib/plugins/node_version.js +30 -0
- package/lib/plugins/options.js +55 -0
- package/lib/plugins/pinned_version.js +83 -0
- package/lib/plugins/resolve.js +110 -0
- package/lib/plugins/spawn.js +54 -0
- package/lib/plugins_core/add.js +35 -0
- package/lib/plugins_core/build_command.js +50 -0
- package/lib/plugins_core/deploy/buildbot_client.js +87 -0
- package/lib/plugins_core/deploy/index.js +49 -0
- package/{src → lib}/plugins_core/deploy/manifest.yml +0 -0
- package/lib/plugins_core/edge_functions/index.js +79 -0
- package/{src → lib}/plugins_core/edge_functions/lib/error.js +13 -17
- package/lib/plugins_core/edge_functions/lib/internal_manifest.js +50 -0
- package/lib/plugins_core/edge_functions/validate_manifest/validate_edge_functions_manifest.js +75 -0
- package/lib/plugins_core/functions/error.js +123 -0
- package/lib/plugins_core/functions/feature_flags.js +6 -0
- package/lib/plugins_core/functions/index.js +114 -0
- package/lib/plugins_core/functions/utils.js +45 -0
- package/lib/plugins_core/functions/zisi.js +39 -0
- package/{src → lib}/plugins_core/functions_install/index.js +8 -11
- package/{src → lib}/plugins_core/functions_install/manifest.yml +0 -0
- package/lib/plugins_core/list.js +20 -0
- package/lib/status/add.js +30 -0
- package/lib/status/colors.js +18 -0
- package/lib/status/load_error.js +10 -0
- package/lib/status/report.js +83 -0
- package/lib/status/success.js +14 -0
- package/lib/steps/core_step.js +57 -0
- package/lib/steps/error.js +65 -0
- package/lib/steps/get.js +43 -0
- package/lib/steps/plugin.js +55 -0
- package/lib/steps/return.js +25 -0
- package/lib/steps/run_core_steps.js +147 -0
- package/lib/steps/run_step.js +188 -0
- package/lib/steps/run_steps.js +96 -0
- package/lib/steps/update_config.js +66 -0
- package/lib/telemetry/main.js +97 -0
- package/lib/time/aggregate.js +120 -0
- package/lib/time/main.js +37 -0
- package/lib/time/measure.js +18 -0
- package/lib/time/report.js +47 -0
- package/lib/utils/errors.js +13 -0
- package/lib/utils/json.js +15 -0
- package/{src → lib}/utils/omit.js +3 -4
- package/lib/utils/package.js +22 -0
- package/lib/utils/remove_falsy.js +8 -0
- package/lib/utils/resolve.js +41 -0
- package/lib/utils/runtime.js +5 -0
- package/lib/utils/semver.js +28 -0
- package/package.json +37 -20
- package/types/config/netlify_config.d.ts +4 -4
- package/types/netlify_plugin_constants.d.ts +8 -8
- package/src/core/bin.js +0 -83
- package/src/core/config.js +0 -186
- package/src/core/constants.js +0 -156
- package/src/core/dry.js +0 -39
- package/src/core/feature_flags.js +0 -21
- package/src/core/flags.js +0 -199
- package/src/core/lingering.js +0 -85
- package/src/core/main.js +0 -703
- package/src/core/missing_side_file.js +0 -29
- package/src/core/normalize_flags.js +0 -69
- package/src/core/severity.js +0 -22
- package/src/core/user_node_version.js +0 -41
- package/src/env/changes.js +0 -52
- package/src/env/main.js +0 -19
- package/src/env/metadata.js +0 -81
- package/src/error/api.js +0 -46
- package/src/error/build.js +0 -50
- package/src/error/colors.js +0 -11
- package/src/error/handle.js +0 -57
- package/src/error/info.js +0 -46
- package/src/error/monitor/location.js +0 -21
- package/src/error/monitor/normalize.js +0 -96
- package/src/error/monitor/print.js +0 -42
- package/src/error/monitor/report.js +0 -138
- package/src/error/monitor/start.js +0 -69
- package/src/error/parse/clean_stack.js +0 -87
- package/src/error/parse/location.js +0 -62
- package/src/error/parse/normalize.js +0 -29
- package/src/error/parse/parse.js +0 -97
- package/src/error/parse/plugin.js +0 -70
- package/src/error/parse/properties.js +0 -23
- package/src/error/parse/serialize_log.js +0 -42
- package/src/error/parse/serialize_status.js +0 -23
- package/src/error/parse/stack.js +0 -43
- package/src/error/type.js +0 -189
- package/src/install/functions.js +0 -28
- package/src/install/local.js +0 -62
- package/src/install/main.js +0 -81
- package/src/install/missing.js +0 -67
- package/src/log/description.js +0 -26
- package/src/log/header.js +0 -16
- package/src/log/header_func.js +0 -17
- package/src/log/logger.js +0 -142
- package/src/log/messages/compatibility.js +0 -164
- package/src/log/messages/config.js +0 -105
- package/src/log/messages/core.js +0 -70
- package/src/log/messages/core_steps.js +0 -104
- package/src/log/messages/dry.js +0 -63
- package/src/log/messages/install.js +0 -20
- package/src/log/messages/ipc.js +0 -38
- package/src/log/messages/mutations.js +0 -82
- package/src/log/messages/status.js +0 -16
- package/src/log/messages/steps.js +0 -22
- package/src/log/old_version.js +0 -41
- package/src/log/serialize.js +0 -13
- package/src/log/stream.js +0 -85
- package/src/log/theme.js +0 -26
- package/src/plugins/child/diff.js +0 -55
- package/src/plugins/child/error.js +0 -32
- package/src/plugins/child/lazy.js +0 -18
- package/src/plugins/child/load.js +0 -29
- package/src/plugins/child/logic.js +0 -57
- package/src/plugins/child/main.js +0 -51
- package/src/plugins/child/run.js +0 -28
- package/src/plugins/child/status.js +0 -74
- package/src/plugins/child/typescript.js +0 -45
- package/src/plugins/child/utils.js +0 -56
- package/src/plugins/child/validate.js +0 -34
- package/src/plugins/compatibility.js +0 -128
- package/src/plugins/expected_version.js +0 -119
- package/src/plugins/ipc.js +0 -145
- package/src/plugins/list.js +0 -86
- package/src/plugins/load.js +0 -70
- package/src/plugins/manifest/check.js +0 -106
- package/src/plugins/manifest/load.js +0 -41
- package/src/plugins/manifest/main.js +0 -22
- package/src/plugins/manifest/path.js +0 -31
- package/src/plugins/manifest/validate.js +0 -108
- package/src/plugins/node_version.js +0 -50
- package/src/plugins/options.js +0 -88
- package/src/plugins/pinned_version.js +0 -131
- package/src/plugins/resolve.js +0 -152
- package/src/plugins/spawn.js +0 -66
- package/src/plugins_core/add.js +0 -49
- package/src/plugins_core/build_command.js +0 -75
- package/src/plugins_core/deploy/buildbot_client.js +0 -102
- package/src/plugins_core/deploy/index.js +0 -73
- package/src/plugins_core/edge_functions/index.js +0 -122
- package/src/plugins_core/edge_functions/lib/internal_manifest.js +0 -54
- package/src/plugins_core/edge_functions/validate_manifest/validate_edge_functions_manifest.js +0 -89
- package/src/plugins_core/functions/error.js +0 -163
- package/src/plugins_core/functions/feature_flags.js +0 -6
- package/src/plugins_core/functions/index.js +0 -160
- package/src/plugins_core/functions/utils.js +0 -66
- package/src/plugins_core/functions/zisi.js +0 -53
- package/src/plugins_core/list.js +0 -27
- package/src/status/add.js +0 -36
- package/src/status/colors.js +0 -23
- package/src/status/load_error.js +0 -11
- package/src/status/report.js +0 -137
- package/src/status/success.js +0 -18
- package/src/steps/core_step.js +0 -92
- package/src/steps/error.js +0 -102
- package/src/steps/get.js +0 -32
- package/src/steps/plugin.js +0 -85
- package/src/steps/return.js +0 -52
- package/src/steps/run_core_steps.js +0 -194
- package/src/steps/run_step.js +0 -306
- package/src/steps/run_steps.js +0 -181
- package/src/steps/update_config.js +0 -93
- package/src/telemetry/main.js +0 -136
- package/src/time/aggregate.js +0 -146
- package/src/time/main.js +0 -48
- package/src/time/measure.js +0 -22
- package/src/time/report.js +0 -59
- package/src/utils/errors.js +0 -12
- package/src/utils/json.js +0 -19
- package/src/utils/package.js +0 -23
- package/src/utils/remove_falsy.js +0 -10
- package/src/utils/resolve.js +0 -46
- package/src/utils/semver.js +0 -34
package/src/plugins_core/add.js
DELETED
|
@@ -1,49 +0,0 @@
|
|
|
1
|
-
import { listCorePlugins, isCorePlugin } from './list.js'
|
|
2
|
-
|
|
3
|
-
// Add core plugins and user plugins together.
|
|
4
|
-
// Do not allow user override of core plugins.
|
|
5
|
-
export const addCorePlugins = function ({ netlifyConfig: { plugins }, constants }) {
|
|
6
|
-
const corePlugins = listCorePlugins(constants)
|
|
7
|
-
const allCorePlugins = corePlugins
|
|
8
|
-
.map((corePlugin) => addCoreProperties(corePlugin, plugins))
|
|
9
|
-
.filter((corePlugin) => !isOptionalCore(corePlugin, plugins))
|
|
10
|
-
const userPlugins = plugins.filter(isUserPlugin)
|
|
11
|
-
const allPlugins = [...userPlugins, ...allCorePlugins]
|
|
12
|
-
const pluginsOptions = allPlugins.map(normalizePluginOptions)
|
|
13
|
-
return pluginsOptions
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
const addCoreProperties = function (corePlugin, plugins) {
|
|
17
|
-
const inputs = getCorePluginInputs(corePlugin, plugins)
|
|
18
|
-
return { ...corePlugin, inputs, loadedFrom: 'core', origin: 'core' }
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
// Core plugins can get inputs too
|
|
22
|
-
const getCorePluginInputs = function (corePlugin, plugins) {
|
|
23
|
-
const configuredCorePlugin = plugins.find((plugin) => plugin.package === corePlugin.package)
|
|
24
|
-
if (configuredCorePlugin === undefined) {
|
|
25
|
-
return {}
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
return configuredCorePlugin.inputs
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
// Optional core plugins requires user opt-in
|
|
32
|
-
const isOptionalCore = function (pluginA, plugins) {
|
|
33
|
-
return pluginA.optional && plugins.every((pluginB) => pluginB.package !== pluginA.package)
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
const isUserPlugin = function (plugin) {
|
|
37
|
-
return !isCorePlugin(plugin.package)
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
const normalizePluginOptions = function ({
|
|
41
|
-
package: packageName,
|
|
42
|
-
pluginPath,
|
|
43
|
-
pinned_version: pinnedVersion,
|
|
44
|
-
loadedFrom,
|
|
45
|
-
origin,
|
|
46
|
-
inputs,
|
|
47
|
-
}) {
|
|
48
|
-
return { packageName, pluginPath, pinnedVersion, loadedFrom, origin, inputs }
|
|
49
|
-
}
|
|
@@ -1,75 +0,0 @@
|
|
|
1
|
-
import { platform } from 'process'
|
|
2
|
-
|
|
3
|
-
import { execa } from 'execa'
|
|
4
|
-
|
|
5
|
-
import { addErrorInfo } from '../error/info.js'
|
|
6
|
-
import { getBuildCommandDescription } from '../log/description.js'
|
|
7
|
-
import { logBuildCommandStart } from '../log/messages/steps.js'
|
|
8
|
-
import { getBuildCommandStdio, handleBuildCommandOutput } from '../log/stream.js'
|
|
9
|
-
|
|
10
|
-
// Fire `build.command`
|
|
11
|
-
const coreStep = async function ({
|
|
12
|
-
configPath,
|
|
13
|
-
buildDir,
|
|
14
|
-
nodePath,
|
|
15
|
-
childEnv,
|
|
16
|
-
logs,
|
|
17
|
-
netlifyConfig: {
|
|
18
|
-
build: { command: buildCommand, commandOrigin: buildCommandOrigin },
|
|
19
|
-
},
|
|
20
|
-
}) {
|
|
21
|
-
logBuildCommandStart(logs, buildCommand)
|
|
22
|
-
|
|
23
|
-
const stdio = getBuildCommandStdio(logs)
|
|
24
|
-
const childProcess = execa(buildCommand, {
|
|
25
|
-
shell: SHELL,
|
|
26
|
-
cwd: buildDir,
|
|
27
|
-
preferLocal: true,
|
|
28
|
-
execPath: nodePath,
|
|
29
|
-
env: childEnv,
|
|
30
|
-
extendEnv: false,
|
|
31
|
-
stdio,
|
|
32
|
-
})
|
|
33
|
-
|
|
34
|
-
try {
|
|
35
|
-
const buildCommandOutput = await childProcess
|
|
36
|
-
handleBuildCommandOutput(buildCommandOutput, logs)
|
|
37
|
-
return {}
|
|
38
|
-
} catch (error) {
|
|
39
|
-
// In our test environment we use `stdio: 'pipe'` on the build command, meaning our `stdout/stderr` output are
|
|
40
|
-
// buffered and consequently added to `error.message`. To avoid this and end up with duplicated output in our
|
|
41
|
-
// logs/snapshots we need to rely on `error.shortMessage`.
|
|
42
|
-
error.message = error.shortMessage
|
|
43
|
-
handleBuildCommandOutput(error, logs)
|
|
44
|
-
addErrorInfo(error, { type: 'buildCommand', location: { buildCommand, buildCommandOrigin, configPath } })
|
|
45
|
-
throw error
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
// We use Bash on Unix and `cmd.exe` on Windows
|
|
50
|
-
const SHELL = platform === 'win32' ? true : 'bash'
|
|
51
|
-
|
|
52
|
-
const coreStepDescription = function ({
|
|
53
|
-
netlifyConfig: {
|
|
54
|
-
build: { commandOrigin: buildCommandOrigin },
|
|
55
|
-
},
|
|
56
|
-
}) {
|
|
57
|
-
return getBuildCommandDescription(buildCommandOrigin)
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
const hasBuildCommand = function ({
|
|
61
|
-
netlifyConfig: {
|
|
62
|
-
build: { command: buildCommand },
|
|
63
|
-
},
|
|
64
|
-
}) {
|
|
65
|
-
return buildCommand !== undefined && buildCommand !== ''
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
export const buildCommandCore = {
|
|
69
|
-
event: 'onBuild',
|
|
70
|
-
coreStep,
|
|
71
|
-
coreStepId: 'build_command',
|
|
72
|
-
coreStepName: 'build.command',
|
|
73
|
-
coreStepDescription,
|
|
74
|
-
condition: hasBuildCommand,
|
|
75
|
-
}
|
|
@@ -1,102 +0,0 @@
|
|
|
1
|
-
import net from 'net'
|
|
2
|
-
import { normalize, resolve, relative } from 'path'
|
|
3
|
-
import { promisify } from 'util'
|
|
4
|
-
|
|
5
|
-
import { pEvent } from 'p-event'
|
|
6
|
-
|
|
7
|
-
import { addErrorInfo } from '../../error/info.js'
|
|
8
|
-
import { runsAfterDeploy } from '../../plugins/events.js'
|
|
9
|
-
import { addAsyncErrorMessage } from '../../utils/errors.js'
|
|
10
|
-
|
|
11
|
-
export const createBuildbotClient = function (buildbotServerSocket) {
|
|
12
|
-
const connectionOpts = getConnectionOpts(buildbotServerSocket)
|
|
13
|
-
const client = net.createConnection(connectionOpts)
|
|
14
|
-
return client
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
// Windows does not support Unix sockets well, so we also support `host:port`
|
|
18
|
-
const getConnectionOpts = function (buildbotServerSocket) {
|
|
19
|
-
if (!buildbotServerSocket.includes(':')) {
|
|
20
|
-
return { path: buildbotServerSocket }
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
const [host, port] = buildbotServerSocket.split(':')
|
|
24
|
-
return { host, port }
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
const eConnectBuildbotClient = async function (client) {
|
|
28
|
-
await pEvent(client, 'connect')
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export const connectBuildbotClient = addAsyncErrorMessage(eConnectBuildbotClient, 'Could not connect to buildbot')
|
|
32
|
-
|
|
33
|
-
export const closeBuildbotClient = async function (client) {
|
|
34
|
-
if (client.destroyed) {
|
|
35
|
-
return
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
await promisify(client.end.bind(client))()
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
const cWritePayload = async function (buildbotClient, payload) {
|
|
42
|
-
await promisify(buildbotClient.write.bind(buildbotClient))(JSON.stringify(payload))
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
const writePayload = addAsyncErrorMessage(cWritePayload, 'Could not send payload to buildbot')
|
|
46
|
-
|
|
47
|
-
const cGetNextParsedResponsePromise = async function (buildbotClient) {
|
|
48
|
-
const data = await pEvent(buildbotClient, 'data')
|
|
49
|
-
return JSON.parse(data)
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
const getNextParsedResponsePromise = addAsyncErrorMessage(
|
|
53
|
-
cGetNextParsedResponsePromise,
|
|
54
|
-
'Invalid response from buildbot',
|
|
55
|
-
)
|
|
56
|
-
|
|
57
|
-
export const deploySiteWithBuildbotClient = async function ({ client, events, buildDir, repositoryRoot, constants }) {
|
|
58
|
-
const action = shouldWaitForPostProcessing(events) ? 'deploySiteAndAwaitLive' : 'deploySite'
|
|
59
|
-
const deployDir = getDeployDir({ buildDir, repositoryRoot, constants })
|
|
60
|
-
const payload = { action, deployDir }
|
|
61
|
-
|
|
62
|
-
const [{ succeeded, values: { error, error_type: errorType } = {} }] = await Promise.all([
|
|
63
|
-
getNextParsedResponsePromise(client),
|
|
64
|
-
writePayload(client, payload),
|
|
65
|
-
])
|
|
66
|
-
|
|
67
|
-
if (!succeeded) {
|
|
68
|
-
return handleDeployError(error, errorType)
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
// The file paths in the buildbot are relative to the repository root.
|
|
73
|
-
// However, the file paths in Build plugins, including `constants.PUBLISH_DIR`
|
|
74
|
-
// are relative to the build directory, which is different when there is a
|
|
75
|
-
// base directory. This converts it.
|
|
76
|
-
// We need to call `normalize()` in case the publish directory is the
|
|
77
|
-
// repository root, so `deployDir` is "." not ""
|
|
78
|
-
const getDeployDir = function ({ buildDir, repositoryRoot, constants: { PUBLISH_DIR } }) {
|
|
79
|
-
const absolutePublishDir = resolve(buildDir, PUBLISH_DIR)
|
|
80
|
-
const relativePublishDir = relative(repositoryRoot, absolutePublishDir)
|
|
81
|
-
const deployDir = normalize(relativePublishDir)
|
|
82
|
-
return deployDir
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
// We distinguish between user errors and system errors during deploys
|
|
86
|
-
const handleDeployError = function (error, errorType) {
|
|
87
|
-
const errorA = new Error(`Deploy did not succeed: ${error}`)
|
|
88
|
-
const errorInfo =
|
|
89
|
-
errorType === 'user' ? { type: 'resolveConfig' } : { type: 'coreStep', location: { coreStepName: 'Deploy site' } }
|
|
90
|
-
addErrorInfo(errorA, errorInfo)
|
|
91
|
-
throw errorA
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
// We only wait for post-processing (last stage before site deploy) if the build
|
|
95
|
-
// has some plugins that do post-deploy logic
|
|
96
|
-
const shouldWaitForPostProcessing = function (events) {
|
|
97
|
-
return events.some(hasPostDeployLogic)
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
const hasPostDeployLogic = function (event) {
|
|
101
|
-
return runsAfterDeploy(event)
|
|
102
|
-
}
|
|
@@ -1,73 +0,0 @@
|
|
|
1
|
-
import { saveUpdatedConfig, restoreUpdatedConfig } from '../../core/config.js'
|
|
2
|
-
import { logDeploySuccess } from '../../log/messages/plugins.js'
|
|
3
|
-
|
|
4
|
-
import {
|
|
5
|
-
createBuildbotClient,
|
|
6
|
-
connectBuildbotClient,
|
|
7
|
-
closeBuildbotClient,
|
|
8
|
-
deploySiteWithBuildbotClient,
|
|
9
|
-
} from './buildbot_client.js'
|
|
10
|
-
|
|
11
|
-
const coreStep = async function ({
|
|
12
|
-
buildDir,
|
|
13
|
-
configPath,
|
|
14
|
-
repositoryRoot,
|
|
15
|
-
constants,
|
|
16
|
-
buildbotServerSocket,
|
|
17
|
-
events,
|
|
18
|
-
logs,
|
|
19
|
-
featureFlags,
|
|
20
|
-
context,
|
|
21
|
-
branch,
|
|
22
|
-
configMutations,
|
|
23
|
-
headersPath,
|
|
24
|
-
redirectsPath,
|
|
25
|
-
debug,
|
|
26
|
-
saveConfig,
|
|
27
|
-
}) {
|
|
28
|
-
const client = createBuildbotClient(buildbotServerSocket)
|
|
29
|
-
try {
|
|
30
|
-
await connectBuildbotClient(client)
|
|
31
|
-
await saveUpdatedConfig({
|
|
32
|
-
configMutations,
|
|
33
|
-
buildDir,
|
|
34
|
-
repositoryRoot,
|
|
35
|
-
configPath,
|
|
36
|
-
headersPath,
|
|
37
|
-
redirectsPath,
|
|
38
|
-
logs,
|
|
39
|
-
featureFlags,
|
|
40
|
-
context,
|
|
41
|
-
branch,
|
|
42
|
-
debug,
|
|
43
|
-
saveConfig,
|
|
44
|
-
})
|
|
45
|
-
await deploySiteWithBuildbotClient({ client, events, buildDir, repositoryRoot, constants })
|
|
46
|
-
await restoreUpdatedConfig({
|
|
47
|
-
configMutations,
|
|
48
|
-
buildDir,
|
|
49
|
-
repositoryRoot,
|
|
50
|
-
configPath,
|
|
51
|
-
headersPath,
|
|
52
|
-
redirectsPath,
|
|
53
|
-
saveConfig,
|
|
54
|
-
})
|
|
55
|
-
logDeploySuccess(logs)
|
|
56
|
-
return {}
|
|
57
|
-
} finally {
|
|
58
|
-
await closeBuildbotClient(client)
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
const shouldDeploy = function ({ buildbotServerSocket }) {
|
|
63
|
-
return buildbotServerSocket !== undefined
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
export const deploySite = {
|
|
67
|
-
event: 'onPostBuild',
|
|
68
|
-
coreStep,
|
|
69
|
-
coreStepId: 'deploy_site',
|
|
70
|
-
coreStepName: 'Deploy site',
|
|
71
|
-
coreStepDescription: () => 'Deploy site',
|
|
72
|
-
condition: shouldDeploy,
|
|
73
|
-
}
|
|
@@ -1,122 +0,0 @@
|
|
|
1
|
-
import { promises as fs } from 'fs'
|
|
2
|
-
import { dirname, join, resolve } from 'path'
|
|
3
|
-
|
|
4
|
-
import { bundle, find } from '@netlify/edge-bundler'
|
|
5
|
-
import { pathExists } from 'path-exists'
|
|
6
|
-
|
|
7
|
-
import { logFunctionsToBundle } from '../../log/messages/core_steps.js'
|
|
8
|
-
|
|
9
|
-
import { tagBundlingError } from './lib/error.js'
|
|
10
|
-
import { parseManifest } from './lib/internal_manifest.js'
|
|
11
|
-
import { validateEdgeFunctionsManifest } from './validate_manifest/validate_edge_functions_manifest.js'
|
|
12
|
-
|
|
13
|
-
// TODO: Replace this with a custom cache directory.
|
|
14
|
-
const DENO_CLI_CACHE_DIRECTORY = '.netlify/plugins/deno-cli'
|
|
15
|
-
const IMPORT_MAP_FILENAME = 'edge-functions-import-map.json'
|
|
16
|
-
|
|
17
|
-
// eslint-disable-next-line max-statements
|
|
18
|
-
const coreStep = async function ({
|
|
19
|
-
buildDir,
|
|
20
|
-
constants: {
|
|
21
|
-
EDGE_FUNCTIONS_DIST: distDirectory,
|
|
22
|
-
EDGE_FUNCTIONS_SRC: srcDirectory,
|
|
23
|
-
INTERNAL_EDGE_FUNCTIONS_SRC: internalSrcDirectory,
|
|
24
|
-
IS_LOCAL: isRunningLocally,
|
|
25
|
-
},
|
|
26
|
-
debug,
|
|
27
|
-
systemLog,
|
|
28
|
-
featureFlags,
|
|
29
|
-
logs,
|
|
30
|
-
netlifyConfig,
|
|
31
|
-
}) {
|
|
32
|
-
const { edge_functions: configDeclarations = [] } = netlifyConfig
|
|
33
|
-
const distPath = resolve(buildDir, distDirectory)
|
|
34
|
-
const internalSrcPath = resolve(buildDir, internalSrcDirectory)
|
|
35
|
-
const distImportMapPath = join(dirname(internalSrcPath), IMPORT_MAP_FILENAME)
|
|
36
|
-
const srcPath = srcDirectory ? resolve(buildDir, srcDirectory) : undefined
|
|
37
|
-
const sourcePaths = [internalSrcPath, srcPath].filter(Boolean)
|
|
38
|
-
|
|
39
|
-
logFunctions({ internalSrcDirectory, internalSrcPath, logs, srcDirectory, srcPath })
|
|
40
|
-
|
|
41
|
-
const { declarations: internalDeclarations, importMap } = await parseManifest(internalSrcPath)
|
|
42
|
-
const declarations = [...configDeclarations, ...internalDeclarations]
|
|
43
|
-
|
|
44
|
-
// If we're running in buildbot and the feature flag is enabled, we set the
|
|
45
|
-
// Deno cache dir to a directory that is persisted between builds.
|
|
46
|
-
const cacheDirectory =
|
|
47
|
-
!isRunningLocally && featureFlags.edge_functions_cache_cli ? resolve(buildDir, DENO_CLI_CACHE_DIRECTORY) : undefined
|
|
48
|
-
|
|
49
|
-
// Edge Bundler expects the dist directory to exist.
|
|
50
|
-
await fs.mkdir(distPath, { recursive: true })
|
|
51
|
-
|
|
52
|
-
try {
|
|
53
|
-
const { manifest } = await bundle(sourcePaths, distPath, declarations, {
|
|
54
|
-
basePath: buildDir,
|
|
55
|
-
cacheDirectory,
|
|
56
|
-
debug,
|
|
57
|
-
distImportMapPath,
|
|
58
|
-
featureFlags,
|
|
59
|
-
importMaps: [importMap].filter(Boolean),
|
|
60
|
-
})
|
|
61
|
-
|
|
62
|
-
systemLog('Edge Functions manifest:', manifest)
|
|
63
|
-
} catch (error) {
|
|
64
|
-
tagBundlingError(error)
|
|
65
|
-
|
|
66
|
-
throw error
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
await validateEdgeFunctionsManifest({ buildDir, constants: { EDGE_FUNCTIONS_DIST: distDirectory } })
|
|
70
|
-
|
|
71
|
-
return {}
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
// We run this core step if at least one of the functions directories (the
|
|
75
|
-
// one configured by the user or the internal one) exists. We use a dynamic
|
|
76
|
-
// `condition` because the directories might be created by the build command
|
|
77
|
-
// or plugins.
|
|
78
|
-
const hasEdgeFunctionsDirectories = async function ({
|
|
79
|
-
buildDir,
|
|
80
|
-
constants: { INTERNAL_EDGE_FUNCTIONS_SRC, EDGE_FUNCTIONS_SRC },
|
|
81
|
-
}) {
|
|
82
|
-
const hasFunctionsSrc = EDGE_FUNCTIONS_SRC !== undefined && EDGE_FUNCTIONS_SRC !== ''
|
|
83
|
-
|
|
84
|
-
if (hasFunctionsSrc) {
|
|
85
|
-
return true
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
const internalFunctionsSrc = resolve(buildDir, INTERNAL_EDGE_FUNCTIONS_SRC)
|
|
89
|
-
|
|
90
|
-
return await pathExists(internalFunctionsSrc)
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
const logFunctions = async ({
|
|
94
|
-
internalSrcDirectory,
|
|
95
|
-
internalSrcPath,
|
|
96
|
-
logs,
|
|
97
|
-
srcDirectory: userFunctionsSrc,
|
|
98
|
-
srcPath,
|
|
99
|
-
}) => {
|
|
100
|
-
const [userFunctions, internalFunctions] = await Promise.all([find([srcPath]), find([internalSrcPath])])
|
|
101
|
-
const userFunctionsSrcExists = await pathExists(srcPath)
|
|
102
|
-
const internalFunctionsSrc = internalSrcDirectory
|
|
103
|
-
|
|
104
|
-
logFunctionsToBundle({
|
|
105
|
-
logs,
|
|
106
|
-
userFunctions: userFunctions.map(({ name }) => name),
|
|
107
|
-
userFunctionsSrc,
|
|
108
|
-
userFunctionsSrcExists,
|
|
109
|
-
internalFunctions: internalFunctions.map(({ name }) => name),
|
|
110
|
-
internalFunctionsSrc,
|
|
111
|
-
type: 'Edge Functions',
|
|
112
|
-
})
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
export const bundleEdgeFunctions = {
|
|
116
|
-
event: 'onBuild',
|
|
117
|
-
coreStep,
|
|
118
|
-
coreStepId: 'edge_functions_bundling',
|
|
119
|
-
coreStepName: 'Edge Functions bundling',
|
|
120
|
-
coreStepDescription: () => 'Edge Functions bundling',
|
|
121
|
-
condition: hasEdgeFunctionsDirectories,
|
|
122
|
-
}
|
|
@@ -1,54 +0,0 @@
|
|
|
1
|
-
import { promises as fs } from 'fs'
|
|
2
|
-
import { dirname, join, resolve } from 'path'
|
|
3
|
-
|
|
4
|
-
const parseManifest = async (internalSourceDirectory) => {
|
|
5
|
-
const manifestPath = join(internalSourceDirectory, 'manifest.json')
|
|
6
|
-
|
|
7
|
-
try {
|
|
8
|
-
const data = await fs.readFile(manifestPath)
|
|
9
|
-
const manifest = JSON.parse(data)
|
|
10
|
-
|
|
11
|
-
if (manifest.version !== 1) {
|
|
12
|
-
throw new Error('Unsupported manifest version')
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
const result = {
|
|
16
|
-
declarations: manifest.functions,
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
if (manifest.import_map) {
|
|
20
|
-
const importMapPath = resolve(dirname(manifestPath), manifest.import_map)
|
|
21
|
-
const importMap = await readImportMap(importMapPath)
|
|
22
|
-
|
|
23
|
-
return {
|
|
24
|
-
...result,
|
|
25
|
-
importMap,
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
return result
|
|
30
|
-
} catch {
|
|
31
|
-
// no-op
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
return {
|
|
35
|
-
declarations: [],
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
const readImportMap = async (path) => {
|
|
40
|
-
try {
|
|
41
|
-
const data = await fs.readFile(path)
|
|
42
|
-
const importMap = JSON.parse(data)
|
|
43
|
-
|
|
44
|
-
return importMap
|
|
45
|
-
} catch {
|
|
46
|
-
// no-op
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
return {
|
|
50
|
-
imports: {},
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
export { parseManifest }
|
package/src/plugins_core/edge_functions/validate_manifest/validate_edge_functions_manifest.js
DELETED
|
@@ -1,89 +0,0 @@
|
|
|
1
|
-
import { promises as fs } from 'fs'
|
|
2
|
-
import { join, resolve } from 'path'
|
|
3
|
-
|
|
4
|
-
import Ajv from 'ajv'
|
|
5
|
-
import ajvErrors from 'ajv-errors'
|
|
6
|
-
|
|
7
|
-
import { addErrorInfo } from '../../../error/info.js'
|
|
8
|
-
|
|
9
|
-
const ajv = new Ajv({ allErrors: true })
|
|
10
|
-
ajvErrors(ajv)
|
|
11
|
-
|
|
12
|
-
// regex pattern for manifest route pattern
|
|
13
|
-
// checks if the pattern string starts with ^ and ends with $
|
|
14
|
-
// we define this format in edge-bundler:
|
|
15
|
-
// https://github.com/netlify/edge-bundler/blob/main/src/manifest.ts#L66
|
|
16
|
-
const normalizedPatternRegex = /^\^.*\$$/
|
|
17
|
-
ajv.addFormat('regexPattern', {
|
|
18
|
-
async: true,
|
|
19
|
-
validate: (data) => normalizedPatternRegex.test(data),
|
|
20
|
-
})
|
|
21
|
-
|
|
22
|
-
const bundlesSchema = {
|
|
23
|
-
$async: true,
|
|
24
|
-
type: 'object',
|
|
25
|
-
required: ['asset', 'format'],
|
|
26
|
-
properties: {
|
|
27
|
-
asset: { type: 'string' },
|
|
28
|
-
format: { type: 'string' },
|
|
29
|
-
},
|
|
30
|
-
additionalProperties: false,
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
const routesSchema = {
|
|
34
|
-
$async: true,
|
|
35
|
-
type: 'object',
|
|
36
|
-
required: ['function', 'pattern'],
|
|
37
|
-
properties: {
|
|
38
|
-
function: { type: 'string' },
|
|
39
|
-
pattern: { type: 'string', format: 'regexPattern', errorMessage: `must match format ${normalizedPatternRegex}` },
|
|
40
|
-
},
|
|
41
|
-
additionalProperties: false,
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
const edgeManifestSchema = {
|
|
45
|
-
$async: true,
|
|
46
|
-
type: 'object',
|
|
47
|
-
required: ['bundles', 'routes', 'bundler_version'],
|
|
48
|
-
properties: {
|
|
49
|
-
bundles: {
|
|
50
|
-
type: 'array',
|
|
51
|
-
items: bundlesSchema,
|
|
52
|
-
},
|
|
53
|
-
routes: {
|
|
54
|
-
type: 'array',
|
|
55
|
-
items: routesSchema,
|
|
56
|
-
},
|
|
57
|
-
bundler_version: { type: 'string' },
|
|
58
|
-
},
|
|
59
|
-
additionalProperties: false,
|
|
60
|
-
errorMessage: "Couldn't validate Edge Functions manifest.json",
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
const validateManifest = async (manifestData) => {
|
|
64
|
-
const validate = ajv.compile(edgeManifestSchema)
|
|
65
|
-
|
|
66
|
-
await validate(manifestData)
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
export const validateEdgeFunctionsManifest = async function ({
|
|
70
|
-
buildDir,
|
|
71
|
-
constants: { EDGE_FUNCTIONS_DIST: distDirectory },
|
|
72
|
-
}) {
|
|
73
|
-
try {
|
|
74
|
-
const edgeFunctionsDistPath = resolve(buildDir, distDirectory)
|
|
75
|
-
const manifestPath = join(edgeFunctionsDistPath, 'manifest.json')
|
|
76
|
-
const data = await fs.readFile(manifestPath)
|
|
77
|
-
const manifestData = JSON.parse(data)
|
|
78
|
-
|
|
79
|
-
await validateManifest(manifestData)
|
|
80
|
-
} catch (error) {
|
|
81
|
-
const isValidationErr = error instanceof Ajv.ValidationError
|
|
82
|
-
const parsedErr = isValidationErr ? error.errors : error
|
|
83
|
-
|
|
84
|
-
addErrorInfo(parsedErr, { type: 'coreStep' })
|
|
85
|
-
throw new Error(isValidationErr ? JSON.stringify(parsedErr, null, 2) : parsedErr)
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
return {}
|
|
89
|
-
}
|