Merge remote-tracking branch 'getcronit/main'

.github/workflows/release.yml

@@ -0,0 +1,24 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+      - beta
+
+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
+      - run: yarn install
+      - name: Build
+        run: yarn run build
+      - name: Release
+        run: yarn workspaces run semantic-release -e semantic-release-monorepo

cache.patch

@@ -0,0 +1,27 @@
+diff --git a/node_modules/gatsby/cache-dir/create-content-digest-browser-shim.js b/node_modules/gatsby/cache-dir/create-content-digest-browser-shim.js
+index edc673f..cbd390c 100644
+--- a/node_modules/gatsby/cache-dir/create-content-digest-browser-shim.js
++++ b/node_modules/gatsby/cache-dir/create-content-digest-browser-shim.js
+@@ -1 +1 @@
+-exports.createContentDigest = () => ``
++export const createContentDigest = () => ``
+diff --git a/node_modules/gatsby/cache-dir/public-page-renderer.js b/node_modules/gatsby/cache-dir/public-page-renderer.js
+index 6a91ada..e2ee03a 100644
+--- a/node_modules/gatsby/cache-dir/public-page-renderer.js
++++ b/node_modules/gatsby/cache-dir/public-page-renderer.js
+@@ -1,9 +1,11 @@
+ const preferDefault = m => (m && m.default) || m
+
++let renderer = () => null;
++
+ if (process.env.BUILD_STAGE === `develop`) {
+-  module.exports = preferDefault(require(`./public-page-renderer-dev`))
++  renderer = preferDefault(require(`./public-page-renderer-dev`))
+ } else if (process.env.BUILD_STAGE === `build-javascript`) {
+-  module.exports = preferDefault(require(`./public-page-renderer-prod`))
+-} else {
+-  module.exports = () => null
++  renderer = preferDefault(require(`./public-page-renderer-prod`))
+ }
++
++export default renderer;

examples/my-gatsby-site/.env

@@ -1,2 +1,2 @@
-GATSBY_LENS_API_URL=https://api.photonq.lens.atsnek.com/graphql
+GATSBY_LENS_API_URL=https://api.lens.walther.exp.univie.ac.at:8080/graphql
 #SENTRY_AUTH_TOKEN=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

examples/my-gatsby-site/package.json

@@ -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"
   },

examples/my-gatsby-site/src/gatsby-plugin-jaen/components/Layout.tsx

@@ -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'
 

examples/my-gatsby-site/src/pages/404.tsx

