Skip to content

Commit

Permalink
Merge pull request #54 from builder-group/develop
Browse files Browse the repository at this point in the history
Merge develop into main
  • Loading branch information
bennobuilder authored Aug 2, 2024
2 parents fbfb759 + 09199e7 commit 0cfd8d1
Show file tree
Hide file tree
Showing 164 changed files with 509 additions and 1,414 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": ["@changesets/changelog-github", { "repo": "inbeta-group/monorepo" }],
"changelog": ["@changesets/changelog-github", { "repo": "builder-group/monorepo" }],
"commit": false,
"fixed": [],
"linked": [],
Expand Down
18 changes: 18 additions & 0 deletions .changeset/lemon-moons-chew.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
'google-webfonts-client': patch
'validation-adapters': patch
'validation-adapter': patch
'feature-logger': patch
'@blgc/openapi-router': patch
'feature-fetch': patch
'feature-react': patch
'feature-state': patch
'figma-connect': patch
'feature-form': patch
'@blgc/config': patch
'@blgc/types': patch
'@blgc/utils': patch
'@blgc/cli': patch
---

Rebrand to builder.group
Binary file modified .github/assets/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions .github/assets/banner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .github/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
uses: tsickert/[email protected]
with:
webhook-url: ${{ env.DISCORD_WEBHOOK_URL }}
content: "New versions of @ibg were published!"
content: "New versions of @blgc were published!"

