Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: netlify/cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.14.0
Choose a base ref
...
head repository: netlify/cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.15.0
Choose a head ref
  • 7 commits
  • 20 files changed
  • 4 contributors

Commits on Apr 5, 2021

  1. chore(deps): lock file maintenance (#2073)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 5, 2021
    Copy the full SHA
    b8aaa12 View commit details
  2. chore(deps): update dependency sinon to v10 (#2072)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 5, 2021
    Copy the full SHA
    a943d15 View commit details
  3. chore(deps): update dependency apollo-datasource-rest to ^0.11.0 (#2070)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 5, 2021
    Copy the full SHA
    14d350c View commit details
  4. Copy the full SHA
    eb8fb19 View commit details
  5. chore(deps): update dependency @netlify/eslint-config-node to ^2.6.1 (#…

    …2075)
    
    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Apr 5, 2021
    Copy the full SHA
    cee5e0d View commit details
  6. Copy the full SHA
    0a99aef View commit details
  7. Copy the full SHA
    1a963bf View commit details
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
Thanks for submitting a pull request!
Please make sure you've read and understood our contributing guidelines;
https://github.com/netlify/netlify-cms/blob/master/CONTRIBUTING.md
https://github.com/netlify/netlify-cli/blob/main/CONTRIBUTING.md
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx", where #xxxx is the issue number.
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name: Dependency License Scanning
on:
push:
branches:
- master
- main
- fossa

defaults:
9 changes: 7 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@ name: Testing for CLI

on:
push:
branches: [master]
branches: [main]
pull_request:
branches: [master]
branches: [main]

jobs:
build:
@@ -14,6 +14,11 @@ jobs:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
node-version: [10.x, 15.x]
exclude:
- os: macOS-latest
node-version: 10.x
- os: windows-latest
node-version: 10.x
fail-fast: false

steps:
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ name: release-please
on:
push:
branches:
- master
- main
jobs:
release-please:
runs-on: ubuntu-latest
4 changes: 2 additions & 2 deletions .github/workflows/verify-docs.yml
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@ name: Verify Docs

on:
push:
branches: [master]
branches: [main]
pull_request:
branches: [master]
branches: [main]

jobs:
build:
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

## [3.15.0](https://www.github.com/netlify/cli/compare/v3.14.0...v3.15.0) (2021-04-05)


### Features

* rename default branch from master to main ([#2077](https://www.github.com/netlify/cli/issues/2077)) ([0a99aef](https://www.github.com/netlify/cli/commit/0a99aef2a9ea8fefe300f77c1e67396a23c82594))

## [3.14.0](https://www.github.com/netlify/cli/compare/v3.13.12...v3.14.0) (2021-04-04)


4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ We also test for a few other things:

We actively welcome your pull requests.

1. Fork the repo and create your branch from `master`.
1. Fork the repo and create your branch from `main`.
2. If you've added code that should be tested, add tests.
3. If you've changed APIs, update the documentation.
4. Run `npm test` to run linting, formatting and tests.
@@ -92,7 +92,7 @@ We actively welcome your pull requests.
## Releasing

1. Merge the release PR
2. Switch to the default branch `git checkout master`
2. Switch to the default branch `git checkout main`
3. Pull latest changes `git pull`
4. Publish the package `npm publish`

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# ![Netlify CLI](cli.png)

[![Coverage Status](https://codecov.io/gh/netlify/cli/branch/master/graph/badge.svg)](https://codecov.io/gh/netlify/cli)
[![Coverage Status](https://codecov.io/gh/netlify/cli/branch/main/graph/badge.svg)](https://codecov.io/gh/netlify/cli)
[![npm version][npm-img]][npm] [![downloads][dl-img]][dl] [![netlify-status][netlify-img]][netlify] [![dependencies][david-img]][david] [![security][snyk-img]][snyk][![FOSSA Status](https://app.fossa.com/api/projects/custom%2B17679%2Fgit%40github.com%3Anetlify%2Fcli.git.svg?type=shield)](https://app.fossa.com/projects/custom%2B17679%2Fgit%40github.com%3Anetlify%2Fcli.git?ref=badge_shield)

Interact with [Netlify](http://netlify.com/) from the comfort of your CLI.

See the [CLI command line reference](https://cli.netlify.com/commands/) to get started and the docs on using [Netlify Dev](https://github.com/netlify/cli/blob/master/docs/netlify-dev.md) to run your site locally.
See the [CLI command line reference](https://cli.netlify.com/commands/) to get started and the docs on using [Netlify Dev](https://github.com/netlify/cli/blob/main/docs/netlify-dev.md) to run your site locally.

## Table of Contents

2 changes: 1 addition & 1 deletion codecov.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
codecov:
strict_yaml_branch: master
strict_yaml_branch: main
coverage:
range: [80, 100]
parsers:
4 changes: 2 additions & 2 deletions docs/netlify-dev.md
Original file line number Diff line number Diff line change
@@ -124,7 +124,7 @@ Netlify Dev is meant to work with zero config for the majority of users, by usin

Netlify Dev will attempt to detect the site generator or build command that you are using, and run these on your behalf, while adding other development utilities. If you have a JavaScript project, it looks for the best `package.json` script to run for you, using simple heuristics, so you can use the full flexibility of npm scripts. We may add more intelligence to this in the future.

**Overriding the detectors**: The number of [project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/master/src/detectors) is growing, but if yours is not yet supported (contributions welcome!), you can instruct Netlify Dev to run the project on your behalf by declaring it in a `[dev]` block of your `netlify.toml` file.
**Overriding the detectors**: The number of [project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/main/src/detectors) is growing, but if yours is not yet supported (contributions welcome!), you can instruct Netlify Dev to run the project on your behalf by declaring it in a `[dev]` block of your `netlify.toml` file.

```toml
# sample dev block in the toml
@@ -146,7 +146,7 @@ against your project.
```

The `framework` option should be one of the available
[project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/master/src/detectors)
[project types which Netlify Dev can detect](https://github.com/netlify/cli/tree/main/src/detectors)
or `#auto` (default) to test all available detectors, `#static` for a static
file server or `#custom` to use `command` option to run an app server and
`targetPort` option to connect to it.
Loading