Fix build (#473)

* Fix lint errors * Fix cli build * Use tsx instead of esbuild-register * Fix the absolute import in `definedGlobals` * Pin node to 20.9 * Fix lint errors * Fix the test error * Fix dts rollup * Temporarily disable compat/regression tests
theatre-js · Jan 2, 2024 · 42483a2 · 42483a2 · vercel · Jan 2, 2024
1 parent 2e95e16
commit 42483a2
Show file tree

Hide file tree

Showing 112 changed files with 1,176 additions and 755 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.9]
 
     steps:
       - uses: actions/checkout@v3
@@ -28,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.9]
 
     steps:
       - uses: actions/checkout@v3
@@ -47,7 +47,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.9]
 
     steps:
       - uses: actions/checkout@v3
@@ -60,12 +60,14 @@ jobs:
       - run: yarn test
 
   VisualRegression:
+    # skip this until the new API is ready
+    if: false
     name: Visual regression tests
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.9]
 
     steps:
       - uses: actions/checkout@v3
@@ -79,11 +81,13 @@ jobs:
         run: yarn test:e2e:ci
 
   Compatibility-Tests:
+    # skip this until the new API is ready
+    if: false
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.9]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/compat-tests/package.json b/compat-tests/package.json
@@ -2,17 +2,17 @@
   "name": "@theatre/compat-tests",
   "private": true,
   "scripts": {
-    "install-fixtures": "node -r esbuild-register ./scripts/install-fixtures.ts",
-    "clean": "node -r esbuild-register ./scripts/clean.ts"
+    "install-fixtures": "tsx ./scripts/install-fixtures.ts",
+    "clean": "tsx ./scripts/clean.ts"
   },
   "dependencies": {
     "@cspotcode/zx": "^6.1.2",
     "@verdaccio/types": "^10.8.0",
     "esbuild": "^0.18.18",
-    "esbuild-register": "^3.4.2",
     "node-cleanup": "^2.1.2",
     "playwright": "^1.29.1",
     "prettier": "^2.6.2",
+    "tsx": "4.7.0",
     "verdaccio": "^5.26.1",
     "verdaccio-auth-memory": "^10.2.2",
     "verdaccio-memory": "^10.3.2"

diff --git a/devEnv/cli.ts b/devEnv/cli.ts
@@ -27,44 +27,36 @@ $.quote = function quote(arg) {
   )
 }
 
