Commit 1661a0c5 authored by Marek Veselý's avatar Marek Veselý
Browse files

Merge branch 'new-embedding' into 'main' 

Embedding

Closes inject-issues#155

See merge request inject/frontend!484
parents 5f35c2a2 715f79c3

backend @ 3dccb344

Compare 1db4bfb7 to 3dccb344
Original line number Diff line number Diff line 
Subproject commit 1db4bfb78c18a68550f20e55d51868d6cc23b345
 
Subproject commit 3dccb34478da72fc0e8e1c03e8414620a86b8c55

codegen/01-entrypoint.sh

+0 −8
Original line number Diff line number Diff line
@@ -14,14 +14,6 @@ if [ ! -d "./schemas" ]; then 
  exit 1

fi



# gql folder must be present

if [ ! -d "./gql" ]; then

  echo "Codegen: `gql` folder not found"

  exit 1

fi



find ./gql -type f -name "*.graphql"



# list out graphql schema files in schemas dir

SCHEMA_FILES=$(find ./schemas -type f -name "*.graphql")

# echo them out

codegen/package.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "@inject/codegen",

  "version": "2.17.2",

  "version": "2.19.0",

  "description": "GraphQL API Codegen Setup for the Inject Backend",

  "main": "index.js",

  "license": "MIT",

docker/schema-gen/docker-compose.yml

+0 −4
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ services: 
        source: schemas

        target: /usr/src/app/schemas

        read_only: true

      - type: bind

        source: ../../codegen/gql

        target: /usr/src/app/gql

        read_only: true

      - type: bind

        source: ../../graphql/

        target: /usr/src/app/generated

eslint.config.cjs

+173 −162
Original line number Diff line number Diff line
@@ -6,9 +6,11 @@ const eslintPrettier = require('eslint-config-prettier') 
const tseslint = require('typescript-eslint')

const reactPlugin = require('eslint-plugin-react')

const hooksPlugin = require('eslint-plugin-react-hooks')

const emotionPlugin = require('@emotion/eslint-plugin')

const reactCompiler = require('eslint-plugin-react-compiler')



const config = tseslint.config({

const config = tseslint.config(

  {

    extends: [

      eslint.configs.recommended,

      eslintPrettier,
@@ -72,6 +74,9 @@ const config = tseslint.config({ 
      // react-hooks plugin configuration

      'react-hooks/rules-of-hooks': 'error',

      'react-hooks/exhaustive-deps': 'warn',



      // emotion plugin configuration

      'react/no-unknown-property': ['error', { ignore: ['css'] }],

    },



    languageOptions: {
@@ -107,6 +112,7 @@ const config = tseslint.config({ 
      // @ts-ignore

      'react-hooks': hooksPlugin,

      'react-compiler': reactCompiler,

      '@emotion': emotionPlugin,

    },

    settings: {

      react: {
@@ -122,7 +128,8 @@ const config = tseslint.config({ 
    // there is a lack of typing in TSESlint for this property

    // @ts-ignore

    ignores: ['**/*.d.ts'],

}, {

  },

  {

    rules: {

      'no-restricted-imports': [

        'warn',
@@ -137,6 +144,8 @@ const config = tseslint.config({ 
          ],

        },

      ],

      // emotion plugin configuration

      'react/no-unknown-property': ['error', { ignore: ['css'] }],

    },



    languageOptions: {
@@ -172,6 +181,7 @@ const config = tseslint.config({ 
      // @ts-ignore

      'react-hooks': hooksPlugin,

      'react-compiler': reactCompiler,

      '@emotion': emotionPlugin,

    },

    settings: {

      react: {
@@ -187,6 +197,7 @@ const config = tseslint.config({ 
    // there is a lack of typing in TSESlint for this property

    // @ts-ignore

    ignores: ['**/*.d.ts', 'frontend/src/pages/**/*'],

})

  }

)



module.exports = config