Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: moves monorepo to node module resolution #104

Merged
merged 2 commits into from
Jun 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/src/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ThemeProvider } from 'next-themes';
import { type AppProps } from 'next/app.js';
import { type AppProps } from 'next/app';

import '@/styles/globals.css';

Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/pages/_document.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Head, Html, Main, NextScript } from 'next/document.js';
import { Head, Html, Main, NextScript } from 'next/document';

export default function Document() {
return (
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/tests/home.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { render, screen } from '@testing-library/react';

import Home from '@/pages/index.jsx';
import Home from '@/pages/index';

describe('Home page', () => {
it('should render the home page', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/config/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
".": [
"dist/main.d.ts"
],
"./preview": [
"preview": [
"dist/preview.d.ts"
]
}
Expand Down
1 change: 1 addition & 0 deletions packages/config/tailwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
".": "./dist/tailwind.config.js",
"./postcss.cjs": "./postcss.cjs"
},
"main": "./dist/tailwind.config.js",
"scripts": {
"build": "tsc",
"dev": "tsc -w",
Expand Down
6 changes: 1 addition & 5 deletions packages/config/tsconfig/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,18 @@
"noUnusedLocals": true,
"noUnusedParameters": true,
"preserveWatchOutput": true,

"checkJs": true,
"allowJs": true,

"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,

"lib": ["es2022"],
"module": "ESNext",
"target": "es2022",
"isolatedModules": true,
"resolveJsonModule": true,
"incremental": true,
"declaration": true,

"moduleResolution": "nodenext"
"moduleResolution": "node"
}
}
1 change: 0 additions & 1 deletion packages/config/vitest/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export const baseConfig = defineConfig({
});

export const reactConfig = mergeConfig(baseConfig, {
// @ts-expect-error react plugin is callable
plugins: [react()],
test: {
environment: 'happy-dom',
Expand Down
1 change: 1 addition & 0 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"import": "./dist/index.js"
}
},
"main": "./dist/index.js",
"scripts": {
"build": "tsc -p tsconfig.build.json",
"build-storybook": "storybook build",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { Typography } from './typography/typography.js';
export { Typography } from './typography/typography';
2 changes: 1 addition & 1 deletion packages/ui/src/typography/typography.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { render, screen } from '@testing-library/react';

import { Typography } from './typography.js';
import { Typography } from './typography';

describe('typography component', () => {
it('should render the component', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/typography/typography.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Meta, StoryObj } from '@storybook/react';

import { Typography } from './typography.js';
import { Typography } from './typography';

export default {
title: 'UI / Typography',
Expand Down