+const packagesToBuild = [
+  '@theatre/dataverse',
+  '@theatre/saaz',
+  '@theatre/core',
+  '@theatre/studio',
+  '@theatre/react',
+  '@theatre/r3f',
+  'theatric',
+  '@theatre/browser-bundles',
+]
+
 prog
   .command(
     'build clean',
     'Cleans the build artifacts and output directories of all the main packages',
   )
   .action(async () => {
-    const packages = [
-      '@theatre/saaz',
-      'theatre',
-      '@theatre/dataverse',
-      '@theatre/react',
-      '@theatre/browser-bundles',
-      '@theatre/r3f',
-      'theatric',
-    ]
+    const packages = [...packagesToBuild]
 
     await Promise.all([
       ...packages.map((workspace) => $`yarn workspace ${workspace} run clean`),
     ])
   })
 
 prog.command('build', 'Builds all the main packages').action(async () => {
-  const packagesToBuild = [
-    '@theatre/saaz',
-    'theatre',
-    '@theatre/dataverse',
-    '@theatre/react',
-    '@theatre/browser-bundles',
-    '@theatre/r3f',
-    'theatric',
-  ]
   async function build() {
-    await Promise.all([
-      $`yarn run build:ts`,
-      ...packagesToBuild.map(
-        (workspace) => $`yarn workspace ${workspace} run build`,
-      ),
-    ])
+    await $`yarn run build:ts`
+    for (const workspace of packagesToBuild) {
+      await $`yarn workspace ${workspace} run build`
+    }
   }
 
   void build()
@@ -80,42 +72,13 @@ prog
      *
      * It assigns the same version number to all packages (like lerna's fixed mode).
      **/
-    const packagesToBuild = [
-      '@theatre/saaz',
-      'theatre',
-      '@theatre/dataverse',
-      '@theatre/react',
-      '@theatre/browser-bundles',
-      '@theatre/r3f',
-      'theatric',
-    ]
 
-    const packagesToPublish = [
-      '@theatre/core',
-      '@theatre/studio',
-      '@theatre/dataverse',
-      '@theatre/saaz',
-      '@theatre/react',
-      '@theatre/browser-bundles',
-      '@theatre/r3f',
-      'theatric',
-    ]
+    const packagesToPublish = [...packagesToBuild]
 
     /**
      * All these packages will have the same version from monorepo/package.json
      */
-    const packagesWhoseVersionsShouldBump = [
-      '.',
-      'theatre',
-      'theatre/core',
-      'theatre/studio',
-      'packages/dataverse',
-      'packages/react',
-      'packages/saaz',
-      'packages/browser-bundles',
-      'packages/r3f',
-      'packages/theatric',
-    ]
+    const packagesWhoseVersionsShouldBump = ['.', ...packagesToPublish]
 
     // our packages will check for this env variable to make sure their
     // prepublish script is only called from the `$ cd /path/to/monorepo; yarn run release`

diff --git a/devEnv/ensurePublishing.js b/devEnv/ensurePublishing.js
@@ -1,7 +1,4 @@
-if (
-  process.env.THEATRE_IS_PUBLISHING !== 'true' &&
-  process.env.USING_YALC !== 'true'
-) {
+if (process.env.THEATRE_IS_PUBLISHING !== 'true') {
   throw Error(
     `This script may run only when the "release" command in monorepo's root is running.`,
   )

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ version: '3.8'
 name: theatre-monorepo
 services:
   node:
-    image: mcr.microsoft.com/playwright:v1.36.0-jammy
+    image: mcr.microsoft.com/playwright:v1.40.0-jammy
     volumes:
       - .:/app
       # This ignores all node_modules folders/sub-folders so that we can have a separate installation

diff --git a/examples/basic-dom/Scene.tsx b/examples/basic-dom/Scene.tsx
@@ -5,7 +5,7 @@ import type {UseDragOpts} from './useDrag'
 import useDrag from './useDrag'
 import theatre from '@theatre/core'
 
-theatre.init({studio: true})
+void theatre.init({studio: true})
 
 const boxObjectConfig = {
   x: 0,

diff --git a/examples/basic-dom/index.tsx b/examples/basic-dom/index.tsx
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom/client'
 import theatre, {getProject} from '@theatre/core'
 import {Scene} from './Scene'
 
-theatre.init({studio: true})
+void theatre.init({studio: true})
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <Scene project={getProject('Sample project')} />,

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "compat-tests"
   ],
   "scripts": {
-    "cli": "node -r esbuild-register devEnv/cli.ts",
+    "cli": "tsx devEnv/cli.ts",
     "playground": "yarn workspace playground run serve",
     "benchmarks": "yarn workspace benchmarks run serve",
     "test:e2e": "yarn workspace playground run test",
@@ -38,7 +38,6 @@
     "@typescript-eslint/eslint-plugin": "^6.16.0",
     "@typescript-eslint/parser": "^6.16.0",
     "esbuild": "^0.18.18",
-    "esbuild-register": "^3.4.2",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "^6.7.1",
@@ -58,6 +57,7 @@
     "node-gyp": "^9.1.0",
     "prettier": "^3.1.1",
     "sade": "^1.8.1",
+    "tsx": "4.7.0",
     "typescript": "5.1.6",
     "yaml": "^2.3.1"
   },

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "cli": "node -r esbuild-register devEnv/cli.ts",
+    "cli": "tsx devEnv/cli.ts",
     "start": "yarn cli prod start",
     "lint": "next lint",
     "prebuild": "yarn cli prebuild",
@@ -44,7 +44,6 @@
     "cross-env": "^7.0.3",
     "dotenv": "^16.3.1",
     "esbuild": "^0.18.20",
-    "esbuild-register": "^3.4.2",
     "eslint-config-next": "13.4.13",
     "jose": "^4.14.4",
     "lucide-react": "^0.289.0",

diff --git a/packages/app/src/app/(protected)/_components/EditWorkspaceDialog.tsx b/packages/app/src/app/(protected)/_components/EditWorkspaceDialog.tsx
@@ -66,8 +66,8 @@ export default function EditWorkspaceDialog({
         name: values.name,
         description: values.description,
       })
-      queryUtils.teams.invalidate()
-      queryUtils.workspaces.invalidate()
+      void queryUtils.teams.invalidate()
+      void queryUtils.workspaces.invalidate()
     } catch (error) {
       toast({
         variant: 'destructive',

diff --git a/packages/app/src/app/(protected)/_components/InviteGuestsDialog.tsx b/packages/app/src/app/(protected)/_components/InviteGuestsDialog.tsx
@@ -64,7 +64,7 @@ export default function InviteGuestsDialog({
         id: workspaceId,
         invites: [{email: values.email, accessLevel: values.accessLevel}],
       })
-      queryUtils.workspaces.invalidate()
+      void queryUtils.workspaces.invalidate()
     } catch (error) {
       toast({
         variant: 'destructive',
@@ -157,15 +157,15 @@ function Guests({workspaceId}: {workspaceId: string}) {
 
   async function handleRemoveGuest(email: string) {
     await removeGuest({id: workspaceId, email})
-    queryUtils.workspaces.getGuests.invalidate()
+    void queryUtils.workspaces.getGuests.invalidate()
   }
 
   async function handleChangeAccessLevel(
     email: string,
     accessLevel: 'READ' | 'READ_WRITE',
   ) {
     await changeAccessLevel({id: workspaceId, email, accessLevel})
-    queryUtils.workspaces.getGuests.invalidate()
+    void queryUtils.workspaces.getGuests.invalidate()
   }
 
   return (

diff --git a/packages/app/src/app/(protected)/_components/InviteTeamMembersPrompt.tsx b/packages/app/src/app/(protected)/_components/InviteTeamMembersPrompt.tsx
@@ -53,7 +53,7 @@ const InviteTeamMembersPrompt: FC<{id: string}> = ({id}) => {
         id,
         invites: [{email: values.email, role: values.role}],
       })
-      queryUtils.teams.invalidate()
+      void queryUtils.teams.invalidate()
     } catch (error) {
       toast({
         variant: 'destructive',

diff --git a/packages/app/src/app/(protected)/_components/NewWorkspaceDialog.tsx b/packages/app/src/app/(protected)/_components/NewWorkspaceDialog.tsx
@@ -56,8 +56,8 @@ export default function NewWorkspaceDialog({teamId}: {teamId: string}) {
         description: values.description,
         teamId,
       })
-      queryUtils.teams.invalidate()
-      queryUtils.workspaces.invalidate()
+      void queryUtils.teams.invalidate()
+      void queryUtils.workspaces.invalidate()
     } catch (error) {
       toast({
         variant: 'destructive',

diff --git a/packages/app/src/app/(protected)/_components/NotificationsPopover.tsx b/packages/app/src/app/(protected)/_components/NotificationsPopover.tsx
@@ -57,8 +57,8 @@ const Invitations = () => {
             <Button
               onClick={async () => {
                 await acceptGuestInvitation({id: invitation.workspaceId})
-                queryUtils.me.getGuestInvitations.invalidate()
-                queryUtils.workspaces.invalidate()
+                void queryUtils.me.getGuestInvitations.invalidate()
+                void queryUtils.workspaces.invalidate()
               }}
               size="sm"
             >
@@ -70,8 +70,8 @@ const Invitations = () => {
                   id: invitation.workspaceId,
                   email: me.email!,
                 })
-                queryUtils.me.getGuestInvitations.invalidate()
-                queryUtils.workspaces.invalidate()
+                void queryUtils.me.getGuestInvitations.invalidate()
+                void queryUtils.workspaces.invalidate()
               }}
               variant="ghost"
               size="sm"
@@ -91,8 +91,8 @@ const Invitations = () => {
             <Button
               onClick={async () => {
                 await acceptTeamInvitation({id: invitation.teamId})
-                queryUtils.me.getTeamInvitations.invalidate()
-                queryUtils.teams.invalidate()
+                void queryUtils.me.getTeamInvitations.invalidate()
+                void queryUtils.teams.invalidate()
               }}
               size="sm"
             >
@@ -104,8 +104,8 @@ const Invitations = () => {
                   id: invitation.teamId,
                   email: me.email!,
                 })
-                queryUtils.me.getTeamInvitations.invalidate()
-                queryUtils.teams.invalidate()
+                void queryUtils.me.getTeamInvitations.invalidate()
+                void queryUtils.teams.invalidate()
               }}
               variant="ghost"
               size="sm"

diff --git a/packages/app/src/app/(protected)/_components/TeamMembers.tsx b/packages/app/src/app/(protected)/_components/TeamMembers.tsx
@@ -21,13 +21,13 @@ export default function Members({teamId}: {teamId: string}) {
 
   async function handleRemoveMember(email: string) {
     await removeMember({id: teamId, email})
-    queryUtils.teams.getMembers.invalidate()
+    void queryUtils.teams.getMembers.invalidate()
   }
 
   async function handleChangeRole(email: string, role: 'MEMBER' | 'OWNER') {
     try {
       await changeMemberRole({id: teamId, email, role})
-      queryUtils.teams.getMembers.invalidate()
+      void queryUtils.teams.getMembers.invalidate()
     } catch (error) {
       toast({
         variant: 'destructive',

diff --git a/packages/app/src/app/(protected)/team/[id]/components/Team.tsx b/packages/app/src/app/(protected)/team/[id]/components/Team.tsx
@@ -40,7 +40,7 @@ export default function Team({id}: {id: string}) {
               size="icon"
               className="invisible group-hover:visible"
               onClick={() => {
-                promptTeamSettings(id)
+                void promptTeamSettings(id)
               }}
             >
               <Settings className="h-4 w-4" />