diff --git a/apps/photos/package.json b/apps/photos/package.json index 9c0e7a3d1..dcfa5ff42 100644 --- a/apps/photos/package.json +++ b/apps/photos/package.json @@ -10,10 +10,10 @@ "albums": "next dev -p 3002" }, "dependencies": { + "@/utils": "*", "@date-io/date-fns": "^2.14.0", - "@repo/ui": "*", - "@ente-io/utils": "*", "@mui/x-date-pickers": "^5.0.0-alpha.6", + "@repo/ui": "*", "@sentry/nextjs": "^7.77.0", "@stripe/stripe-js": "^1.13.2", "@tensorflow-models/coco-ssd": "^2.2.2", diff --git a/apps/photos/src/pages/_app.tsx b/apps/photos/src/pages/_app.tsx index 0805dbcf2..33b4470d7 100644 --- a/apps/photos/src/pages/_app.tsx +++ b/apps/photos/src/pages/_app.tsx @@ -79,8 +79,8 @@ import { PHOTOS_PAGES as PAGES } from '@ente/shared/constants/pages'; import { getTheme } from '@ente/shared/themes'; import { AppUpdateInfo } from '@ente/shared/electron/types'; import DownloadManager from 'services/download'; -// import { sayHello } from '@ente-io/utils/hello'; -import { sayHello } from '@repo/ui/hello'; +import { sayHello } from '@/utils/hello'; +// import { sayHello } from '@repo/ui/hello'; const redirectMap = new Map([ [REDIRECTS.ROADMAP, getRoadmapRedirectURL], diff --git a/packages/shared/next/next.config.base.js b/packages/shared/next/next.config.base.js index d80c920be..1c2216667 100644 --- a/packages/shared/next/next.config.base.js +++ b/packages/shared/next/next.config.base.js @@ -36,8 +36,8 @@ const nextConfig = { }, }, transpilePackages: [ - "@repo/ui", - '@ente-io/utils', + '@repo/ui', + '@/utils', '@mui/material', '@mui/system', '@mui/icons-material', diff --git a/packages/utils/README.md b/packages/utils/README.md index 717fe6776..9bccc5da0 100644 --- a/packages/utils/README.md +++ b/packages/utils/README.md @@ -1,3 +1,5 @@ -### @ente-io/utils +### @/utils Utility functions, types and assortments. + +> "Life is like a box of chocolates" - _Forrest Gump_ diff --git a/packages/utils/package.json b/packages/utils/package.json index 22cac4b8c..3260068d6 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,8 +1,8 @@ { - "name": "@ente-io/utils", + "name": "@/utils", "version": "0.0.0", "private": true, "exports": { - "./hello": "./src/hello" + "./hello": "./src/hello.ts" } } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index c65746616..9f0bf1c3e 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,7 +1,7 @@ { /* Docs: https://aka.ms/tsconfig.json */ "compilerOptions": { - /* We use TypeScript as a type checker, not as a build tool */ + /* We use TypeScript (tsc) as a type checker, not as a build tool */ "noEmit": true, /* @@ -18,17 +18,18 @@ * explicitly. * * Note that we don't need to specify the `target` compilerOption, since - * TypeScript isn't actually generating (emitting) the JavaScript. + * tsc isn't actually generating (emitting) the JavaScript. */ "lib": ["esnext", "dom", "dom.iterable"], /* * The module system to assume the generated JavaScript will use. * - * Since we're using a bundler, we should set this to esnext + * Since we're using a bundler, we should set this to "esnext" * https://www.typescriptlang.org/docs/handbook/modules/guides/choosing-compiler-options.html */ "module": "esnext", + /* * Tell TypeScript how to lookup the file for a given import * @@ -43,7 +44,7 @@ */ "moduleResolution": "bundler", - /* Allow use of `.tsx` files */ + /* Allow use of `.tsx` files, but don't tranform them */ "jsx": "preserve", /* Ask TypeScript to warn us if we use TypeScript features that cannot