@@ -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 = {
@@ -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',

examples/my-gatsby-site/src/pages/contact.tsx

@@ -1,4 +1,4 @@
-import {PageConfig, PageProps, useNotificationsContext} from '@atsnek/jaen'
+import {PageConfig, PageProps, useNotificationsContext} from 'jaen'
 
 import {
   Button,

examples/my-gatsby-site/src/pages/editor.tsx

@@ -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" />

examples/my-gatsby-site/src/pages/hidden-node.tsx

@@ -1,4 +1,4 @@
-import {PageConfig, PageProps} from '@atsnek/jaen'
+import {PageConfig, PageProps} from 'jaen'
 
 const Page: React.FC<PageProps> = ({location, pageContext}) => {
   return (

examples/my-gatsby-site/src/pages/index.tsx

@@ -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 = {
@@ -403,4 +403,4 @@ export const query = graphql`
   }
 `
 
-export {Head} from '@atsnek/jaen'
+export {Head} from 'jaen'

examples/my-gatsby-site/src/pages/mdx.tsx

@@ -1,8 +1,9 @@
-import {Field, PageConfig, PageProps} from '@atsnek/jaen'
+import {Field, PageConfig, PageProps} from 'jaen'
 import {Box} from '@chakra-ui/react'
-import {MdxField} 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<{
   playground?: boolean
@@ -26,6 +27,17 @@ const Page: React.FC<PageProps> = ({location, pageContext}) => {
 
   console.log('page:', page)
 
+  const [value, setValue] = useState<any>()
+
+  return (
+    <UncontrolledMdxField
+      components={{QASMPlayground}}
+      value={value}
+      onUpdateValue={setValue}
+      isEditing={true}
+    />
+  )
+
   return (
     <>
       <Link

examples/my-gatsby-site/src/pages/section.tsx

@@ -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(

examples/my-gatsby-site/src/pages/tree.tsx

@@ -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}) => {

examples/my-gatsby-site/src/pages/user/[...].tsx

@@ -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

examples/my-gatsby-site/src/pages/wholesale.tsx

@@ -1,4 +1,4 @@
-import {PageConfig, PageProps} from '@atsnek/jaen'
+import {PageConfig, PageProps} from 'jaen'
 
 const Page: React.FC<PageProps> = ({location, pageContext}) => {
   return (
@@ -15,6 +15,6 @@ export const pageConfig: PageConfig = {
   icon: 'FaWarehouse',
   auth: {
     isRequired: true,
-    roles: ['4d84a68f-7b18-4efe-ae73-d6d3dd226110']
+    roles: ['260237544631828483:kassabuch:admin']
   }
 }

examples/my-gatsby-site/src/templates/BlogPage.tsx

@@ -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()
@@ -67,4 +67,4 @@ export const query = graphql`
   }
 `
 
-export {Head} from '@atsnek/jaen'
+export {Head} from 'jaen'

package.json

@@ -3,12 +3,13 @@
   "description": "The Webapps framework for creating scalable and dynamic applications with ease.",
   "private": true,
   "version": "1.0.0",
-  "repository": "https://github.com/atsnek/jaen",
-  "author": "Nico Schett <schett@atsnek.com>",
+  "repository": "https://github.com/jaenjs/jaen",
+  "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",
@@ -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"
   }
 }

packages/gatsby-jaen-lens/gatsby/gatsby-node.ts

@@ -1,4 +1,4 @@
-import {PageConfig} from '@atsnek/jaen'
+import {PageConfig} from 'jaen'
 import {GatsbyNode, PluginOptions} from 'gatsby'
 
 export interface JaenLensPluginOptions extends PluginOptions {

packages/gatsby-jaen-lens/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-jaen-lens",
-  "version": "0.0.17",
+  "version": "1.0.0",
   "description": "Snek lens plugin for Jaen to render proxied views of internal services behind a firewall.",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,7 @@
   ],
   "keywords": [
     "gatsby",
-    "@atsnek/jaen",
+    "jaen",
     "snek-lens",
     "proxy"
   ],
@@ -27,7 +27,6 @@
   },
   "peerDependencies": {
     "@chakra-ui/react": "^2.8.0",
-    "@snek-functions/origin": "^0.9.0",
     "react": "^18.2.0"
   },
   "devDependencies": {

packages/gatsby-jaen-lens/src/clients/lens/src/index.ts

@@ -1,4 +1,7 @@
 import {makeSnekQuery} from 'snek-query'
+import {User} from 'oidc-client-ts'
+import 'jaen/dist/types'
+
 import {Query, Mutation} from './schema.generated'
 
 const apiURL = process.env.GATSBY_LENS_API_URL
@@ -10,6 +13,19 @@ if (!apiURL) {
 export const sq = makeSnekQuery(
   {Query, Mutation},
   {
-    apiURL
+    apiURL,
+    middlewares: [
+      ({context}) => {
+        const oidcStorage = sessionStorage.getItem(
+          `oidc.user:${__JAEN_ZITADEL__.authority}:${__JAEN_ZITADEL__.clientId}`
+        )
+
+        if (oidcStorage) {
+          const user = User.fromStorageString(oidcStorage)
+
+          context.headers['Authorization'] = `Bearer ${user.access_token}`
+        }
+      }
+    ]
   }
 )