Merge branch 'main' into refactor/replace-got/server.test.js

CHANGELOG.md

@@ -13,6 +13,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 
 
+## [17.10.1](https://github.com/netlify/cli/compare/v17.10.0...v17.10.1) (2023-12-08)
+
+
+### Bug Fixes
+
+* use correct file extensions for transpilation ([#6256](https://github.com/netlify/cli/issues/6256)) ([8308097](https://github.com/netlify/cli/commit/8308097334fc76117cee4798772abf18ff5a7e4d))
+
 ## [17.10.0](https://github.com/netlify/cli/compare/v17.9.0...v17.10.0) (2023-12-06)
 
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.10.0",
+  "version": "17.10.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {

src/lib/functions/netlify-function.ts

@@ -121,7 +121,7 @@ export default class NetlifyFunction {
     }
 
     if (extension === '.js') {
-      return '.js'
+      return '.mjs'
     }
   }
 

src/lib/functions/runtimes/js/builders/zisi.ts

@@ -175,7 +175,7 @@ export default async function handler({ config, directory, errorExit, func, meta
     featureFlags.zisi_pure_esm_mjs = true
   } else {
     // We must use esbuild for certain file extensions.
-    const mustTranspile = ['.js', '.ts', '.mts', '.cts'].includes(path.extname(func.mainFile))
+    const mustTranspile = ['.mjs', '.ts', '.mts', '.cts'].includes(path.extname(func.mainFile))
     const mustUseEsbuild = hasTypeModule || mustTranspile
 
     if (mustUseEsbuild && !functionsConfig['*'].nodeBundler) {

tests/integration/commands/deploy/deploy.test.js

@@ -495,7 +495,7 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
           export default async () => new Response("Internal V2 API")
           export const config = { path: "/internal-v2-func" }
           `,
-          path: '.netlify/functions-internal/func-4.js',
+          path: '.netlify/functions-internal/func-4.mjs',
         })
         .buildAsync()
 

tests/integration/commands/functions-with-args/functions-with-args.test.js

@@ -610,7 +610,7 @@ exports.handler = async () => ({
     })
   })
 
-  test('Serves functions with a `.js` extension', async (t) => {
+  test('Serves functions with a `.mjs` extension', async (t) => {
     await withSiteBuilder('function-mjs', async (builder) => {
       const bundlerConfig = args.includes('esbuild') ? { node_bundler: 'esbuild' } : {}
 
@@ -623,7 +623,7 @@ exports.handler = async () => ({
           },
         })
         .withContentFile({
-          path: 'functions/hello.js',
+          path: 'functions/hello.mjs',
           content: `
   const handler = async () => {
     return {

tests/integration/frameworks/hugo.test.ts

@@ -1,11 +1,11 @@
 import { expect, test } from 'vitest'
 
 import { FixtureTestContext, setupFixtureTests } from '../utils/fixture.js'
-import got from '../utils/got.js'
+import fetch from 'node-fetch'
 
 setupFixtureTests('hugo-site', { devServer: true }, () => {
   test<FixtureTestContext>('should not infinite redirect when -d flag is passed', async ({ devServer: { url } }) => {
-    const response = await got(`${url}/`).text()
+    const response = await fetch(`${url}/`).then((res) => res.text())
 
     expect(response).toContain('Home page!')
   })