Skip to content

Commit

Permalink
refactor: restore v2 repository structure
Browse files Browse the repository at this point in the history
  • Loading branch information
kleberbaum committed Aug 8, 2024
1 parent 2526160 commit 9c64c53
Show file tree
Hide file tree
Showing 90 changed files with 4,606 additions and 2,101 deletions.
17 changes: 0 additions & 17 deletions .github/workflows/npm-release.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Release

on:
push:
branches:
- main

jobs:
release:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 20
- uses: oven-sh/setup-bun@v1
- run: bun install --globally yarn
- run: bun install
- name: Build
run: yarn run build
- name: Release
run: yarn workspaces run semantic-release -e semantic-release-monorepo
19 changes: 0 additions & 19 deletions .releaserc.json

This file was deleted.

7 changes: 3 additions & 4 deletions examples/my-gatsby-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,17 @@
"scripts": {
"develop": "gatsby develop",
"start": "gatsby develop",
"build": "NODE_OPTIONS=--max-old-space-size=8192 gatsby build",
"serve": "gatsby serve",
"clean": "gatsby clean",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@atsnek/jaen": "^1.0.0-rc.1",
"@atsnek/jaen-fields-mdx": "^1.0.0-rc.1",
"jaen": "*",
"jaen-fields-mdx": "*",
"@radix-ui/react-icons": "^1.3.0",
"@react-icons/all-files": "https://github.com/react-icons/react-icons/releases/download/v4.11.0/react-icons-all-files-4.11.0.tgz",
"gatsby": "^5.11.0",
"gatsby-plugin-jaen": "^1.0.0-rc.1",
"gatsby-plugin-jaen": "*",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {LayoutProps, useWidget} from '@atsnek/jaen'
import {LayoutProps, useWidget} from 'jaen'
import {Box, Heading, HStack, Button} from '@chakra-ui/react'
import {useEffect} from 'react'

Expand Down
Binary file removed examples/my-gatsby-site/src/images/icon.png
Binary file not shown.
4 changes: 2 additions & 2 deletions examples/my-gatsby-site/src/pages/404.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react'
import {Link, HeadFC, PageProps} from 'gatsby'
import {PageConfig} from '@atsnek/jaen'
import {PageConfig} from 'jaen'
import {LightMode, GlobalStyle} from '@chakra-ui/react'

const pageStyles = {
Expand Down Expand Up @@ -55,7 +55,7 @@ const NotFoundPage: React.FC<PageProps> = () => {

export default NotFoundPage

export {Head} from '@atsnek/jaen'
export {Head} from 'jaen'

export const pageConfig: PageConfig = {
label: 'Oops! Page not found',
Expand Down
2 changes: 1 addition & 1 deletion examples/my-gatsby-site/src/pages/contact.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageConfig, PageProps, useNotificationsContext} from '@atsnek/jaen'
import {PageConfig, PageProps, useNotificationsContext} from 'jaen'

import {
Button,
Expand Down
2 changes: 1 addition & 1 deletion examples/my-gatsby-site/src/pages/editor.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Field, PageConfig, PageProps} from '@atsnek/jaen'
import {Field, PageConfig, PageProps} from 'jaen'

const Page: React.FC<PageProps> = ({location, pageContext}) => {
return <Field.Editor name="editor" />
Expand Down
2 changes: 1 addition & 1 deletion examples/my-gatsby-site/src/pages/hidden-node.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageConfig, PageProps} from '@atsnek/jaen'
import {PageConfig, PageProps} from 'jaen'

const Page: React.FC<PageProps> = ({location, pageContext}) => {
return (
Expand Down
6 changes: 3 additions & 3 deletions examples/my-gatsby-site/src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import {
useMediaModal,
usePageContext,
useSiteMetadataContext
} from '@atsnek/jaen'
} from 'jaen'
import {Link, useJaenFrameMenuContext} from 'gatsby-plugin-jaen'

import {Box, Button, LightMode, Text} from '@chakra-ui/react'
import {graphql} from 'gatsby'
import * as React from 'react'

import {UncontrolledMdxField} from '@atsnek/jaen-fields-mdx'
import {UncontrolledMdxField} from 'jaen-fields-mdx'
import {FaCogs} from '@react-icons/all-files/fa/FaCogs'

const pageStyles = {
Expand Down Expand Up @@ -403,4 +403,4 @@ export const query = graphql`
}
`

export {Head} from '@atsnek/jaen'
export {Head} from 'jaen'
6 changes: 3 additions & 3 deletions examples/my-gatsby-site/src/pages/mdx.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {Field, PageConfig, PageProps} from '@atsnek/jaen'
import {Field, PageConfig, PageProps} from 'jaen'
import {Box} from '@chakra-ui/react'
import {MdxField, UncontrolledMdxField} from '@atsnek/jaen-fields-mdx'
import {MdxField, UncontrolledMdxField} from 'jaen-fields-mdx'
import {Link} from 'gatsby-plugin-jaen'
import {usePage} from '@atsnek/jaen'
import {usePage} from 'jaen'
import {useState} from 'react'

const QASMPlayground: React.FC<{
Expand Down
2 changes: 1 addition & 1 deletion examples/my-gatsby-site/src/pages/section.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {connectBlock, Field, PageConfig, PageProps} from '@atsnek/jaen'
import {connectBlock, Field, PageConfig, PageProps} from 'jaen'
import {VStack} from '@chakra-ui/react'

const Block = connectBlock(
Expand Down
2 changes: 1 addition & 1 deletion examples/my-gatsby-site/src/pages/tree.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
PageConfig,
PageProps,
useCMSManagementContext
} from '@atsnek/jaen'
} from 'jaen'
import {CMSManagement} from 'gatsby-plugin-jaen'

const Page: React.FC<PageProps> = ({location, pageContext}) => {
Expand Down
2 changes: 1 addition & 1 deletion examples/my-gatsby-site/src/pages/user/[...].tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageConfig, PageProps} from '@atsnek/jaen'
import {PageConfig, PageProps} from 'jaen'

const Page: React.FC<PageProps> = ({location, pageContext}) => {
// everything after /user/ is the handle
Expand Down
2 changes: 1 addition & 1 deletion examples/my-gatsby-site/src/pages/wholesale.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageConfig, PageProps} from '@atsnek/jaen'
import {PageConfig, PageProps} from 'jaen'

const Page: React.FC<PageProps> = ({location, pageContext}) => {
return (
Expand Down
6 changes: 3 additions & 3 deletions examples/my-gatsby-site/src/templates/BlogPage.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as React from 'react'
import {Link, HeadFC, PageProps, navigate, graphql} from 'gatsby'
import {Field, PageConfig, useField, useJaenPageIndex} from '@atsnek/jaen'
import {Field, PageConfig, useField, useJaenPageIndex} from 'jaen'
import {Button} from '@chakra-ui/react'
import {MdxField} from '@atsnek/jaen-fields-mdx'
import {MdxField} from 'jaen-fields-mdx'

const BlogPage: React.FC<PageProps> = props => {
const index = useJaenPageIndex()
Expand Down Expand Up @@ -67,4 +67,4 @@ export const query = graphql`
}
`

export {Head} from '@atsnek/jaen'
export {Head} from 'jaen'
5 changes: 0 additions & 5 deletions lerna.json

This file was deleted.

12 changes: 9 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"private": true,
"version": "1.0.0",
"repository": "https://github.com/atsnek/jaen",
"author": "Nico Schett <schett@atsnek.com>",
"author": "Nico Schett <nico.schett@cronit.io>",
"scripts": {
"lint:fix": "yarn eslint packages/jaen/src/ --fix",
"prettier:fix": "yarn prettier packages/jaen/src/ --write",
"format": "yarn prettier:fix && yarn lint:fix"
"format": "yarn prettier:fix && yarn lint:fix",
"build": "yarn workspace jaen run build && yarn workspace gatsby-source-jaen run build && yarn workspace gatsby-plugin-jaen run build && yarn workspace gatsby-jaen-mailpress run build && yarn workspace gatsby-jaen-lens run build && yarn workspace jaen-fields-mdx run build"
},
"workspaces": [
"packages/jaen",
Expand All @@ -25,13 +26,18 @@
"prettier-plugin-organize-imports": "^3.2.2"
},
"devDependencies": {
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/commit-analyzer": "^13.0.0",
"@semantic-release/release-notes-generator": "^14.0.0",
"@typescript-eslint/eslint-plugin": "^5.0.0",
"eslint": "^8.0.1",
"eslint-config-standard-with-typescript": "^27.0.1",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-n": "^15.0.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-react": "^7.32.0"
"eslint-plugin-react": "^7.32.0",
"semantic-release": "^24.0.0",
"semantic-release-monorepo": "^8.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/gatsby-jaen-lens/gatsby/gatsby-node.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageConfig} from '@atsnek/jaen'
import {PageConfig} from 'jaen'
import {GatsbyNode, PluginOptions} from 'gatsby'

export interface JaenLensPluginOptions extends PluginOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-jaen-lens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"keywords": [
"gatsby",
"@atsnek/jaen",
"jaen",
"snek-lens",
"proxy"
],
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby-jaen-lens/src/pages/lens/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
PageConfig,
useAuthenticationContext,
useNotificationsContext
} from '@atsnek/jaen'
} from 'jaen'
import {
Button,
Heading,
Expand Down Expand Up @@ -321,4 +321,4 @@ export const query = graphql`
}
`

export {Head} from '@atsnek/jaen'
export {Head} from 'jaen'
4 changes: 2 additions & 2 deletions packages/gatsby-jaen-lens/src/pages/lens/service.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Box} from '@chakra-ui/react'
import {PageConfig, PageProps} from '@atsnek/jaen'
import {PageConfig, PageProps} from 'jaen'
import {useEffect, useState} from 'react'

const Page: React.FC<PageProps> = ({data, location}) => {
Expand Down Expand Up @@ -52,4 +52,4 @@ export const pageConfig: PageConfig = {

export default Page

export {Head} from '@atsnek/jaen'
export {Head} from 'jaen'
2 changes: 1 addition & 1 deletion packages/gatsby-jaen-mailpress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@snek-functions/origin": "^0.9.0",
"gatsby": "^5.12.4",
"react": "^18.2.0",
"@atsnek/jaen": "^1.0.0-rc.55"
"jaen": "^1.0.0"
},
"devDependencies": {}
}
2 changes: 1 addition & 1 deletion packages/gatsby-jaen-mailpress/src/client/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {makeSnekQuery} from 'snek-query'
import {User} from 'oidc-client-ts'
import '@atsnek/jaen/dist/types'
import 'jaen/dist/types'

import {Query, Mutation} from './schema.generated'

Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-jaen-mailpress/src/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {snekResourceId, useNotificationsContext} from '@atsnek/jaen'
import {snekResourceId, useNotificationsContext} from 'jaen'
import {sq} from '@snek-functions/origin'

import React, {useCallback, useEffect, useState} from 'react'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageConfig, PageProps} from '@atsnek/jaen'
import {PageConfig, PageProps} from 'jaen'
import {useEffect} from 'react'
import {navigate} from 'gatsby'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageConfig, PageProps, useNotificationsContext} from '@atsnek/jaen'
import {PageConfig, PageProps, useNotificationsContext} from 'jaen'
import {useEffect, useMemo} from 'react'

import {CopyIcon, DeleteIcon} from '@chakra-ui/icons'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageConfig, useNotificationsContext} from '@atsnek/jaen'
import {PageConfig, useNotificationsContext} from 'jaen'
import {
Box,
Button,
Expand Down Expand Up @@ -229,4 +229,4 @@ export const query = graphql`
}
`

export {Head} from '@atsnek/jaen'
export {Head} from 'jaen'
3 changes: 2 additions & 1 deletion packages/gatsby-jaen-resource/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "gatsby-jaen-resource",
"private": true,
"version": "0.0.9",
"description": "Resource management plugin for Jaen",
"main": "index.js",
"keywords": [
"gatsby",
"@atsnek/jaen"
"jaen"
],
"dependencies": {
"@react-icons/all-files": "https://github.com/react-icons/react-icons/releases/download/v4.11.0/react-icons-all-files-4.11.0.tgz",
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby-jaen-resource/src/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {snekResourceId, useNotificationsContext} from '@atsnek/jaen'
import {snekResourceId, useNotificationsContext} from 'jaen'
import {sq} from '@snek-functions/origin'

import React, {useCallback, useEffect, useState} from 'react'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
PageProps,
useAuthenticationContext,
useNotificationsContext
} from '@atsnek/jaen'
} from 'jaen'
import {
Avatar,
Box,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PageConfig} from '@atsnek/jaen'
import {PageConfig} from 'jaen'

import {FaPlus} from '@react-icons/all-files/fa/FaPlus'
import {FaCheckCircle} from '@react-icons/all-files/fa/FaCheckCircle'
Expand Down Expand Up @@ -400,4 +400,4 @@ export const query = graphql`
}
`

export {Head} from '@atsnek/jaen'
export {Head} from 'jaen'
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-jaen/gatsby/gatsby-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const onCreateWebpackConfig: GatsbyNode['onCreateWebpackConfig'] =
{actions, loaders, stage, plugins, getConfig},
pluginOptions: JaenPluginOptions
) => {
const {version} = await import('@atsnek/jaen/package.json')
const {version} = await import('jaen/package.json')

const config = getConfig()

Expand Down
Loading

0 comments on commit 9c64c53

Please sign in to comment.