Skip to content

Commit

Permalink
Merge branch 'main' into feat/fastify/gatsby-v4
Browse files Browse the repository at this point in the history
* main:
  fix: fix yarn lock
  fix: remove learnaa config
  chore: change to changeset publish command from learna. This reducees tooling and supports github releases/changelogs
  Version Packages (#94)
  chore(gatsby-plugin-relative-ci): update dependency @babel/core to ^7.15.8 (#89)
  chore(gatsby-source-packagist): update non-major dependency versions (#90)
  fix(gatsby-plugin-ackee-tracker): update dependency @babel/core to ^7.15.8 (#91)
  fix(test-site): update non-major dependency versions (#93)
  chore(repo): update dependency lint-staged to ^11.2.3 (#92)
  Version Packages (#88)
  rewrite(gatsby-plugin-fastify): move frome callbacks to async/await (#87)
  • Loading branch information
moonmeister committed Oct 15, 2021
2 parents 58edd4f + 2ba9b85 commit 93a7eca
Show file tree
Hide file tree
Showing 16 changed files with 1,097 additions and 3,483 deletions.
24 changes: 4 additions & 20 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- name: Execute tests
run: yarn test
release:
needs: test
name: Release
runs-on: ubuntu-latest
steps:
Expand All @@ -48,25 +49,8 @@ jobs:

- name: Create Release Pull Request
uses: changesets/action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
publish-npm:
needs: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14
registry-url: https://registry.npmjs.org/
cache: "yarn"

- name: Install Dependencies
run: yarn install --immutable

- name: Build packages
run: yarn build

- run: yarn publish-ci
release: yarn publish-ci
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{secrets.NPM_TOKEN}}
108 changes: 0 additions & 108 deletions CONTRIBUTING.md

This file was deleted.

4 changes: 0 additions & 4 deletions lerna.json

This file was deleted.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
"packages/**/test-site"
],
"scripts": {
"ac": "all-contributors",
"ac": "yarn all-contributors",
"build": "yarn workspaces foreach -vpi --no-private run build",
"cs": "yarn changeset",
"format": "yarn run lint --write",
"lint": "yarn prettier \"**/*.{js,ts,md,json,yml,json}\" --check",
"publish-ci": "lerna publish from-package -y --no-verify-access",
"postinstall": "husky install",
"publish-ci": "yarn build && yarn changeset publish",
"postinstall": "yarn husky install",
"test": "yarn workspaces foreach -vp run test"
},
"devDependencies": {
"@changesets/changelog-github": "^0.4.1",
"@changesets/cli": "^2.17.0",
"all-contributors-cli": "^6.20.0",
"husky": "^7.0.2",
"lerna": "^4.0.0",
"lint-staged": "^11.1.2",
"lint-staged": "^11.2.3",
"prettier": "^2.4.1"
},
"packageManager": "yarn@3.1.0-rc.6",
Expand Down
6 changes: 6 additions & 0 deletions packages/gatsby-plugin-ackee-tracker/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# gatsby-plugin-ackee-tracker

## 3.0.3

### Patch Changes

- [#91](https://github.com/gatsby-uc/plugins/pull/91) [`2609944`](https://github.com/gatsby-uc/plugins/commit/2609944278068cb59a0fec6cdb35224956de85f4) Thanks [@renovate](https://github.com/apps/renovate)! - fix(gatsby-plugin-ackee-tracker): update dependency @babel/core to ^7.15.8

## 3.0.2

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby-plugin-ackee-tracker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-ackee-tracker",
"version": "3.0.2",
"version": "3.0.3",
"description": "Gatsby plugin to add Ackee Tracker to a site.",
"keywords": [
"ackee",
Expand Down Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@babel/cli": "^7.15.7",
"@babel/core": "^7.15.5",
"@babel/core": "^7.15.8",
"ackee-tracker": "^5",
"babel-preset-gatsby-package": "^1.14.0",
"cross-env": "^7.0.3"
Expand Down
6 changes: 6 additions & 0 deletions packages/gatsby-plugin-fastify/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# gatsby-plugin-fastify

## 0.4.4

### Patch Changes

- [#87](https://github.com/gatsby-uc/plugins/pull/87) [`5529aad`](https://github.com/gatsby-uc/plugins/commit/5529aadf0f65c4b0c193131d606c3ce7d8d06651) Thanks [@moonmeister](https://github.com/moonmeister)! - Update main server execution to use async/await from callbacks

## 0.4.3

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-fastify/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gatsby-plugin-fastify",
"description": "Gatsby plugin for integration serving gatsby on Node.js using Fastify.",
"version": "0.4.3",
"version": "0.4.4",
"main": "index.js",
"repository": {
"type": "git",
Expand Down
18 changes: 10 additions & 8 deletions packages/gatsby-plugin-fastify/src/serve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Fastify from "fastify";
import { getConfig } from "./utils/config";
import open from "open";

export function gatsbyServer() {
export async function gatsbyServer() {
const {
cli: { port, host, open: openBrowser, verbose },
server: { prefix },
Expand All @@ -13,16 +13,18 @@ export function gatsbyServer() {

console.info("Registered Gatsby @ ", prefix || "/");

fastify.register(serveGatsby);
await fastify.register(serveGatsby);

fastify.listen(port, host, (err, listeningOn) => {
if (err) {
console.error(err);
process.exit(1);
}
try {
const listeningOn = await fastify.listen(port, host);

console.log(`listening @ ${listeningOn}`);

if (openBrowser) open(listeningOn);
});
} catch (err) {
console.error("Failed to start Fastify", err);
process.exit(1);
}

return fastify;
}
7 changes: 7 additions & 0 deletions packages/gatsby-plugin-fastify/test-site/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# test-fastify-gatsby

## 1.0.4

### Patch Changes

- Updated dependencies [[`5529aad`](https://github.com/gatsby-uc/plugins/commit/5529aadf0f65c4b0c193131d606c3ce7d8d06651)]:
- gatsby-plugin-fastify@0.4.4

## 1.0.3

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby-plugin-fastify/test-site/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "test-fastify-gatsby",
"version": "1.0.3",
"version": "1.0.4",
"private": true,
"description": "Gatsby test site for gatsby-plugin-fastify",
"author": "Alex Moon",
Expand All @@ -18,7 +18,7 @@
"fastify": "^3.22.0",
"fastify-accepts": "^2.0.1",
"fastify-compress": "^3.6.0",
"fastify-static": "^4.2.3",
"fastify-static": "^4.4.0",
"gatsby": "next",
"gatsby-plugin-fastify": "*",
"gatsby-plugin-image": "next",
Expand Down
6 changes: 6 additions & 0 deletions packages/gatsby-plugin-relative-ci/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# gatsby-plugin-relative-ci

## 1.2.1

### Patch Changes

- [#89](https://github.com/gatsby-uc/plugins/pull/89) [`e25969c`](https://github.com/gatsby-uc/plugins/commit/e25969c6e9ac10e3cbaaf0e96256f8b050e23bb7) Thanks [@renovate](https://github.com/apps/renovate)! - chore(gatsby-plugin-relative-ci): update dependency @babel/core to ^7.15.8

## 1.2.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby-plugin-relative-ci/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-plugin-relative-ci",
"version": "1.2.0",
"version": "1.2.1",
"description": "Integrate your Gatsby site with Relative CI",
"keywords": [
"gatsby",
Expand All @@ -21,7 +21,7 @@
},
"devDependencies": {
"@babel/cli": "^7.15.7",
"@babel/core": "^7.15.5",
"@babel/core": "^7.15.8",
"babel-preset-gatsby-package": "^1.14.0",
"cross-env": "^7.0.3",
"prettier": "^2.4.1"
Expand Down
6 changes: 6 additions & 0 deletions packages/gatsby-source-packagist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# gatsby-source-packagist

## 1.1.2

### Patch Changes

- [#90](https://github.com/gatsby-uc/plugins/pull/90) [`6a45363`](https://github.com/gatsby-uc/plugins/commit/6a45363db445758ee3194996082262dee0c4ef88) Thanks [@renovate](https://github.com/apps/renovate)! - chore(gatsby-source-packagist): update non-major dependency versions

## 1.1.1

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/gatsby-source-packagist/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gatsby-source-packagist",
"version": "1.1.1",
"version": "1.1.2",
"description": "Search the Packagist(PHP package repository) with gatsby GraphQL data schema.",
"keywords": [
"gatsby",
Expand All @@ -22,7 +22,7 @@
"license": "MIT",
"dependencies": {
"@octokit/rest": "^17.11.2",
"mime-types": "^2.1.32",
"mime-types": "^2.1.33",
"packagist-api-client": "^2.0.0"
},
"scripts": {
Expand All @@ -32,7 +32,7 @@
},
"devDependencies": {
"@babel/cli": "^7.15.7",
"@babel/core": "^7.15.5",
"@babel/core": "^7.15.8",
"babel-preset-gatsby-package": "^1.14.0",
"cross-env": "^7.0.3",
"gatsby-source-filesystem": "^3.14.0",
Expand Down
Loading

0 comments on commit 93a7eca

Please sign in to comment.