Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: convert the rest of the project to ESM #6092

Merged
merged 61 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
eb162ff
refactor: convert functions/telemetry to ESM
ericapisani Oct 25, 2023
fb03132
refactor: convert commitlint config file
ericapisani Oct 26, 2023
35590dc
refactor: convert local-ip.mjs
ericapisani Oct 26, 2023
c024966
refactor: convert 600.framework-detection test to ESM
ericapisani Oct 26, 2023
e126cf0
refactor: missed removing a require statement
ericapisani Oct 26, 2023
eb0bf01
style: lint
ericapisani Oct 26, 2023
bdbecb0
refactor: convert curl.cjs to ESM
ericapisani Oct 26, 2023
9ede0b3
test: update file reference
ericapisani Oct 26, 2023
a8a3726
refactor: convert curl.cjs to ESM
ericapisani Oct 26, 2023
f885ae6
refactor: convert got.cjs to ESM
ericapisani Oct 26, 2023
2397d77
refactor: convert cli-path to ESM
ericapisani Oct 26, 2023
d3a413f
fix: issues raised with linter
ericapisani Oct 26, 2023
7c950ab
refactor: convert tests/integration/utils/snapshots.cjs to ESM
ericapisani Oct 26, 2023
56ae13c
refactor: convert tests/integration/utils/mock-execa.cjs to ESM
ericapisani Oct 26, 2023
d0f83c7
style: lint
ericapisani Oct 26, 2023
964fd0f
refactor: convert tests/integration/utils/external-server.cjs to ESM
ericapisani Oct 26, 2023
e4806a0
refactor: convert mock-api.cjs to ESM
ericapisani Oct 26, 2023
a35bd98
style: lint
ericapisani Oct 26, 2023
b10c570
style: lint
ericapisani Oct 26, 2023
1e60f90
refactor: convert create-live-test-site to ESM
ericapisani Oct 26, 2023
0d39762
refactor: convert utils/dev-server.cjs to ESM
ericapisani Oct 26, 2023
b32bb2b
refactor: fix issues found by linter
ericapisani Oct 26, 2023
c4b4d68
refactor: convert utils/handle-questons.cjs to ESM
ericapisani Oct 26, 2023
666aa5d
refactor: convert utils/process.cjs to ESM
ericapisani Oct 26, 2023
1511192
refactor: convert call-cli to ESM
ericapisani Oct 26, 2023
a3bcc23
refactor: convert external-server-cli.cjs to ESM
ericapisani Oct 26, 2023
aa02c1c
refactor: convert site-builder.cjs to ESM
ericapisani Oct 26, 2023
5059ee4
refactor: convert utils/pause.cjs to ESM
ericapisani Oct 26, 2023
7c09412
fix: imports
ericapisani Oct 26, 2023
2556003
refactor: remove files that are no longer used
ericapisani Oct 26, 2023
8e46584
style: lint issues
ericapisani Oct 26, 2023
7309c97
refactor: update filenames
ericapisani Oct 26, 2023
15d40b7
test: fix import
ericapisani Oct 26, 2023
956e99b
fix: import statement
ericapisani Oct 26, 2023
44e31e3
fix: import statement
ericapisani Oct 26, 2023
8df6952
fix: more import statements
ericapisani Oct 26, 2023
e912caa
fix: missed a file extension
ericapisani Oct 26, 2023
7383958
fix: specify default export
ericapisani Oct 26, 2023
29bdca5
fix: export
ericapisani Oct 26, 2023
0cf8965
Merge branch 'main' into ericapisani/ct-69-finish-conversion-to-esm
ericapisani Oct 27, 2023
f8e4451
test: see if removing the concurrency resolves the test server error
ericapisani Oct 27, 2023
e6dd545
test: remove unused variable
ericapisani Oct 27, 2023
d7779ca
test: try different approach to getting the dirname variable
ericapisani Oct 27, 2023
0cac04d
style: lint
ericapisani Oct 27, 2023
a83a19d
test: revert earlier change
ericapisani Oct 27, 2023
1849d3c
test: include changes from PR #5921
ericapisani Oct 27, 2023
5e802c8
style: lint
ericapisani Oct 27, 2023
9df3a21
Merge branch 'main' into ericapisani/ct-69-finish-conversion-to-esm
ericapisani Oct 27, 2023
47e7aa8
fix: increase timeout
ericapisani Oct 27, 2023
fe39e4e
test: add fetch method
ericapisani Oct 27, 2023
6cfe3a6
test: remove snapshot files that aren't used anymore
ericapisani Oct 27, 2023
cee77ff
test: try asserting substring rather than snapshot
ericapisani Oct 27, 2023
751eb95
style: lint
ericapisani Oct 27, 2023
d3010c0
Merge branch 'main' into ericapisani/ct-69-finish-conversion-to-esm
ericapisani Oct 30, 2023
55e97b6
refactor: fix export
ericapisani Oct 30, 2023
3b76911
Revert "refactor: fix export"
ericapisani Oct 30, 2023
3d211d4
Merge branch 'ericapisani/ct-69-finish-conversion-to-esm' of ssh://gi…
ericapisani Oct 30, 2023
c8b6fd3
test: fix snapshot test from docs change
ericapisani Oct 30, 2023
9e6e410
Merge branch 'main' into ericapisani/ct-69-finish-conversion-to-esm
ericapisani Oct 30, 2023
08fbc6d
refactor: i need more coffee
ericapisani Oct 30, 2023
72d00a8
Merge branch 'ericapisani/ct-69-finish-conversion-to-esm' of ssh://gi…
ericapisani Oct 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .commitlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": ["@commitlint/config-conventional"]
estephinson marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
integration:
name: Integration
runs-on: ${{ matrix.os }}
timeout-minutes: 20
timeout-minutes: 40
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
Expand Down
1 change: 0 additions & 1 deletion commitlint.config.cjs

This file was deleted.

8 changes: 2 additions & 6 deletions functions/telemetry.cjs → functions/telemetry.mjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const fetch = require('node-fetch')
import fetch from 'node-fetch'

const TELEMETRY_SERVICE_URL = 'https://cli-telemetry.netlify.engineering'

// This function is a workaround for our inability to redirect traffic to a ntl function in another site
// using redirects (see https://github.com/netlify/cli-telemetry-service/issues/14)
const handler = async function ({ path, httpMethod, headers, body }) {
export const handler = async function ({ path, httpMethod, headers, body }) {
const upstreamPath = path.replace(/^\/telemetry\//, '/')

// Filter out some headers that shouldn't be fwded
Expand All @@ -31,7 +31,3 @@ const handler = async function ({ path, httpMethod, headers, body }) {
statusCode: 200,
}
}

module.exports = {
handler,
}
Loading
Loading