Skip to content

Commit d6fca99

Browse files
serhalpserhalp
authored
Merge branch 'main' into renovate/netlify-edge-functions-bootstrap-2.x
2 parents ff632ed + 78582a2 commit d6fca99

File tree

12 files changed

+87
-32
lines changed

12 files changed

+87
-32
lines changed

‎.release-please-manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"packages/build-info": "10.0.7",
3-
"packages/build": "35.1.2",
4-
"packages/edge-bundler": "14.5.2",
3+
"packages/build": "35.1.3",
4+
"packages/edge-bundler": "14.5.3",
55
"packages/cache-utils": "6.0.4",
66
"packages/config": "24.0.3",
7-
"packages/functions-utils": "6.2.4",
7+
"packages/functions-utils": "6.2.5",
88
"packages/git-utils": "6.0.2",
99
"packages/headers-parser": "9.0.2",
1010
"packages/js-client": "14.0.4",
@@ -13,5 +13,5 @@
1313
"packages/run-utils": "6.0.2",
1414
"packages/opentelemetry-sdk-setup": "2.0.2",
1515
"packages/opentelemetry-utils": "2.0.1",
16-
"packages/zip-it-and-ship-it": "14.1.4"
16+
"packages/zip-it-and-ship-it": "14.1.5"
1717
}

‎package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/build/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,17 @@
105105
* dependencies
106106
* @netlify/config bumped from ^20.8.0 to ^20.8.1
107107

108+
## [35.1.3](https://github.com/netlify/build/compare/build-v35.1.2...build-v35.1.3) (2025-08-27)
109+
110+
111+
### Dependencies
112+
113+
* The following workspace dependencies were updated
114+
* dependencies
115+
* @netlify/edge-bundler bumped from 14.5.2 to 14.5.3
116+
* @netlify/functions-utils bumped from ^6.2.4 to ^6.2.5
117+
* @netlify/zip-it-and-ship-it bumped from 14.1.4 to 14.1.5
118+
108119
## [35.1.2](https://github.com/netlify/build/compare/build-v35.1.1...build-v35.1.2) (2025-08-19)
109120

110121

‎packages/build/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netlify/build",
3-
"version": "35.1.2",
3+
"version": "35.1.3",
44
"description": "Netlify build module",
55
"type": "module",
66
"exports": "./lib/index.js",
@@ -70,13 +70,13 @@
7070
"@netlify/blobs": "^10.0.8",
7171
"@netlify/cache-utils": "^6.0.4",
7272
"@netlify/config": "^24.0.3",
73-
"@netlify/edge-bundler": "14.5.2",
74-
"@netlify/functions-utils": "^6.2.4",
73+
"@netlify/edge-bundler": "14.5.3",
74+
"@netlify/functions-utils": "^6.2.5",
7575
"@netlify/git-utils": "^6.0.2",
7676
"@netlify/opentelemetry-utils": "^2.0.1",
7777
"@netlify/plugins-list": "^6.80.0",
7878
"@netlify/run-utils": "^6.0.2",
79-
"@netlify/zip-it-and-ship-it": "14.1.4",
79+
"@netlify/zip-it-and-ship-it": "14.1.5",
8080
"@sindresorhus/slugify": "^2.0.0",
8181
"ansi-escapes": "^7.0.0",
8282
"ansis": "^4.1.0",

‎packages/edge-bundler/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [14.5.3](https://github.com/netlify/build/compare/edge-bundler-v14.5.2...edge-bundler-v14.5.3) (2025-08-27)
4+
5+
6+
### Bug Fixes
7+
8+
* **deps:** update dependency esbuild to v0.25.9 ([#6631](https://github.com/netlify/build/issues/6631)) ([b26f7b6](https://github.com/netlify/build/commit/b26f7b6c1474f6c5e79849d6c9e22ef16615db10))
9+
310
## [14.5.2](https://github.com/netlify/build/compare/edge-bundler-v14.5.1...edge-bundler-v14.5.2) (2025-08-12)
411

512

‎packages/edge-bundler/deno/config.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
1-
// this needs to be updated whenever there's a change to globalThis.Netlify in bootstrap
2-
import { Netlify } from "https://64e8753eae24930008fac6d9--edge.netlify.app/bootstrap/index-combined.ts"
1+
import { type NetlifyGlobal } from 'https://edge.netlify.com/bootstrap/globals/types.ts'
32

43
const [functionURL, collectorURL, rawExitCodes] = Deno.args
54
const exitCodes = JSON.parse(rawExitCodes)
65

6+
const env = {
7+
delete: Deno.env.delete,
8+
get: Deno.env.get,
9+
has: Deno.env.has,
10+
set: Deno.env.set,
11+
toObject: Deno.env.toObject,
12+
};
13+
14+
const Netlify: NetlifyGlobal = {
15+
get context() {
16+
return null;
17+
},
18+
env,
19+
};
20+
721
globalThis.Netlify = Netlify
822

923
let func

‎packages/edge-bundler/node/formats/tarball.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,26 @@ export const bundle = async ({
107107
const tarballPath = path.join(distDirectory, buildID + TARBALL_EXTENSION)
108108
await fs.mkdir(path.dirname(tarballPath), { recursive: true })
109109

110+
// List files to include in the tarball as paths relative to the bundle dir.
111+
// Using absolute paths here leads to platform-specific quirks (notably on Windows),
112+
// where entries can include drive letters and break extraction/imports.
113+
const files = (await listRecursively(bundleDir.path))
114+
.map((p) => path.relative(bundleDir.path, p))
115+
.map((p) => getUnixPath(p))
116+
.sort()
117+
110118
await tar.create(
111119
{
112120
cwd: bundleDir.path,
113121
file: tarballPath,
114122
gzip: true,
115123
noDirRecurse: true,
124+
// Ensure forward slashes inside the tarball for cross-platform consistency.
116125
onWriteEntry(entry) {
117-
const relativePath = path.relative(bundleDir.path, path.join('/', entry.path))
118-
const normalizedPath = getUnixPath(relativePath)
119-
120-
entry.path = normalizedPath
126+
entry.path = getUnixPath(entry.path)
121127
},
122128
},
123-
await listRecursively(bundleDir.path),
129+
files,
124130
)
125131

126132
const hash = await getFileHash(tarballPath)

‎packages/edge-bundler/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netlify/edge-bundler",
3-
"version": "14.5.2",
3+
"version": "14.5.3",
44
"description": "Intelligently prepare Netlify Edge Functions for deployment",
55
"type": "module",
66
"main": "./dist/node/index.js",

‎packages/functions-utils/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [6.2.5](https://github.com/netlify/build/compare/functions-utils-v6.2.4...functions-utils-v6.2.5) (2025-08-27)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* dependencies
10+
* @netlify/zip-it-and-ship-it bumped from 14.1.4 to 14.1.5
11+
312
## [6.2.4](https://github.com/netlify/build/compare/functions-utils-v6.2.3...functions-utils-v6.2.4) (2025-08-19)
413

514

‎packages/functions-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@netlify/functions-utils",
3-
"version": "6.2.4",
3+
"version": "6.2.5",
44
"description": "Utility for adding Functions files in Netlify Build",
55
"type": "module",
66
"exports": "./lib/main.js",
@@ -50,7 +50,7 @@
5050
},
5151
"license": "MIT",
5252
"dependencies": {
53-
"@netlify/zip-it-and-ship-it": "14.1.4",
53+
"@netlify/zip-it-and-ship-it": "14.1.5",
5454
"cpy": "^11.0.0",
5555
"path-exists": "^5.0.0"
5656
},

0 commit comments

Comments
 (0)