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

[pull] main from netlify:main #141

Open
wants to merge 1,202 commits into
base: main
Choose a base branch
from
Open

[pull] main from netlify:main #141

wants to merge 1,202 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 14, 2022

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@github-actions
Copy link

github-actions bot commented Dec 14, 2022

📊 Benchmark results

Comparing with 35123df

Package size: 263 MB

⬆️ 3.16% increase vs. 35123df

^          263 MB 
│  254 MB   ┌──┐  
│   ┌──┐    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
│   |  |    |▒▒|  
└───┴──┴────┴──┴──>
    T-1      T    
Legend
  • T-1 (35123df): 254 MB
  • T (current commit): 263 MB

@pull pull bot added the ⤵️ pull label Dec 14, 2022
@pull pull bot added the merge-conflict Resolve conflicts manually label Mar 25, 2023
renovate bot and others added 27 commits May 14, 2024 10:01
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: token-generator-app[bot] <82042599+token-generator-app[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* chore(deps): update actions/upload-artifact action to v4

* chore: prevent duplicate report names

* chore: include explicit codecov token

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Mateusz Bocian <[email protected]>
Co-authored-by: token-generator-app[bot] <82042599+token-generator-app[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Erica Pisani <[email protected]>
* fix: support .mjs functions

* refactor: fix some types

* refactor: use manifest instead of readdir

* fix: replace string concatenation

* chore: write test for ntl:serve

* chore: prettier
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Sarah Etter <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Sarah Etter <[email protected]>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* refactor: remove code paths based on siteInfo.use_envelope

* refactor: remove import methods for non-envelope cases

* refactor: rename importIntoEnvelope -> importDotEnv

* test: remove tests around non-envelope flows

* refactor: rename envelopeToEnvelope -> cloneEnvVars

* refactor: move contents of injectEnv into parent

* fix: silence ts errors

* test: update env cli tests to use envelope api mocks

* test: remove unsupported case from test

* test: mock envelope api urls

* fix: use new variable names instead of reassigning
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* fix(deps): update dependency jwt-decode to v4

* chore: fix import syntax

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Mateusz Bocian <[email protected]>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
dependabot bot and others added 30 commits October 17, 2024 18:46
Bumps [cookie](https://github.com/jshttp/cookie) to 0.7.2 and updates ancestor dependencies [cookie](https://github.com/jshttp/cookie), [light-my-request](https://github.com/fastify/light-my-request) and [verdaccio](https://github.com/verdaccio/verdaccio). These dependencies need to be updated together.


Updates `cookie` from 0.7.2 to 0.7.2
- [Release notes](https://github.com/jshttp/cookie/releases)
- [Commits](jshttp/cookie@v0.7.2...v0.7.2)

Updates `light-my-request` from 5.13.0 to 5.14.0
- [Release notes](https://github.com/fastify/light-my-request/releases)
- [Commits](fastify/light-my-request@v5.13.0...v5.14.0)

Updates `verdaccio` from 5.32.2 to 6.0.1
- [Release notes](https://github.com/verdaccio/verdaccio/releases)
- [Changelog](https://github.com/verdaccio/verdaccio/blob/v6.0.1/CHANGELOG.md)
- [Commits](verdaccio/verdaccio@v5.32.2...v6.0.1)

---
updated-dependencies:
- dependency-name: cookie
  dependency-type: direct:production
- dependency-name: light-my-request
  dependency-type: indirect
- dependency-name: verdaccio
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: token-generator-app[bot] <82042599+token-generator-app[bot]@users.noreply.github.com>
#6867)

* fix: logs: deploy command instructs user to link to a site if one is not linked

Co-authored-by: Dylan Spyer <[email protected]>

* fix: logs: deploy command instructs user to link to a site if one is not linked

* fix: logs:deploy command instructs user to link to a site if one is not linked

Co-authored-by: Dylan Spyer <[email protected]>

* fix: logs: deploy command instructs user to link to a site if one is not linked

Co-authored-by: Dylan Spyer <[email protected]>

* fix: logs: deploy command instructs user to link to a site if one is not linked

Co-authored-by: Dylan Spyer <[email protected]>

---------

Co-authored-by: Dylan Spyer <[email protected]>
Co-authored-by: Daniel Lew <[email protected]>
…predicates (#6877)

* chore: created new type for API errors, created and implemented type predicates

Created APIError interface in `command-helpers.ts`.
Created two type predicates `isAPIError` and `errorHasStatus`.
Implemented predicates across the code base.

Co-authored-by: Ben Hancock <[email protected]>

* chore: deleted remaining TSFIXME comments that were not needed anymore

Deleted remaining TSFIXME comments that were not needed anymore
due to adding `unknown` type to custom `error` function.

Co-authored-by: Ben Hancock <[email protected]>

* fix: deleted unnecessary comment in command-helpers.ts

* fix: added missing argument in fn call in status.ts

* Update src/utils/hooks/requires-site-info.ts

Co-authored-by: Daniel Lew <[email protected]>

* Update src/utils/framework-server.ts

Co-authored-by: Daniel Lew <[email protected]>

* fix: removed type predicates in favor of type assertion for APIError

Co-authored-by: Ben Hancock <[email protected]>

* fix: fixed syntax error in deploy.ts

Co-authored-by: Ben Hancock <[email protected]>

---------

Co-authored-by: Ben Hancock <[email protected]>
Co-authored-by: Daniel Lew <[email protected]>
* chore: fix TypeScript errors in login and logout files

Fixed TS errors in login and logout.
Created `tokenTuple` type for the `getToken` function's return type
Updated `getToken` function calls to remove TypeScript ignore comments

Co-authored-by: Ben Hancock<[email protected]>

* fix: corrected tuple type

Co-authored-by: Ben Hancock <[email protected]>

* fix: type narrowed in /integration/deploy.ts to avoid passing undefined tokens

Co-authored-by: Ben Hancock <[email protected]>

* chore: extracted Location to its own type

Co-authored-by: Ben Hancock <[email protected]>

* fix: fix to building headers object for fetch request in deploy.ts

Co-authored-by: Ben Hancock <[email protected]>

* fix: reverted `getToken` changes back to previous

In cases where `getToken` can't find a token,
changed it back to previous behavior of returning `[null, 'not found']`.
Changed `tokenTuple` type to reflect changes.
This preserves previous behavior while ensuring type safety for
function calls that use `getToken`'s return value. This required a
new variable `blobsToken` to satisfy `runCoreSteps` function argument type requirements.

Co-authored-by: Ben Hancock <[email protected]>

* Update src/utils/types.ts

Co-authored-by: Daniel Lew <[email protected]>

* fix: updated Location type to TokenLocation to be more specific

Co-authored-by: Ben Hancock <[email protected]>

---------

Co-authored-by: Ben Hancock <[email protected]>
Co-authored-by: Daniel Lew <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* chore: updated types for sites commands

Co-authored-by: Dylan Spyer <[email protected]>

* fix: remove duplicate RepoFromGithub interface

* fix: add RepoFromGithub import to utils.ts

* fix: update RepoFromGithub import to utils.ts

* fix: update type imports in sites-create-template.ts

* fix: update type import in sites-create.ts

* chore: rename new ReposFromGithub interface to GithubRepos

Co-authored-by: Dylan Spyer <[email protected]>

* fix: removed unused ts-expect-error directive

Co-authored-by: Dylan Spyer <[email protected]>

* Update types.ts

---------

Co-authored-by: Dylan Spyer <[email protected]>
Co-authored-by: Daniel Lew <[email protected]>
…#6865)

* fix: link --name prefers exact match if exists, first match otherwise

Co-authored-by: Ben Hancock <[email protected]>
Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: Will Conrad <[email protected]>

* fix: link --name prefers exact match if exists, first match otherwise

Co-authored-by: Ben Hancock <[email protected]>

* chore: added SiteInfo type and updated link.ts and api.ts to use it

Co-authored-by: Ben Hancock <[email protected]>

* fix: updated sites-list file to fix type error

Co-authored-by: Ben Hancock <[email protected]>

* fix: updated SiteInfo env prop to be optional

Co-authored-by: Ben Hancock <[email protected]>

* Update src/commands/link/link.ts

Co-authored-by: Daniel Lew <[email protected]>

* Update src/commands/sites/sites-list.ts

Co-authored-by: Daniel Lew <[email protected]>

* fix: used utility type in sites-list.ts

Co-authored-by: Ben Hancock <[email protected]>

---------

Co-authored-by: Ben Hancock <[email protected]>
Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: Will Conrad <[email protected]>
Co-authored-by: Daniel Lew <[email protected]>
…netlify.toml (#6897)

Co-authored-by: Dylan Spyer <[email protected]>
Co-authored-by: Daniel Lew <[email protected]>
#6884)

* fix: updated error message for attempting to deploy a site with a bad auth key

Co-authored-by: Ben Hancock <[email protected]>

* fix: updated error message for deploying with bad auth key to be more precise

Co-authored-by: Ben Hancock <[email protected]>

* chore: remove `ts-expect-error`s in `get-site`

Co-authored-by: Ben Hancock <[email protected]>

---------

Co-authored-by: Ben Hancock <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…completion:install (#6882)

* fix: fixed bugs in completion

Co-authored-by: Dylan Spyer <[email protected]>

* fix: add zsh autocompletion setup and file permissions instructions to completion:install

Co-authored-by: Dylan Spyer <[email protected]>

* fix: update completion

Co-authored-by: Dylan Spyer <[email protected]>

* fix: remove obselete ts-expect-error in command-helpers

Co-authored-by: Dylan Spyer <[email protected]>

* fix: update constant imports in completion:install test file

Co-authored-by: Dylan Spyer <[email protected]>

---------

Co-authored-by: Dylan Spyer <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: token-generator-app[bot] <82042599+token-generator-app[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* feat: more clear error messege

nforms the user that this could be from a netlify function opening ports

Co-authored-by: Thomas Lane <[email protected]>

* fix: updated port in use error message

Co-authored-by: Thomas Lane <[email protected]>

* fix: added types for EADDRINUSE error and updated error message
Co-authored-by: Will <[email protected]>

* fix: reverted back to commit before prettier and pnpm were installed
Co-authored-by: Thomas Lane <[email protected]>

---------

Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: t <[email protected]>
…e error handling in sites:create-template (#6908)

* fix: `sites:create-template` command erroneously creating GitHub repos

Previously, if you had a site on Netlify without a corresponding GitHub repo,
running `sites:create-template` would prompt for a new name *and* create the
repo on GitHub. This fix uses a `listSites` API call to check if the site already
exists. If it does, it prompts for a new name and doesn't create a new repo.

Co-authored-by: Ben Hancock <[email protected]>

* fix: re-factored and re-organized

Co-authored-by: Ben Hancock <[email protected]>

* fix: fixed bug in sites:create-template

Previously, if you had a site on Netlify without a corresponding
repo, `sites:create-template` would create a repo *and* prompt for
a new name, resulting in an unused repo. The same situation would
occur if the site existed globally. This fix implements checks that
avoid creating repos unnecessarily.

Co-authored-by: Ben Hancock <[email protected]>

* test: started test file for sites:create-template

Co-authored-by: Ben Hancock <[email protected]>

* fix: update sites-create-template

prevent redundant repos, add preliminary name checks,
and improve error handling in sites:create-template

Co-authored-by: Ben Hancock <[email protected]>

* fix: remove unneccessary comments

Co-authored-by: Ben Hancock <[email protected]>

* fix: increase timeouts to fix tests

Co-authored-by: Ben Hancock <[email protected]>

* fix: solves test bugs

Co-authored-by: Ben Hancock <[email protected]>

* fix: rewrote tests

Co-authored-by: Ben Hancock <[email protected]>

* fix: remove unneccessary mocks

Co-authored-by: Ben Hancock <[email protected]>

---------

Co-authored-by: Ben Hancock <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* fix: hide github access token input in sites:create-template

Co-authored-by: Dylan Spyer <[email protected]>

* fix: update error message to be more user-friendly

Co-authored-by: Dylan Spyer <[email protected]>

---------

Co-authored-by: Dylan Spyer <[email protected]>
* feat: added logic handeling for the `env:set` command

Will prompt the user if scope and/or context is not provided

Co-authored-by: Thomas Lane <[email protected]>

* feat: prompt before setting env variable across context and scope
Co-authored-by: Will <[email protected]>

* fix: prettier
Co-authored-by: Will <[email protected]>

* fix: refactored prompts
Co-authored-by: Will <[email protected]>

* fix: refactor prompts
Co-authored-by: Will <[email protected]>

* feat: env:unset prompts user before unsetting env variable indiscriminantly across contexts
Co-authored-by: Will <[email protected]>

* feat: created tests for env:set prompts

Created several tests to check env:test prompts

* build: refactored env:set promts and rewrote tests

created a new directory in utils called prompts, to store all future prompts.

rewrote the prompts to only check for destructive actions.

added tests for each of the destructive prompts

Co-authored-by: Thomas Lane <[email protected]>

* feat: added prompt for env:clone and tests

Co-authored-by: Thomas Lane <[email protected]>

* fix: prettier fix
Co-authored-by: Thomas Lane <[email protected]>

* build: added prompts and tests for blob command

for blobl:set and blob:delete

Co-authored-by: Thomas Lane <[email protected]>

* fix: updated tests in file to reflect new prompts

* fix: updated documentation

updated the documentation

Co-authored-by: Thomas Lane <[email protected]>

* fix: updated error

updated error handeling

Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: Thomas Lane <[email protected]>

* fix: updated new lines in messages for consistence

updated prompts spacing for consistencey

Co-authored-by: Thomas Lane <[email protected]>

* fix: fixed prettier error

Co-authored-by: Thomas Lane <[email protected]>

* feat: env-set refactored

refactored messages in env-set to a function that exports an object to be reused

Co-authored-by: Thomas Lane <[email protected]>

* fix: reactored env:unset prompts

Co-authored-by: Thomas Lane <[email protected]>

* fix: refactored prompts and tests messages

Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: Thomas Lane <[email protected]>

* fix: another pass of refactoring

env and blob commands

Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: Thomas Lane <[email protected]>

* feat: added skip for non interactive shell and CI

Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: Thomas Lane <[email protected]>

* feat: refactored code for tests realted to ci and prompts

Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: Thomas Lane <[email protected]>

* fix: prettier fix

Co-authored-by: Thomas Lane <[email protected]>

* fix: removed console.log statements

Co-authored-by: Thomas Lane <[email protected]>

* fix: updated prompts based on pr feedback

Co-authored-by: Thomas Lane <[email protected]>

* feat: added force flag option to all commands
scripted commands automatically given the force flag
Co-authored-by: Will <[email protected]>

* fix: started updating tests to work with higher level --force flag for scritped commands
Co-authored-by: Will <[email protected]>

* feat: refactored tests to use mockProgram
Co-authored-by: Thomas Lane <[email protected]>

* feat: refactor of run.js into components to add force flag

Co-authored-by: Thomas Lane <[email protected]>

* fix: types.ts merge } deletion
Co-authored-by: Thomas Lane <[email protected]>

* fix: fix default lint issue and typescript issue

fixed lint issue that was casuing test in ci enviroment to fail

Co-authored-by: Thomas Lane <[email protected]>

* fix: update blob to blobs

Co-authored-by: Thomas Lane <[email protected]>

* fix: updated prompt tests for ci/cd enviroment

Co-authored-by: Thomas Lane <[email protected]>

* fix: updated prompt tests to work correctly in ci/cd enviroments

Co-authored-by: Thomas Lane <[email protected]>

* fix: updated types and env variables not being restored after tests

Co-authored-by: Thomas Lane <[email protected]>

* fix: fixed tests

Co-authored-by: Thomas Lane <[email protected]>

* fix: fixed flakey deploy test and added env cleanup to more tests

* fix: removed a console.log() statement

Co-authored-by: Thomas Lane <[email protected]>

* fix: cleaned up unused functions and comments

Co-authored-by: Thomas Lane <[email protected]>

* chore: cleanup comments minor bug fixes
Co-authored-by: Will <[email protected]>

* chore: prettier, needed to update docs
Co-authored-by: Will <[email protected]>

* chore: merged updates to main.ts
Co-authored-by: Will <[email protected]>

* fix: reset env variable and mocks type error

* fix: fixed test type error part 2

* fix: removed restModules from test

* fix: updated test to have inquirer mocked correctly

add the missing methods to the inquirer mock to fix all type errors

* fix: reverted the force flags on lm commands to original behavior
as the force option was for credential helper installation rather than skipping prompts
Co-authored-by: Will <[email protected]>

---------

Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: t <[email protected]>
Co-authored-by: Thomas Lane <[email protected]>
Co-authored-by: Daniel Lew <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.