Skip to content
This repository has been archived by the owner on May 22, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into feat/per-function-config
Browse files Browse the repository at this point in the history
  • Loading branch information
jackiewmacharia committed Jul 12, 2022
2 parents 8725b04 + 20fe86c commit c3f429c
Show file tree
Hide file tree
Showing 72 changed files with 7,451 additions and 13,187 deletions.
15 changes: 14 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,22 @@ module.exports = {
extends: '@netlify/eslint-config-node',
rules: {
'import/extensions': ['error', 'ignorePackages'],
'node/no-missing-import': 'off',
'n/no-missing-import': 'off',
// This is disabled because TypeScript transpiles some features currently
// unsupported by Node 12, i.e. optional chaining
// TODO: re-enable after dropping support for Node 12
'n/no-unsupported-features/es-syntax': 'off',
// This rule enforces using Buffers with `JSON.parse()`. However, TypeScript
// does not recognize yet that `JSON.parse()` accepts Buffers as argument.
'unicorn/prefer-json-parse-buffer': 'off',
'padding-line-between-statements': [
'error',
// Require newline before return
{ blankLine: 'always', prev: '*', next: 'return' },
// Require newline after a batch of variable declarations
{ blankLine: 'always', prev: ['const', 'let', 'var'], next: '*' },
{ blankLine: 'any', prev: ['const', 'let', 'var'], next: ['const', 'let', 'var'] },
],
},
overrides: [
...overrides,
Expand All @@ -27,6 +39,7 @@ module.exports = {
'max-lines-per-function': 'off',
'max-statements': 'off',
'no-magic-numbers': 'off',
'padding-line-between-statements': 'off',
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @netlify/serverless
* @netlify/runtime-pod-compute
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Explain the **motivation** for making this change. What existing problem does th

For us to review and ship your PR efficiently, please perform the following steps:

- [ ] Open a [bug/issue](https://github.com/netlify/zip-it-and-ship-it/issues/new/choose) before writing your code
🧑‍💻. This ensures we can discuss the changes and get feedback from everyone that should be involved. If you\`re
fixing a typo or something that\`s on fire 🔥 (e.g. incident related), you can skip this step.
- [ ] Open a [bug/issue](https://github.com/netlify/zip-it-and-ship-it/issues/new/choose) before writing your code 🧑‍💻.
This ensures we can discuss the changes and get feedback from everyone that should be involved. If you\`re fixing
a typo or something that\`s on fire 🔥 (e.g. incident related), you can skip this step.
- [ ] Read the [contribution guidelines](../CONTRIBUTING.md) 📖. This ensures your code follows our style guide and
passes our tests.
- [ ] Update or add tests (if any source code was changed or added) 🧪
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
benchmark:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Node.js environment
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '*'
cache: 'npm'
Expand All @@ -27,7 +27,7 @@ jobs:
run: npm run benchmark

- name: Run Delta
uses: netlify/delta-action@v3
uses: netlify/delta-action@v4
with:
title: '⏱ Benchmark results'
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Download fossa cli
run: |-
mkdir -p $HOME/.local/bin
Expand Down
37 changes: 26 additions & 11 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,23 @@ on:
jobs:
integration:
runs-on: ubuntu-latest
strategy:
matrix:
site: ['netlify/netlify-plugin-nextjs']
steps:
- name: Checking out zip-it-and-ship-it
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: zip-it-and-ship-it
- name: Checking out test site
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: '${{ matrix.site }}'
repository: netlify/netlify-plugin-nextjs
path: test-site
- name: Checking out netlify-cli
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: netlify/cli
path: netlify-cli
- name: Installing Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '*'
cache: 'npm'
Expand Down Expand Up @@ -61,19 +58,37 @@ jobs:
run:
$GITHUB_WORKSPACE/netlify-cli/bin/run deploy --build --json --site ${{ secrets.NETLIFY_SITE_ID }} --auth ${{
secrets.NETLIFY_TOKEN }} --functions .netlify/functions > .netlify-deploy-log.json
working-directory: test-site
working-directory: test-site/demos/default
- name: Parsing deploy result
run: |
node -e "console.log('deploy_log_url=' + require('./.netlify-deploy-log.json').logs)" >> $GITHUB_ENV
node -e "console.log('deploy_url=' + require('./.netlify-deploy-log.json').deploy_url)" >> $GITHUB_ENV
working-directory: test-site
working-directory: test-site/demos/default
- name: Cypress run
uses: cypress-io/github-action@v2
with:
working-directory: test-site
browser: chrome
headless: true
record: true
parallel: true
config-file: cypress/config/ci.json
group: 'ZISI Integration Test - Next'
spec: cypress/integration/default/*
env:
DEBUG: '@cypress/github-action'
CYPRESS_baseUrl: ${{ env.deploy_url }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CYPRESS_RECORD_KEY: ${{ secrets.DEFAULT_CYPRESS_RECORD_KEY }}
- name: Posting comment
uses: KeisukeYamashita/create-comment@v1
with:
check-only-first-line: true
unique: true
comment: |
## Integration Test: ${{ matrix.site }}
## Integration Test: netlify/netlify-plugin-nextjs
✅ Cypress tests passed
- **Deploy URL**: ${{ env.deploy_url }}
- **Deploy logs**: ${{ env.deploy_log_url }}
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
{ prefix: 'security', type: 'security' },
]
steps:
- uses: netlify/pr-labeler-action@v1.0.0
- uses: netlify/pr-labeler-action@v1.1.0
if: startsWith(github.event.pull_request.title, matrix.pr.prefix)
with:
token: '${{ secrets.GITHUB_TOKEN }}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
prerelease:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '*'
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
token: ${{ steps.get-token.outputs.token }}
release-type: node
package-name: '@netlify/@netlify/zip-it-and-ship-it'
- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: ${{ steps.release.outputs.release_created }}
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: '*'
cache: 'npm'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
if: "${{ matrix.os == 'macOS-latest' }}"
- run: git config --global core.symlinks true
- name: Git checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Node.js ${{ matrix.node }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
Expand All @@ -52,7 +52,7 @@ jobs:
echo "::set-output name=os::${os/-latest/}"
echo "::set-output name=node::node_${node//[.*]/}"
shell: bash
- uses: codecov/codecov-action@v2
- uses: codecov/codecov-action@v3
with:
file: coverage/coverage-final.json
flags: ${{ steps.test-coverage-flags.outputs.os }},${{ steps.test-coverage-flags.outputs.node }}
96 changes: 96 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,102 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

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

## [5.12.0](https://github.com/netlify/zip-it-and-ship-it/compare/v5.11.1...v5.12.0) (2022-07-04)


### Features

* detect invalid binaries and show warning ([#1124](https://github.com/netlify/zip-it-and-ship-it/issues/1124)) ([77c835e](https://github.com/netlify/zip-it-and-ship-it/commit/77c835e24bcb61b663868e891987c4f7163ab4ff))


### Bug Fixes

* add error message if unable to find cron expression for scheduled function ([#1123](https://github.com/netlify/zip-it-and-ship-it/issues/1123)) ([2309f4b](https://github.com/netlify/zip-it-and-ship-it/commit/2309f4bf60d512e57241388189eb1a5ec69cbd26))
* **deps:** update dependency @vercel/nft to v0.20.1 ([#1130](https://github.com/netlify/zip-it-and-ship-it/issues/1130)) ([1d5d775](https://github.com/netlify/zip-it-and-ship-it/commit/1d5d775e5e1e0891d76c888f05afbed0de14ecc2))
* when building go locally always build for amd64 ([#1121](https://github.com/netlify/zip-it-and-ship-it/issues/1121)) ([4ba670c](https://github.com/netlify/zip-it-and-ship-it/commit/4ba670c07e7331a1fdcb61143cf01e0181d12ea9))

## [5.11.1](https://github.com/netlify/zip-it-and-ship-it/compare/v5.11.0...v5.11.1) (2022-06-21)


### Bug Fixes

* handle invalid `files` entry in package.json ([#1119](https://github.com/netlify/zip-it-and-ship-it/issues/1119)) ([dddd4f8](https://github.com/netlify/zip-it-and-ship-it/commit/dddd4f8f4fc2fd89062b931e533ec30afec504d3))

## [5.11.0](https://github.com/netlify/zip-it-and-ship-it/compare/v5.10.2...v5.11.0) (2022-06-15)


### Features

* remove feature flag `buildGoSource` and `zisi_detect_esm` ([#1113](https://github.com/netlify/zip-it-and-ship-it/issues/1113)) ([77763f6](https://github.com/netlify/zip-it-and-ship-it/commit/77763f6e4228786555becb45a1fc756386fc6d3c))

## [5.10.2](https://github.com/netlify/zip-it-and-ship-it/compare/v5.10.1...v5.10.2) (2022-06-13)


### Bug Fixes

* **deps:** update dependency @vercel/nft to ^0.20.0 ([#1110](https://github.com/netlify/zip-it-and-ship-it/issues/1110)) ([75de3d2](https://github.com/netlify/zip-it-and-ship-it/commit/75de3d2d3754ca509145700a5b6b16a466b036b2))

## [5.10.1](https://github.com/netlify/zip-it-and-ship-it/compare/v5.10.0...v5.10.1) (2022-06-10)


### Bug Fixes

* detect a wider range of scheduled functions ([#1105](https://github.com/netlify/zip-it-and-ship-it/issues/1105)) ([32a7387](https://github.com/netlify/zip-it-and-ship-it/commit/32a73871e4aa1b07bd04227ae22e50e143280095))

## [5.10.0](https://github.com/netlify/zip-it-and-ship-it/compare/v5.9.2...v5.10.0) (2022-06-03)


### Features

* include resolved included_files in response of `zipFunction` ([#1098](https://github.com/netlify/zip-it-and-ship-it/issues/1098)) ([830f9f2](https://github.com/netlify/zip-it-and-ship-it/commit/830f9f2b93ffbed66205ee21e7102c58f44153a1))


### Bug Fixes

* **deps:** update dependency @vercel/nft to ^0.19.0 ([#1091](https://github.com/netlify/zip-it-and-ship-it/issues/1091)) ([e329986](https://github.com/netlify/zip-it-and-ship-it/commit/e3299864d37b87de4bd6de92b0dacf54af1d8490))
* **deps:** update dependency @vercel/nft to v0.19.1 ([#1095](https://github.com/netlify/zip-it-and-ship-it/issues/1095)) ([4335698](https://github.com/netlify/zip-it-and-ship-it/commit/433569875b474d701a748b41fc8146d626a2fef5))
* **deps:** update dependency del to v6.1.0 ([#1093](https://github.com/netlify/zip-it-and-ship-it/issues/1093)) ([4ae024e](https://github.com/netlify/zip-it-and-ship-it/commit/4ae024e2e4205957bbfd0f2d122b92366e9ebb47))
* **deps:** update dependency del to v6.1.1 ([#1096](https://github.com/netlify/zip-it-and-ship-it/issues/1096)) ([846798a](https://github.com/netlify/zip-it-and-ship-it/commit/846798a00e801a7e936fca4226f84900e67df587))
* **deps:** update dependency glob to v7.2.3 ([#1089](https://github.com/netlify/zip-it-and-ship-it/issues/1089)) ([6419b22](https://github.com/netlify/zip-it-and-ship-it/commit/6419b22942e4c7757843f7b95e1bd8016ce06748))
* **deps:** update dependency minimatch to v5 ([#1032](https://github.com/netlify/zip-it-and-ship-it/issues/1032)) ([5aaf915](https://github.com/netlify/zip-it-and-ship-it/commit/5aaf9155ef21966bffc624f0e66cad4e23b6d14d))
* **deps:** update dependency yargs to v17 ([#933](https://github.com/netlify/zip-it-and-ship-it/issues/933)) ([2d99794](https://github.com/netlify/zip-it-and-ship-it/commit/2d99794558442bc86d0225235e58f586d59ad222))

### [5.9.2](https://github.com/netlify/zip-it-and-ship-it/compare/v5.9.1...v5.9.2) (2022-05-18)


### Bug Fixes

* correctly annotate transpilation errors in nft bundler ([#1086](https://github.com/netlify/zip-it-and-ship-it/issues/1086)) ([28a85fb](https://github.com/netlify/zip-it-and-ship-it/commit/28a85fb87b256b586033cf8c0aa653a52b21d32d))
* **deps:** update dependency @netlify/esbuild to v0.14.25 ([#1085](https://github.com/netlify/zip-it-and-ship-it/issues/1085)) ([43ab287](https://github.com/netlify/zip-it-and-ship-it/commit/43ab28772bc3ee663e03fb24858c19e52134c4f0))
* **deps:** update dependency @vercel/nft to v0.18.2 ([#1076](https://github.com/netlify/zip-it-and-ship-it/issues/1076)) ([55679c9](https://github.com/netlify/zip-it-and-ship-it/commit/55679c9ac19369f34223e867954f355091d376ec))
* **deps:** update dependency archiver to v5.3.1 ([#1077](https://github.com/netlify/zip-it-and-ship-it/issues/1077)) ([87e11b4](https://github.com/netlify/zip-it-and-ship-it/commit/87e11b40b76df2e34e0e791807a3747dada23874))
* **deps:** update dependency semver to v7.3.7 ([#1078](https://github.com/netlify/zip-it-and-ship-it/issues/1078)) ([5378020](https://github.com/netlify/zip-it-and-ship-it/commit/5378020fd6336b7ed20b0ffb2437d839bee4cd30))

### [5.9.1](https://github.com/netlify/zip-it-and-ship-it/compare/v5.9.0...v5.9.1) (2022-04-21)


### Bug Fixes

* adapt to new node:test module in node 18 ([#1069](https://github.com/netlify/zip-it-and-ship-it/issues/1069)) ([1ffe7c1](https://github.com/netlify/zip-it-and-ship-it/commit/1ffe7c183cd1f7e155038bf245bc5b253ef7854e))
* **deps:** update dependency @netlify/esbuild to v0.14.23 ([#1041](https://github.com/netlify/zip-it-and-ship-it/issues/1041)) ([e952932](https://github.com/netlify/zip-it-and-ship-it/commit/e952932bf1389da515094b2b1a4bc232479b2768))
* **deps:** update dependency @vercel/nft to ^0.18.0 ([#1056](https://github.com/netlify/zip-it-and-ship-it/issues/1056)) ([d9a45d8](https://github.com/netlify/zip-it-and-ship-it/commit/d9a45d82a4563449165dc68ea1ba66a102055d69))
* **deps:** update dependency es-module-lexer to ^0.10.0 ([#1044](https://github.com/netlify/zip-it-and-ship-it/issues/1044)) ([396b9ab](https://github.com/netlify/zip-it-and-ship-it/commit/396b9ab0d2e4e773d4f6444443d425ed17f81f6f))
* **deps:** update dependency es-module-lexer to v0.10.4 ([#1055](https://github.com/netlify/zip-it-and-ship-it/issues/1055)) ([e666dc1](https://github.com/netlify/zip-it-and-ship-it/commit/e666dc174b88f1e507f40a38c459b5f87c4a32e0))
* **deps:** update dependency es-module-lexer to v0.10.5 ([#1065](https://github.com/netlify/zip-it-and-ship-it/issues/1065)) ([b510094](https://github.com/netlify/zip-it-and-ship-it/commit/b510094205b12bcb8935cdf2576d1401ca05ded9))
* **deps:** update dependency semver to v7.3.6 ([#1066](https://github.com/netlify/zip-it-and-ship-it/issues/1066)) ([400cf3c](https://github.com/netlify/zip-it-and-ship-it/commit/400cf3c92d34024724bad3a266bd08d55d15623a))

## [5.9.0](https://github.com/netlify/zip-it-and-ship-it/compare/v5.8.0...v5.9.0) (2022-02-24)


### Features

* pin down esbuild version ([#1037](https://github.com/netlify/zip-it-and-ship-it/issues/1037)) ([c07dbe6](https://github.com/netlify/zip-it-and-ship-it/commit/c07dbe6510fa36d4973e3001a26d694dfce9700f))


### Bug Fixes

* **deps:** update dependency minimatch to v4.2.1 ([#1031](https://github.com/netlify/zip-it-and-ship-it/issues/1031)) ([c011c88](https://github.com/netlify/zip-it-and-ship-it/commit/c011c88e455130a751b0fb652de36460af5c4b5b))

## [5.8.0](https://github.com/netlify/zip-it-and-ship-it/compare/v5.7.5...v5.8.0) (2022-02-15)


Expand Down

0 comments on commit c3f429c

Please sign in to comment.