- name: 🔄 Merge main into develop
if: steps.changesets.outputs.published == 'true'
Expand Down
4 changes: 2 additions & 2 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ module.exports = {
importOrder: [
// External packages
'<THIRD_PARTY_MODULES>',
// inbeta.group packages
'^@ibg/',
// builder.group packages
'^@blgc/',
// Internal packages
'^@/',
'',
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Code of Conduct

inbeta.group has adopted a Code of Conduct that we expect project participants to follow.
builder.group has adopted a Code of Conduct that we expect project participants to follow.
Please [read the full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.
22 changes: 11 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to inbeta.group (ibg)
# Contributing to builder.group (blgc)

We are open and grateful for any contribution made by the community. If you're interested in contributing to inbeta.group, this document might make the process for you easier.
We are open and grateful for any contribution made by the community. If you're interested in contributing to builder.group, this document might make the process for you easier.

The [Open Source Guides](https://opensource.guide/) website has a collection of resources for individuals,
communities, and companies who want to learn how to run and contribute to an open-source project.
Expand All @@ -21,7 +21,7 @@ The structure of the `package.json` file in this project should adhere to a spec

```json
{
"name": "@ibg/template",
"name": "@blgc/template",
"description": "Description of the package",
"version": "0.0.1",
"private": true, // Or false if package should be published to NPM
Expand All @@ -35,15 +35,15 @@ The structure of the `package.json` file in this project should adhere to a spec
},
"repository": {
"type": "git",
"url": "https://github.com/inbeta-group/monorepo.git"
"url": "https://github.com/builder-group/monorepo.git"
},
"keywords": [],
"author": "@bennoinbeta",
"author": "@bennobuilder",
"license": "MIT",
"bugs": {
"url": "https://github.com/inbeta-group/monorepo/issues"
"url": "https://github.com/builder-group/monorepo/issues"
},
"homepage": "https://inbeta.group/?source=github",
"homepage": "https://builder.group/?source=github",
"dependencies": {
// Project dependencies here
},
Expand Down Expand Up @@ -76,19 +76,19 @@ For specific packages, additional fields should be included as shown below. Note

## Q and A

### Why is `@ibg/types` listed as a dependency in some packages?
### Why is `@blgc/types` listed as a dependency in some packages?

`@ibg/types` is listed as a dependency to ensure it's automatically installed for consumers, preventing issues like `any` types for `feature-x` packages due to missing `TUnionToIntersection`.
`@blgc/types` is listed as a dependency to ensure it's automatically installed for consumers, preventing issues like `any` types for `feature-x` packages due to missing `TUnionToIntersection`.

For more details: [Microsoft/types-publisher/issues/81](https://github.com/Microsoft/types-publisher/issues/81).

Alternatives:
- Move `TUnionToIntersection` into each package
- Enforce `@ibg/types` as a `peerDependency`
- Enforce `@blgc/types` as a `peerDependency`

## 📄 License

By contributing to inbeta.group, you agree that your contributions will be licensed under the license defined in [`LICENSE.md`](./LICENSE.md).
By contributing to builder.group, you agree that your contributions will be licensed under the license defined in [`LICENSE.md`](./LICENSE.md).

## 🎉 Credits

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2024 @bennoinbeta
Copyright (c) 2024 @bennobuilder

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
62 changes: 34 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,49 +1,55 @@
<h1 align="center">
<img src="./.github/assets/banner.svg" alt="inbeta.group (ibg) banner">
<img src="./.github/assets/banner.svg" alt="builder.group (blgc) banner">
</h1>

<p align="left">
<a href="https://github.com/inbeta-group/monorepo/blob/develop/LICENSE">
<img src="https://img.shields.io/github/license/inbeta-group/monorepo.svg?label=license&style=flat&colorA=293140&colorB=F0E81A" alt="GitHub License"/>
<a href="https://github.com/builder-group/monorepo/blob/develop/LICENSE">
<img src="https://img.shields.io/github/license/builder-group/monorepo.svg?label=license&style=flat&colorA=293140&colorB=FDE200" alt="GitHub License"/>
</a>
<a href="https://dyn.art/s/discord/?source=inbeta-group-readme">
<img src="https://img.shields.io/discord/795291052897992724.svg?label=&logo=discord&logoColor=000000&color=293140&labelColor=F0E81A" alt="Join Discord"/>
<a href="https://discord.gg/w4xE3bSjhQ">
<img src="https://img.shields.io/discord/795291052897992724.svg?label=&logo=discord&logoColor=000000&color=293140&labelColor=FDE200" alt="Join Discord"/>
</a>
</p>

A collection of open source libraries maintained by [@bennoinbeta](https://github.com/bennoinbeta) and [inbeta.group](https://inbeta.group).

Brought to you by [dyn.art](https://github.com/dyn-art/monorepo). An open-source and template based image generation API.
A collection of open source libraries maintained by [builder.group](https://builder.group). Let's build together.

## 📦 Packages

| Package | Description | NPM Package |
|---------|-------------|-------------|
| [cli](https://github.com/inbeta-group/monorepo/blob/develop/packages/cli) | Straightforward CLI to bundle Typescript libraries with presets, powered by Rollup and Esbuild | [`@ibg/cli`](https://www.npmjs.com/package/@ibg/cli) |
| [config](https://github.com/inbeta-group/monorepo/blob/develop/packages/cli) | Collection of ESLint, Vite, and Typescript configurations | [`@ibg/config`](https://www.npmjs.com/package/@ibg/config) |
| [feature-fetch](https://github.com/inbeta-group/monorepo/blob/develop/packages/feature-fetch) | Straightforward, typesafe, and feature-based fetch wrapper supporting OpenAPI types | [`feature-fetch`](https://www.npmjs.com/package/feature-fetch) |
| [feature-form](https://github.com/inbeta-group/monorepo/blob/develop/packages/feature-form) | Straightforward, typesafe, and feature-based form library | [`feature-form`](https://www.npmjs.com/package/feature-form) |
| [feature-logger](https://github.com/inbeta-group/monorepo/blob/develop/packages/feature-logger) | Straightforward, typesafe, and feature-based logging library | [`feature-logger`](https://www.npmjs.com/package/feature-logger) |
| [feature-react](https://github.com/inbeta-group/monorepo/blob/develop/packages/feature-react) | ReactJs extension for the feature-state and feature-form library, providing hooks and features for ReactJs | [`feature-state-react`](https://www.npmjs.com/package/feature-state-react) |
| [feature-state](https://github.com/inbeta-group/monorepo/blob/develop/packages/feature-state) | Straightforward, typesafe, and feature-based state management library for ReactJs | [`feature-state`](https://www.npmjs.com/package/feature-state) |
| [figma-connect](https://github.com/inbeta-group/monorepo/blob/develop/packages/figma-connect) | Straightforward and typesafe wrapper around the communication between the app/ui (iframe) and plugin (sandbox) part of a Figma Plugin | [`figma-connect`](https://www.npmjs.com/package/figma-connect) |
| [google-webfonts-client](https://github.com/inbeta-group/monorepo/blob/develop/packages/google-webfonts-client) | Typesafe and straightforward fetch client for interacting with the Google Web Fonts API using feature-fetch | [`google-webfonts-client`](https://www.npmjs.com/package/google-webfonts-client) |
| [openapi-router](https://github.com/inbeta-group/monorepo/blob/develop/packages/openapi-router) | Thin wrapper around the router of web frameworks like Express and Hono, offering OpenAPI typesafety and seamless integration with validation libraries such as Valibot and Zod | [`@ibg/openapi-router`](https://www.npmjs.com/package/@ibg/openapi-router) |
| [utils](https://github.com/inbeta-group/monorepo/blob/develop/packages/utils) | Straightforward, typesafe, and tree-shakable collection of utility functions | [`@ibg/utils`](https://www.npmjs.com/package/@ibg/utils) |
| [validation-adapter](https://github.com/inbeta-group/monorepo/blob/develop/packages/validation-adapter) | Universal validation adapter that integrates various validation libraries like Zod, Valibot, and Yup | [`validation-adapter`](https://www.npmjs.com/package/validation-adapter) |
| [validation-adapters](https://github.com/inbeta-group/monorepo/blob/develop/packages/validation-adapters) | Pre-made validation adapters for the validation-adapter library, including adapters for Zod and Valibot | [`validation-adapters`](https://www.npmjs.com/package/validation-adapters) |
| Package | Description | NPM Package |
| ---------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------- |
| [cli](https://github.com/builder-group/monorepo/blob/develop/packages/cli) | Straightforward CLI to bundle Typescript libraries with presets, powered by Rollup and Esbuild | [`@blgc/cli`](https://www.npmjs.com/package/@blgc/cli) |
| [config](https://github.com/builder-group/monorepo/blob/develop/packages/cli) | Collection of ESLint, Vite, and Typescript configurations | [`@blgc/config`](https://www.npmjs.com/package/@blgc/config) |
| [feature-fetch](https://github.com/builder-group/monorepo/blob/develop/packages/feature-fetch) | Straightforward, typesafe, and feature-based fetch wrapper supporting OpenAPI types | [`feature-fetch`](https://www.npmjs.com/package/feature-fetch) |
| [feature-form](https://github.com/builder-group/monorepo/blob/develop/packages/feature-form) | Straightforward, typesafe, and feature-based form library | [`feature-form`](https://www.npmjs.com/package/feature-form) |
| [feature-logger](https://github.com/builder-group/monorepo/blob/develop/packages/feature-logger) | Straightforward, typesafe, and feature-based logging library | [`feature-logger`](https://www.npmjs.com/package/feature-logger) |
| [feature-react](https://github.com/builder-group/monorepo/blob/develop/packages/feature-react) | ReactJs extension for the feature-state and feature-form library, providing hooks and features for ReactJs | [`feature-state-react`](https://www.npmjs.com/package/feature-state-react) |
| [feature-state](https://github.com/builder-group/monorepo/blob/develop/packages/feature-state) | Straightforward, typesafe, and feature-based state management library for ReactJs | [`feature-state`](https://www.npmjs.com/package/feature-state) |
| [figma-connect](https://github.com/builder-group/monorepo/blob/develop/packages/figma-connect) | Straightforward and typesafe wrapper around the communication between the app/ui (iframe) and plugin (sandbox) part of a Figma Plugin | [`figma-connect`](https://www.npmjs.com/package/figma-connect) |
| [google-webfonts-client](https://github.com/builder-group/monorepo/blob/develop/packages/google-webfonts-client) | Typesafe and straightforward fetch client for interacting with the Google Web Fonts API using feature-fetch | [`google-webfonts-client`](https://www.npmjs.com/package/google-webfonts-client) |
| [openapi-router](https://github.com/builder-group/monorepo/blob/develop/packages/openapi-router) | Thin wrapper around the router of web frameworks like Express and Hono, offering OpenAPI typesafety and seamless integration with validation libraries such as Valibot and Zod | [`@blgc/openapi-router`](https://www.npmjs.com/package/@blgc/openapi-router) |
| [utils](https://github.com/builder-group/monorepo/blob/develop/packages/utils) | Straightforward, typesafe, and tree-shakable collection of utility functions | [`@blgc/utils`](https://www.npmjs.com/package/@blgc/utils) |
| [validation-adapter](https://github.com/builder-group/monorepo/blob/develop/packages/validation-adapter) | Universal validation adapter that integrates various validation libraries like Zod, Valibot, and Yup | [`validation-adapter`](https://www.npmjs.com/package/validation-adapter) |
| [validation-adapters](https://github.com/builder-group/monorepo/blob/develop/packages/validation-adapters) | Pre-made validation adapters for the validation-adapter library, including adapters for Zod and Valibot | [`validation-adapters`](https://www.npmjs.com/package/validation-adapters) |

### 📚 Examples

> See [`/examples`](https://github.com/inbeta-group/monorepo/tree/develop/examples)
> See [`/examples`](https://github.com/builder-group/monorepo/tree/develop/examples)
### `feature-state`
- [`feature-state/react/counter`](https://github.com/inbeta-group/monorepo/tree/develop/examples/feature-state/react/counter)

- [`feature-state/react/counter`](https://github.com/builder-group/monorepo/tree/develop/examples/feature-state/react/counter)

### `feature-form`
- [`feature-form/react/basic`](https://github.com/inbeta-group/monorepo/tree/develop/examples/feature-form/react/basic)

- [`feature-form/react/basic`](https://github.com/builder-group/monorepo/tree/develop/examples/feature-form/react/basic)

### `openapi-router`
- [`openapi-router/hono/petstore`](https://github.com/inbeta-group/monorepo/tree/develop/examples/openapi-router/hono/petstore)
- [`openapi-router/express/petstore`](https://github.com/inbeta-group/monorepo/tree/develop/examples/openapi-router/express/petstore)

- [`openapi-router/hono/petstore`](https://github.com/builder-group/monorepo/tree/develop/examples/openapi-router/hono/petstore)
- [`openapi-router/express/petstore`](https://github.com/builder-group/monorepo/tree/develop/examples/openapi-router/express/petstore)

## FAQ

### What does `blgc` stand for?

`blgc` stands for **B**ui**L**der.**G**roup **C**ommunity, chosen because similar names like `blg`, `bldr` and `bgc` were already taken.
2 changes: 1 addition & 1 deletion examples/feature-form/react/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"preview": "vite preview"
},
"dependencies": {
"@ibg/utils": "workspace:*",
"@blgc/utils": "workspace:*",
"feature-form": "workspace:*",
"validation-adapters": "workspace:*",
"feature-react": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion examples/feature-form/react/basic/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { randomHex, shortId } from '@blgc/utils';
import {
bitwiseFlag,
createForm,
Expand All @@ -11,7 +12,6 @@ import { withGlobalBind } from 'feature-react/state';
import React from 'react';
import * as v from 'valibot';
import * as z from 'zod';
import { randomHex, shortId } from '@ibg/utils';

import './App.css';

Expand Down
2 changes: 1 addition & 1 deletion examples/openapi-router/express/petstore/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
*/
module.exports = {
root: true,
extends: [require.resolve('@ibg/config/eslint/library')]
extends: [require.resolve('@blgc/config/eslint/library')]
};
4 changes: 2 additions & 2 deletions examples/openapi-router/express/petstore/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

### Patch Changes

- Updated dependencies [[`35d0ca2`](https://github.com/inbeta-group/monorepo/commit/35d0ca2baaf734a63499f668d2e278f501cf9a71)]:
- @ibg/openapi-router@0.0.7
- Updated dependencies [[`35d0ca2`](https://github.com/builder-group/monorepo/commit/35d0ca2baaf734a63499f668d2e278f501cf9a71)]:
- @blgc/openapi-router@0.0.7
4 changes: 2 additions & 2 deletions examples/openapi-router/express/petstore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"source": "./src/index.ts",
"main": "./dist/index.js",
"dependencies": {
"@ibg/openapi-router": "workspace:*",
"@blgc/openapi-router": "workspace:*",
"express": "^4.19.2",
"valibot": "^0.35.0",
"validation-adapters": "workspace:*"
},
"devDependencies": {
"@ibg/config": "workspace:*",
"@blgc/config": "workspace:*",
"@types/express": "^4.17.21",
"@types/node": "^20.14.10",
"nodemon": "^3.1.4",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppError } from '@blgc/openapi-router';
import type express from 'express';
import { AppError } from '@ibg/openapi-router';

import { type components } from '../gen/v1';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppError } from '@blgc/openapi-router';
import type express from 'express';
import { AppError } from '@ibg/openapi-router';

export function invalidPathMiddleware(
req: express.Request,
Expand Down
2 changes: 1 addition & 1 deletion examples/openapi-router/express/petstore/src/router.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createExpressOpenApiRouter } from '@blgc/openapi-router';
import { Router } from 'express';
import * as v from 'valibot';
import { vValidator } from 'validation-adapters/valibot';
import { createExpressOpenApiRouter } from '@ibg/openapi-router';

import { type paths } from './gen/v1';
import { PetSchema } from './schemas';
Expand Down
2 changes: 1 addition & 1 deletion examples/openapi-router/express/petstore/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@ibg/config/shared-library.tsconfig.json",
"extends": "@blgc/config/shared-library.tsconfig.json",
"compilerOptions": {
"outDir": "./dist",
"rootDir": "./src",
Expand Down
2 changes: 1 addition & 1 deletion examples/openapi-router/hono/petstore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"gen:openapi": "npx openapi-typescript ./resources/openapi-v1.yaml -o ./src/gen/v1.ts"
},
"dependencies": {
"@ibg/openapi-router": "workspace:*",
"@blgc/openapi-router": "workspace:*",
"@hono/node-server": "^1.12.0",
"@hono/zod-validator": "^0.2.2",
"hono": "^4.4.12",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AppError } from '@blgc/openapi-router';
import type * as hono from 'hono/types';
import { StatusCode } from 'hono/utils/http-status';
import { AppError } from '@ibg/openapi-router';

import { components } from '../gen/v1';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppError } from '@blgc/openapi-router';
import type * as hono from 'hono/types';
import { AppError } from '@ibg/openapi-router';

export const invalidPathHandler: hono.NotFoundHandler = (c) => {
throw new AppError('#ERR_PATH_NOT_FOUND', 404, {
Expand Down
Loading

0 comments on commit 0cfd8d1

Please sign in to comment.