From 4593d682b2ee36741d5f18c3065d1d270aa239bd Mon Sep 17 00:00:00 2001 From: Aram <37216945+alimpens@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:09:23 +0100 Subject: [PATCH] Remove NX from admin app (#619) --- apps/admin/.eslintrc.json | 3 +- apps/admin/.stylelintrc.json | 10 ---- apps/admin/jest.config.ts | 11 ---- apps/admin/package.json | 28 ++++++++++ apps/admin/project.json | 32 ----------- .../app/{Admin.spec.tsx => Admin.test.tsx} | 0 apps/admin/src/app/Admin.tsx | 2 +- ...aProvider.spec.ts => dataProvider.test.ts} | 6 +- .../pages/form/components/BuilderInput.tsx | 5 +- .../form/components/ClassificationInput.tsx | 2 +- .../src/pages/form/components/FormCreate.tsx | 3 +- .../src/pages/form/components/FormEdit.tsx | 3 +- ....snap => filterFormResponse.test.tsx.snap} | 4 +- ...e.spec.tsx => filterFormResponse.test.tsx} | 0 .../pages/form/utils/filterFormResponse.ts | 14 ++--- .../src/pages/static-form/StaticFormEdit.tsx | 2 +- apps/admin/tsconfig.app.json | 18 ------ apps/admin/tsconfig.json | 15 +---- apps/admin/tsconfig.spec.json | 20 ------- apps/admin/vite.config.ts | 32 ++++------- apps/admin/vitest.setup.ts | 3 + package.json | 11 +--- pnpm-lock.yaml | 56 +++++++++---------- pnpm-workspace.yaml | 2 +- tsconfig.base.json | 2 +- 25 files changed, 97 insertions(+), 187 deletions(-) delete mode 100644 apps/admin/.stylelintrc.json delete mode 100644 apps/admin/jest.config.ts create mode 100644 apps/admin/package.json delete mode 100644 apps/admin/project.json rename apps/admin/src/app/{Admin.spec.tsx => Admin.test.tsx} (100%) rename apps/admin/src/app/providers/{dataProvider.spec.ts => dataProvider.test.ts} (82%) rename apps/admin/src/pages/form/utils/__snapshots__/{filterFormResponse.spec.tsx.snap => filterFormResponse.test.tsx.snap} (97%) rename apps/admin/src/pages/form/utils/{filterFormResponse.spec.tsx => filterFormResponse.test.tsx} (100%) delete mode 100644 apps/admin/tsconfig.app.json delete mode 100644 apps/admin/tsconfig.spec.json create mode 100644 apps/admin/vitest.setup.ts diff --git a/apps/admin/.eslintrc.json b/apps/admin/.eslintrc.json index 67b7f963..03d49341 100644 --- a/apps/admin/.eslintrc.json +++ b/apps/admin/.eslintrc.json @@ -1,3 +1,4 @@ { - "extends": ["plugin:@nx/react", "../../.eslintrc.json"] + "extends": ["../../.eslintrc.json"], + "ignorePatterns": ["!**/*", "node_modules"] } diff --git a/apps/admin/.stylelintrc.json b/apps/admin/.stylelintrc.json deleted file mode 100644 index 47cb9524..00000000 --- a/apps/admin/.stylelintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["../../.stylelintrc.json"], - "ignoreFiles": ["!**/*"], - "overrides": [ - { - "files": ["**/*.css"], - "rules": {} - } - ] -} diff --git a/apps/admin/jest.config.ts b/apps/admin/jest.config.ts deleted file mode 100644 index 384b7e47..00000000 --- a/apps/admin/jest.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable */ -export default { - displayName: 'admin', - preset: '../../jest.preset.js', - transform: { - '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest', - '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }], - }, - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '../../coverage/apps/admin', -} diff --git a/apps/admin/package.json b/apps/admin/package.json new file mode 100644 index 00000000..bdda5e95 --- /dev/null +++ b/apps/admin/package.json @@ -0,0 +1,28 @@ +{ + "name": "admin", + "version": "0.1.0", + "description": "Front-end for the admin of the Meldingen application", + "author": "Gemeente Amsterdam", + "license": "EUPL-1.2", + "private": true, + "type": "module", + "scripts": { + "dev": "vite", + "build": "vite build", + "lint": "eslint . --ext .ts,.tsx", + "test": "vitest", + "test:watch": "vitest watch", + "typecheck": "tsc --project ./tsconfig.json --noEmit" + }, + "dependencies": { + "keycloak-js": "25.0.6", + "ra-data-simple-rest": "5.3.4", + "ra-i18n-polyglot": "5.3.4", + "ra-keycloak": "1.0.1", + "react-admin": "5.3.4", + "uber-json-schema-filter": "2.0.5" + }, + "devDependencies": { + "ra-core": "5.3.4" + } +} diff --git a/apps/admin/project.json b/apps/admin/project.json deleted file mode 100644 index 991b00f9..00000000 --- a/apps/admin/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "admin", - "$schema": "../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "apps/admin/src", - "projectType": "application", - "tags": [], - "// targets": "to see all targets run: nx show project admin --web", - "targets": { - "dev": { - "executor": "@nx/vite:dev-server", - "defaultConfiguration": "development", - "options": { - "buildTarget": "admin:build" - } - }, - "stylelint": { - "executor": "nx-stylelint:lint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["apps/admin/**/*.css"] - } - }, - "typecheck": { - "executor": "nx:run-commands", - "options": { - "command": "tsc -p tsconfig.app.json --noEmit && tsc -p tsconfig.spec.json --noEmit", - "cwd": "apps/admin", - "forwardAllArgs": false - } - } - } -} diff --git a/apps/admin/src/app/Admin.spec.tsx b/apps/admin/src/app/Admin.test.tsx similarity index 100% rename from apps/admin/src/app/Admin.spec.tsx rename to apps/admin/src/app/Admin.test.tsx diff --git a/apps/admin/src/app/Admin.tsx b/apps/admin/src/app/Admin.tsx index cf038ced..b2dd38c9 100644 --- a/apps/admin/src/app/Admin.tsx +++ b/apps/admin/src/app/Admin.tsx @@ -1,8 +1,8 @@ import { Admin as ReactAdmin, Resource } from 'react-admin' import { ClassificationCreate, ClassificationEdit, ClassificationList } from '../pages/classification' -import { StaticFormList, StaticFormEdit } from '../pages/static-form' import { FormCreate, FormEdit, FormList } from '../pages/form/components' +import { StaticFormList, StaticFormEdit } from '../pages/static-form' import { CustomLayout } from './components' import { i18nProvider, useAuthProvider } from './providers' diff --git a/apps/admin/src/app/providers/dataProvider.spec.ts b/apps/admin/src/app/providers/dataProvider.test.ts similarity index 82% rename from apps/admin/src/app/providers/dataProvider.spec.ts rename to apps/admin/src/app/providers/dataProvider.test.ts index 5b28cdfd..9bf7f746 100644 --- a/apps/admin/src/app/providers/dataProvider.spec.ts +++ b/apps/admin/src/app/providers/dataProvider.test.ts @@ -1,8 +1,10 @@ +import { vi } from 'vitest' + import { dataProvider } from './dataProvider' describe('dataProvider', () => { it('uses a PUT request for the `form` resource', async () => { - const httpClient = jest.fn().mockResolvedValue({ json: { id: 1 } }) + const httpClient = vi.fn().mockResolvedValue({ json: { id: 1 } }) const client = dataProvider('http://localhost:3000', httpClient) @@ -19,7 +21,7 @@ describe('dataProvider', () => { }) it('uses a PATCH request for all other resources', async () => { - const httpClient = jest.fn().mockResolvedValue({ json: { id: 1 } }) + const httpClient = vi.fn().mockResolvedValue({ json: { id: 1 } }) const client = dataProvider('http://localhost:3000', httpClient) diff --git a/apps/admin/src/pages/form/components/BuilderInput.tsx b/apps/admin/src/pages/form/components/BuilderInput.tsx index f8cd9897..2632b91b 100644 --- a/apps/admin/src/pages/form/components/BuilderInput.tsx +++ b/apps/admin/src/pages/form/components/BuilderInput.tsx @@ -1,11 +1,10 @@ +import type { FormioSchema } from '@meldingen/formio' +import { FormBuilder } from '@meldingen/formio' import type { ComponentSchema } from 'formiojs' import { useEffect, useState } from 'react' import { TextInput } from 'react-admin' import { useFormContext } from 'react-hook-form' -import type { FormioSchema } from '@meldingen/formio' -import { FormBuilder } from '@meldingen/formio' - import styles from './BuilderInput.module.css' export const BuilderInput = () => { diff --git a/apps/admin/src/pages/form/components/ClassificationInput.tsx b/apps/admin/src/pages/form/components/ClassificationInput.tsx index fd565e53..1fd3c622 100644 --- a/apps/admin/src/pages/form/components/ClassificationInput.tsx +++ b/apps/admin/src/pages/form/components/ClassificationInput.tsx @@ -10,7 +10,7 @@ import styles from './ClassificationInput.module.css' const OptionRenderer = () => { const record = useRecordContext() - if (!record) return + if (!record) return undefined return ( diff --git a/apps/admin/src/pages/form/components/FormCreate.tsx b/apps/admin/src/pages/form/components/FormCreate.tsx index 18edf0e3..4c8199f1 100644 --- a/apps/admin/src/pages/form/components/FormCreate.tsx +++ b/apps/admin/src/pages/form/components/FormCreate.tsx @@ -1,7 +1,8 @@ +import type { FormioSchema } from '@meldingen/formio' import { Create } from 'react-admin' -import type { FormioSchema } from '@meldingen/formio' import { filterFormResponse } from '../utils/filterFormResponse' + import { CreateEditForm } from './CreateEditForm' export const FormCreate = () => { diff --git a/apps/admin/src/pages/form/components/FormEdit.tsx b/apps/admin/src/pages/form/components/FormEdit.tsx index 397f2de0..19794bb9 100644 --- a/apps/admin/src/pages/form/components/FormEdit.tsx +++ b/apps/admin/src/pages/form/components/FormEdit.tsx @@ -1,7 +1,8 @@ +import type { FormioSchema } from '@meldingen/formio' import { Edit } from 'react-admin' -import type { FormioSchema } from '@meldingen/formio' import { filterFormResponse } from '../utils/filterFormResponse' + import { CreateEditForm } from './CreateEditForm' export const FormEdit = () => { diff --git a/apps/admin/src/pages/form/utils/__snapshots__/filterFormResponse.spec.tsx.snap b/apps/admin/src/pages/form/utils/__snapshots__/filterFormResponse.test.tsx.snap similarity index 97% rename from apps/admin/src/pages/form/utils/__snapshots__/filterFormResponse.spec.tsx.snap rename to apps/admin/src/pages/form/utils/__snapshots__/filterFormResponse.test.tsx.snap index f893bb58..4a669942 100644 --- a/apps/admin/src/pages/form/utils/__snapshots__/filterFormResponse.spec.tsx.snap +++ b/apps/admin/src/pages/form/utils/__snapshots__/filterFormResponse.test.tsx.snap @@ -1,6 +1,6 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`filterFormResponse renders the correct output 1`] = ` +exports[`filterFormResponse > renders the correct output 1`] = ` { "classification": null, "components": [ diff --git a/apps/admin/src/pages/form/utils/filterFormResponse.spec.tsx b/apps/admin/src/pages/form/utils/filterFormResponse.test.tsx similarity index 100% rename from apps/admin/src/pages/form/utils/filterFormResponse.spec.tsx rename to apps/admin/src/pages/form/utils/filterFormResponse.test.tsx diff --git a/apps/admin/src/pages/form/utils/filterFormResponse.ts b/apps/admin/src/pages/form/utils/filterFormResponse.ts index 3b75c02c..10000bbd 100644 --- a/apps/admin/src/pages/form/utils/filterFormResponse.ts +++ b/apps/admin/src/pages/form/utils/filterFormResponse.ts @@ -1,3 +1,4 @@ +import type { FormInput } from '@meldingen/api-client' import { FormCheckboxComponentInputSchema, FormComponentInputValidateSchema, @@ -7,7 +8,6 @@ import { FormSelectComponentInputSchema, FormTextAreaComponentInputSchema, FormTextFieldComponentInputSchema, - FormInput, } from '@meldingen/api-client' import filter from 'uber-json-schema-filter' @@ -23,7 +23,7 @@ const filterBySchemaPerType = (obj: any) => { return filter(FormCheckboxComponentInputSchema, obj) case 'textarea': // Add autoExpand to object if it doesn't exist, the builder doesn't do that by default - if (!obj.hasOwnProperty('autoExpand')) { + if (!Object.hasOwn(obj, 'autoExpand')) { return filter(FormTextAreaComponentInputSchema, { ...obj, autoExpand: false }) } @@ -51,12 +51,10 @@ export const filterFormResponse = (obj: any): FormInput => { // This function is used to filter an additional questions form, which is always // a wizard with panels containing questions. Therefore the form has a fixed depth of two levels. const firstLevelComponents = obj.components.map((firstLevelComponent: any) => { - const secondLevelComponents = firstLevelComponent.components.map((secondLevelComponent: any) => { - return { - ...filterBySchemaPerType(secondLevelComponent), - validate: getFilteredValidateObject(secondLevelComponent.validate), - } - }) + const secondLevelComponents = firstLevelComponent.components.map((secondLevelComponent: any) => ({ + ...filterBySchemaPerType(secondLevelComponent), + validate: getFilteredValidateObject(secondLevelComponent.validate), + })) const filteredObject = { ...filterBySchemaPerType(firstLevelComponent), diff --git a/apps/admin/src/pages/static-form/StaticFormEdit.tsx b/apps/admin/src/pages/static-form/StaticFormEdit.tsx index 8c5e5df6..6fce9f4f 100644 --- a/apps/admin/src/pages/static-form/StaticFormEdit.tsx +++ b/apps/admin/src/pages/static-form/StaticFormEdit.tsx @@ -1,5 +1,5 @@ import { FormTextAreaComponentInputSchema } from '@meldingen/api-client' -import { FormioSchema } from '@meldingen/formio' +import type { FormioSchema } from '@meldingen/formio' import { Edit, SaveButton, SimpleForm, TextInput, Toolbar } from 'react-admin' import filter from 'uber-json-schema-filter' diff --git a/apps/admin/tsconfig.app.json b/apps/admin/tsconfig.app.json deleted file mode 100644 index c6e52c88..00000000 --- a/apps/admin/tsconfig.app.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../dist/out-tsc", - "types": ["node", "@nx/react/typings/cssmodule.d.ts", "@nx/react/typings/image.d.ts", "vite/client"] - }, - "exclude": [ - "src/**/*.spec.ts", - "src/**/*.test.ts", - "src/**/*.spec.tsx", - "src/**/*.test.tsx", - "src/**/*.spec.js", - "src/**/*.test.js", - "src/**/*.spec.jsx", - "src/**/*.test.jsx" - ], - "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"] -} diff --git a/apps/admin/tsconfig.json b/apps/admin/tsconfig.json index aafaeb31..681704f6 100644 --- a/apps/admin/tsconfig.json +++ b/apps/admin/tsconfig.json @@ -1,22 +1,13 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { "allowJs": false, "allowSyntheticDefaultImports": true, "esModuleInterop": false, "jsx": "react-jsx", "resolveJsonModule": true, - "types": ["vite/client"], + "types": ["vite/client", "jest", "node"], "strict": true }, - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.app.json" - }, - { - "path": "./tsconfig.spec.json" - } - ], - "extends": "../../tsconfig.base.json" + "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"] } diff --git a/apps/admin/tsconfig.spec.json b/apps/admin/tsconfig.spec.json deleted file mode 100644 index 46870374..00000000 --- a/apps/admin/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../dist/out-tsc", - "module": "ES2020", - "types": ["jest", "node", "@nx/react/typings/cssmodule.d.ts", "@nx/react/typings/image.d.ts"] - }, - "include": [ - "jest.config.ts", - "src/**/*.test.ts", - "src/**/*.spec.ts", - "src/**/*.test.tsx", - "src/**/*.spec.tsx", - "src/**/*.test.js", - "src/**/*.spec.js", - "src/**/*.test.jsx", - "src/**/*.spec.jsx", - "src/**/*.d.ts" - ] -} diff --git a/apps/admin/vite.config.ts b/apps/admin/vite.config.ts index a71de840..0d4f7e09 100644 --- a/apps/admin/vite.config.ts +++ b/apps/admin/vite.config.ts @@ -1,30 +1,20 @@ -/// -import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin' import react from '@vitejs/plugin-react' -import { defineConfig } from 'vite' +import tsconfigPaths from 'vite-tsconfig-paths' +import { defineConfig } from 'vitest/config' export default defineConfig({ - root: __dirname, - cacheDir: '../../node_modules/.vite/apps/admin', - + plugins: [tsconfigPaths(), react()], server: { port: 3001, - host: 'localhost', }, - - plugins: [react(), nxViteTsPaths()], - - // Uncomment this if you are using workers. - // worker: { - // plugins: [ nxViteTsPaths() ], - // }, - - build: { - outDir: '../../dist/apps/admin', - emptyOutDir: true, - reportCompressedSize: true, - commonjsOptions: { - transformMixedEsModules: true, + test: { + coverage: { + enabled: true, }, + globals: true, + environment: 'jsdom', + include: ['src/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'], + setupFiles: ['./vitest.setup.ts'], + watch: false, }, }) diff --git a/apps/admin/vitest.setup.ts b/apps/admin/vitest.setup.ts new file mode 100644 index 00000000..8214d531 --- /dev/null +++ b/apps/admin/vitest.setup.ts @@ -0,0 +1,3 @@ +/// + +import '@testing-library/jest-dom/vitest' diff --git a/package.json b/package.json index 2e544fd0..349210c8 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,10 @@ }, "scripts": { "build": "pnpm run /^build:/", - "build:admin": "nx build admin", + "build:admin": "pnpm -F=admin build", "build:public": "pnpm -F=public build", "dev": "pnpm run /^dev:/", - "dev:admin": "nx dev admin", + "dev:admin": "pnpm -F=admin dev", "dev:public": "pnpm -F=public dev", "generate-api-client": "openapi-ts", "lint": "npm run lint:css && npm run lint:md && npm run prettier && nx run-many --target=lint --exclude=api-client,form-renderer && pnpm -r --no-bail lint && pnpm -r --no-bail typecheck", @@ -43,17 +43,10 @@ "@amsterdam/design-system-tokens": "0.13.0", "@formio/react": "5.3.0", "formiojs": "4.21.5", - "jest-fixed-jsdom": "0.0.9", - "keycloak-js": "25.0.6", - "ra-data-simple-rest": "5.3.4", - "ra-i18n-polyglot": "5.3.4", - "ra-keycloak": "1.0.1", "react": "18.3.1", - "react-admin": "5.3.4", "react-dom": "18.3.1", "react-hook-form": "7.53.2", "tslib": "2.8.1", - "uber-json-schema-filter": "2.0.5", "vite-tsconfig-paths": "5.1.3" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e5036a3b..532ff55f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,27 +29,9 @@ importers: formiojs: specifier: 4.21.5 version: 4.21.5 - jest-fixed-jsdom: - specifier: 0.0.9 - version: 0.0.9(jest-environment-jsdom@29.7.0) - keycloak-js: - specifier: 25.0.6 - version: 25.0.6 - ra-data-simple-rest: - specifier: 5.3.4 - version: 5.3.4(ra-core@5.3.4(react-dom@18.3.1(react@18.3.1))(react-hook-form@7.53.2(react@18.3.1))(react-router-dom@6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router@6.28.0(react@18.3.1))(react@18.3.1)) - ra-i18n-polyglot: - specifier: 5.3.4 - version: 5.3.4(react-dom@18.3.1(react@18.3.1))(react-hook-form@7.53.2(react@18.3.1))(react-router-dom@6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router@6.28.0(react@18.3.1))(react@18.3.1) - ra-keycloak: - specifier: 1.0.1 - version: 1.0.1(@types/react@18.3.12)(ra-core@5.3.4(react-dom@18.3.1(react@18.3.1))(react-hook-form@7.53.2(react@18.3.1))(react-router-dom@6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router@6.28.0(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react-is@18.3.1)(react@18.3.1) react: specifier: 18.3.1 version: 18.3.1 - react-admin: - specifier: 5.3.4 - version: 5.3.4(@mui/utils@5.16.6(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react-is@18.3.1)(react@18.3.1) react-dom: specifier: 18.3.1 version: 18.3.1(react@18.3.1) @@ -59,9 +41,6 @@ importers: tslib: specifier: 2.8.1 version: 2.8.1 - uber-json-schema-filter: - specifier: 2.0.5 - version: 2.0.5 vite-tsconfig-paths: specifier: 5.1.3 version: 5.1.3(typescript@5.6.3)(vite@5.4.11(@types/node@22.9.0)(less@4.1.3)(sass@1.81.0)(stylus@0.64.0)(terser@5.36.0)) @@ -241,6 +220,31 @@ importers: specifier: 1.6.0 version: 1.6.0(@types/node@22.9.0)(@vitest/ui@1.6.0)(jsdom@25.0.1)(less@4.1.3)(sass@1.81.0)(stylus@0.64.0)(terser@5.36.0) + apps/admin: + dependencies: + keycloak-js: + specifier: 25.0.6 + version: 25.0.6 + ra-data-simple-rest: + specifier: 5.3.4 + version: 5.3.4(ra-core@5.3.4(react-dom@18.3.1(react@18.3.1))(react-hook-form@7.53.2(react@18.3.1))(react-router-dom@6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router@6.28.0(react@18.3.1))(react@18.3.1)) + ra-i18n-polyglot: + specifier: 5.3.4 + version: 5.3.4(react-dom@18.3.1(react@18.3.1))(react-hook-form@7.53.2(react@18.3.1))(react-router-dom@6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router@6.28.0(react@18.3.1))(react@18.3.1) + ra-keycloak: + specifier: 1.0.1 + version: 1.0.1(@types/react@18.3.12)(ra-core@5.3.4(react-dom@18.3.1(react@18.3.1))(react-hook-form@7.53.2(react@18.3.1))(react-router-dom@6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router@6.28.0(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react-is@18.3.1)(react@18.3.1) + react-admin: + specifier: 5.3.4 + version: 5.3.4(@mui/utils@5.16.6(@types/react@18.3.12)(react@18.3.1))(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react-is@18.3.1)(react@18.3.1) + uber-json-schema-filter: + specifier: 2.0.5 + version: 2.0.5 + devDependencies: + ra-core: + specifier: 5.3.4 + version: 5.3.4(react-dom@18.3.1(react@18.3.1))(react-hook-form@7.53.2(react@18.3.1))(react-router-dom@6.28.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-router@6.28.0(react@18.3.1))(react@18.3.1) + apps/public: dependencies: next: @@ -4738,12 +4742,6 @@ packages: resolution: {integrity: sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - jest-fixed-jsdom@0.0.9: - resolution: {integrity: sha512-KPfqh2+sn5q2B+7LZktwDcwhCpOpUSue8a1I+BcixWLOQoEVyAjAGfH+IYZGoxZsziNojoHGRTC8xRbB1wDD4g==} - engines: {node: '>=18.0.0'} - peerDependencies: - jest-environment-jsdom: '>=28.0.0' - jest-get-type@29.6.3: resolution: {integrity: sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -12480,10 +12478,6 @@ snapshots: jest-mock: 29.7.0 jest-util: 29.7.0 - jest-fixed-jsdom@0.0.9(jest-environment-jsdom@29.7.0): - dependencies: - jest-environment-jsdom: 29.7.0 - jest-get-type@29.6.3: {} jest-haste-map@29.7.0: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index f7d83847..4a8dcce3 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,3 @@ packages: - 'libs/form-renderer' - - 'apps/public' + - 'apps/*' diff --git a/tsconfig.base.json b/tsconfig.base.json index ac998b88..3187bea9 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -10,7 +10,7 @@ "importHelpers": true, "target": "es2015", "module": "esnext", - "lib": ["es2020", "dom"], + "lib": ["esnext", "dom"], "skipLibCheck": true, "skipDefaultLibCheck": true, "baseUrl": ".",