diff --git a/twenty-frontend/package-lock.json b/twenty-frontend/package-lock.json index 6dc2dbc..d592ff0 100644 --- a/twenty-frontend/package-lock.json +++ b/twenty-frontend/package-lock.json @@ -5,11 +5,6 @@ "packages": { "": { "name": "twenty", - "dependencies": { - "classnames": "^2.3.2", - "react": "^18.2.0", - "react-dom": "^18.2.0" - }, "devDependencies": { "@apollo/client": "^3.3.21", "@graphql-codegen/cli": "^5.0.0", @@ -19,11 +14,14 @@ "@types/react": "^18.0.18", "@types/react-dom": "^18.0.6", "@types/showdown": "^2.0.6", + "classnames": "^2.3.2", "eslint": "^8.26.0", "eslint-config-prettier": "^8.5.0", "graphql": "^16.8.1", "luxon": "^3.4.4", "prettier": "^2.7.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", "react-hook-form": "^7.49.2", "showdown": "^2.1.0", "ts-loader": "^9.3.1", @@ -2455,9 +2453,9 @@ "dev": true }, "node_modules/@types/luxon": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.3.7.tgz", - "integrity": "sha512-gKc9P2d4g5uYwmy4s/MO/yOVPmvHyvzka1YH6i5dM03UrFofHSmgc0D0ymbDRStFWHusk6cwwF6nhLm/ckBbbQ==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz", + "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==", "dev": true }, "node_modules/@types/node": { @@ -3681,7 +3679,8 @@ "node_modules/classnames": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==", + "dev": true }, "node_modules/clean-stack": { "version": "2.2.0", @@ -6196,7 +6195,8 @@ "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "node_modules/js-yaml": { "version": "4.1.0", @@ -6503,6 +6503,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -7438,6 +7439,7 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "dev": true, "dependencies": { "loose-envify": "^1.1.0" }, @@ -7449,6 +7451,7 @@ "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "dev": true, "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -7811,6 +7814,7 @@ "version": "0.23.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "dev": true, "dependencies": { "loose-envify": "^1.1.0" } diff --git a/twenty-frontend/package.json b/twenty-frontend/package.json index d25361f..c7d2677 100644 --- a/twenty-frontend/package.json +++ b/twenty-frontend/package.json @@ -1,11 +1,9 @@ { "name": "twenty", - "dependencies": { + "devDependencies": { "classnames": "^2.3.2", "react": "^18.2.0", - "react-dom": "^18.2.0" - }, - "devDependencies": { + "react-dom": "^18.2.0", "@apollo/client": "^3.3.21", "@graphql-codegen/cli": "^5.0.0", "@graphql-codegen/typescript": "^4.0.1", diff --git a/twenty-frontend/src/js/lib/fetch.ts b/twenty-frontend/src/js/lib/fetch.ts deleted file mode 100644 index 6c194aa..0000000 --- a/twenty-frontend/src/js/lib/fetch.ts +++ /dev/null @@ -1,12 +0,0 @@ -export default async function ( - path: string, - reqinit: RequestInit, -): Promise { - return await fetch(path, reqinit).then(res => { - if (res.status === 200) { - return res; - } else { - throw Error("Bad response", { cause: res }); - } - }); -} diff --git a/twenty-frontend/tsconfig.json b/twenty-frontend/tsconfig.json index 1b9a130..e23d050 100644 --- a/twenty-frontend/tsconfig.json +++ b/twenty-frontend/tsconfig.json @@ -2,16 +2,18 @@ "compilerOptions": { "strict": true, "strictNullChecks": false, - "module": "commonjs", - "target": "ES2020", - "noImplicitAny": true, - "moduleResolution": "node", - "esModuleInterop": true, + "module": "ES6", + "target": "ES6", "jsx": "react", - "allowJs": true, - "lib": [ "ES2022", "DOM" ], - "allowUmdGlobalAccess": true, + "lib": ["DOM"], "baseUrl": "./src", - "paths": { "~/*": ["./js/*"] }, + "allowSyntheticDefaultImports": true, + "allowUmdGlobalAccess": true, + "moduleResolution": "node", + "removeComments": true, + "incremental": true, + "paths": { + "~/*": ["./js/*"] + }, } } diff --git a/twenty-frontend/webpack.config.js b/twenty-frontend/webpack.config.js index aef8bac..894712c 100644 --- a/twenty-frontend/webpack.config.js +++ b/twenty-frontend/webpack.config.js @@ -8,8 +8,7 @@ module.exports = { alias: { '~': [path.resolve('src/js')] }, - modules: [path.resolve('node_modules')], - extensions: ['.js', '.ts', '.tsx'] + extensions: ['.ts', '.tsx'] }, module: { rules: [ @@ -24,5 +23,5 @@ module.exports = { new webpack.ProvidePlugin({ React: 'react', }), - ] + ], }