From 87ba53bbcdc257201b1714384d11cb1fb7f3b650 Mon Sep 17 00:00:00 2001 From: Marks Polakovs Date: Wed, 9 Oct 2024 19:55:24 +0100 Subject: [PATCH 1/2] Run server build through tsc-alias to fix import issues once and for all --- babel.config.server.json | 6 +++ features/calendar/check_with_tech_actions.ts | 2 +- package.json | 4 +- tsconfig.server.json | 3 +- yarn.lock | 49 +++++++++++++++++++- 5 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 babel.config.server.json diff --git a/babel.config.server.json b/babel.config.server.json new file mode 100644 index 00000000..97603001 --- /dev/null +++ b/babel.config.server.json @@ -0,0 +1,6 @@ +{ + "presets": ["@babel/preset-env", "@babel/preset-typescript"], + "targets": { + "node": "current" + } +} diff --git a/features/calendar/check_with_tech_actions.ts b/features/calendar/check_with_tech_actions.ts index 8d61ea69..e57deafc 100644 --- a/features/calendar/check_with_tech_actions.ts +++ b/features/calendar/check_with_tech_actions.ts @@ -1,4 +1,4 @@ -import { getUserName } from "@/components/UserHelpers"; +import { getUserName } from "../../components/UserHelpers"; import { userHasPermission } from "@/lib/auth/core"; import { prisma } from "@/lib/db"; import invariant from "@/lib/invariant"; diff --git a/package.json b/package.json index 35fa3836..f099956d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "scripts": { "dev": "nodemon", "devSSL": "DEV_SSL=true nodemon", - "build": "next build && tsc --project tsconfig.server.json", + "build": "next build && yarn build:server", + "build:server": "tsc -p tsconfig.server.json && tsc-alias -p tsconfig.server.json", "start": "NODE_ENV=production node dist/server/index.js", "lint": "next lint", "test": "lint-staged", @@ -116,6 +117,7 @@ "storybook": "^7.0.27", "tailwindcss-animate": "^1.0.7", "ts-node": "^10.9.1", + "tsc-alias": "^1.8.10", "tsx": "^4.16.2", "zod-prisma": "^0.5.4" }, diff --git a/tsconfig.server.json b/tsconfig.server.json index 8cb34c90..b4b08d32 100644 --- a/tsconfig.server.json +++ b/tsconfig.server.json @@ -5,7 +5,8 @@ "outDir": "dist", "target": "es2017", "isolatedModules": false, - "noEmit": false + "noEmit": false, + "jsx": "react-jsx" }, "include": ["server/**/*.ts"] } diff --git a/yarn.lock b/yarn.lock index d90688dd..d30908bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8067,6 +8067,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^9.0.0": + version: 9.5.0 + resolution: "commander@npm:9.5.0" + checksum: c7a3e27aa59e913b54a1bafd366b88650bc41d6651f0cbe258d4ff09d43d6a7394232a4dadd0bf518b3e696fdf595db1028a0d82c785b88bd61f8a440cecfade + languageName: node + linkType: hard + "common-path-prefix@npm:^3.0.0": version: 3.0.0 resolution: "common-path-prefix@npm:3.0.0" @@ -10936,7 +10943,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^11.0.1, globby@npm:^11.0.2, globby@npm:^11.1.0": +"globby@npm:^11.0.1, globby@npm:^11.0.2, globby@npm:^11.0.4, globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -11443,6 +11450,7 @@ __metadata: tailwindcss: ^3.3.2 tailwindcss-animate: ^1.0.7 ts-node: ^10.9.1 + tsc-alias: ^1.8.10 tsx: ^4.16.2 typescript: 5.1.6 uoy-week-calendar: "https://github.com/chriscn/uoy-week-calendar#edfe3865e34df8ae907eea6ac3b1c579bdd69abe" @@ -13490,6 +13498,13 @@ __metadata: languageName: node linkType: hard +"mylas@npm:^2.1.9": + version: 2.1.13 + resolution: "mylas@npm:2.1.13" + checksum: f861d092137a9ac268cba88042392a5dc2a290eed5c8543954eae849d85e5961332211161d2c08c3644ad893f20dbe9de89b07f5dc027f1f92f13f2d38f4b81f + languageName: node + linkType: hard + "mz@npm:^2.7.0": version: 2.7.0 resolution: "mz@npm:2.7.0" @@ -14626,6 +14641,15 @@ __metadata: languageName: node linkType: hard +"plimit-lit@npm:^1.2.6": + version: 1.6.1 + resolution: "plimit-lit@npm:1.6.1" + dependencies: + queue-lit: ^1.5.1 + checksum: 5f18f1ea7254832bdc663c303420c804b5bc8070c670c88161171f0ebacaf46ce7ca12147ddf52bc22d927bb37bfbac6ed6fa478c93cb4be16b62c5fad16dd5f + languageName: node + linkType: hard + "pnp-webpack-plugin@npm:^1.7.0": version: 1.7.0 resolution: "pnp-webpack-plugin@npm:1.7.0" @@ -15283,6 +15307,13 @@ __metadata: languageName: node linkType: hard +"queue-lit@npm:^1.5.1": + version: 1.5.2 + resolution: "queue-lit@npm:1.5.2" + checksum: 8dd45c79bd25b33b0c7d587391eb0b4acc4deb797bf92fef62b2d8e7c03b64083f5304f09d52a18267d34d020cc67ccde97a88185b67590eeccb194938ff1f98 + languageName: node + linkType: hard + "queue-microtask@npm:^1.2.2": version: 1.2.3 resolution: "queue-microtask@npm:1.2.3" @@ -17647,6 +17678,22 @@ __metadata: languageName: node linkType: hard +"tsc-alias@npm:^1.8.10": + version: 1.8.10 + resolution: "tsc-alias@npm:1.8.10" + dependencies: + chokidar: ^3.5.3 + commander: ^9.0.0 + globby: ^11.0.4 + mylas: ^2.1.9 + normalize-path: ^3.0.0 + plimit-lit: ^1.2.6 + bin: + tsc-alias: dist/bin/index.js + checksum: 4301767afb5b24ad354267790fb98b8df7ed41ff6a6d151c5e664c6b8b7717cd8753c790d67e5a0dbd731c3a4d85e57eca2429ff750b99d79c38300de7eb8d94 + languageName: node + linkType: hard + "tsconfig-paths-webpack-plugin@npm:^3.5.2": version: 3.5.2 resolution: "tsconfig-paths-webpack-plugin@npm:3.5.2" From 573a64262b2a59b783a7ef237cccf916b91bc5c8 Mon Sep 17 00:00:00 2001 From: Marks Polakovs Date: Wed, 9 Oct 2024 19:55:43 +0100 Subject: [PATCH 2/2] rm old config --- babel.config.server.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 babel.config.server.json diff --git a/babel.config.server.json b/babel.config.server.json deleted file mode 100644 index 97603001..00000000 --- a/babel.config.server.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "presets": ["@babel/preset-env", "@babel/preset-typescript"], - "targets": { - "node": "current" - } -}