Refactor researcher app to use ECMAScript modules (ESM)

colonial-heritage · Feb 27, 2024 · 9e1688e · 9e1688e
1 parent 0cd88bc
commit 9e1688e
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 24 deletions.
diff --git a/apps/dataset-browser/tailwind.config.js b/apps/dataset-browser/tailwind.config.js
@@ -1,4 +1,4 @@
-const sharedConfig = require('tailwind-config/tailwind.config.js');
+const sharedConfig = require('tailwind-config/tailwind.config.ts');
 
 module.exports = {
   presets: [sharedConfig],

diff --git a/apps/researcher/.eslintrc.js b/apps/researcher/.eslintrc.js
diff --git a/apps/researcher/.eslintrc.json b/apps/researcher/.eslintrc.json
@@ -0,0 +1,4 @@
+{
+  "root": true,
+  "extends": ["custom"]
+}
diff --git a/apps/researcher/jest.config.js → apps/researcher/jest.config.ts b/apps/researcher/jest.config.js → apps/researcher/jest.config.ts
@@ -1,13 +1,13 @@
-const nextJest = require('next/jest');
+import nextJest from 'next/jest';
+import type {Config} from 'jest';
 
 const createJestConfig = nextJest();
 
-/** @type {import('jest').Config} */
-const customJestConfig = {
+const customJestConfig: Config = {
   testTimeout: 60000,
   testMatch: ['**/*.test.ts(x)?'],
   collectCoverage: true,
-  setupFiles: ['<rootDir>/jest.setup.js'],
+  setupFiles: ['<rootDir>/jest.setup.ts'],
   moduleNameMapper: {
     '^@/(.*)$': '<rootDir>/src/$1',
   },
@@ -27,7 +27,7 @@ const customJestConfig = {
  * @link https://github.com/vercel/next.js/issues/36077#issuecomment-1096635363
  */
 
-module.exports = async () => ({
+module.exports = async (): Promise<Config> => ({
   ...(await createJestConfig(customJestConfig)()),
 
   transformIgnorePatterns: ['node_modules/(?!(next-intl)/)'],

diff --git a/apps/researcher/jest.setup.js → apps/researcher/jest.setup.ts b/apps/researcher/jest.setup.js → apps/researcher/jest.setup.ts
@@ -1,4 +1,4 @@
-const {loadEnvConfig} = require('@next/env');
+import {loadEnvConfig} from '@next/env';
 
 // Make sure the environment variables for testing are loaded in the same way Next handles these
 module.exports = async () => {

diff --git a/apps/researcher/package.json b/apps/researcher/package.json
@@ -2,6 +2,7 @@
   "name": "researcher",
   "version": "1.0.0",
   "private": true,
+  "type": "module",
   "files": [],
   "engines": {
     "node": "18.x"

diff --git a/apps/researcher/postcss.config.js → apps/researcher/postcss.config.ts b/apps/researcher/postcss.config.js → apps/researcher/postcss.config.ts
@@ -1,6 +1,8 @@
-module.exports = {
+const config = {
   plugins: {
     tailwindcss: {},
     autoprefixer: {},
   },
 };
+
+export default config;
diff --git a/apps/researcher/tailwind.config.js b/apps/researcher/tailwind.config.js
diff --git a/apps/researcher/tailwind.config.ts b/apps/researcher/tailwind.config.ts
@@ -0,0 +1,7 @@
+import sharedConfig from 'tailwind-config/tailwind.config';
+
+const config = {
+  presets: [sharedConfig],
+};
+
+export default config;
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json
@@ -5,6 +5,7 @@
   "dependencies": {
     "@tailwindcss/aspect-ratio": "0.4.2",
     "@tailwindcss/forms": "0.5.6",
-    "@tailwindcss/typography": "0.5.10"
+    "@tailwindcss/typography": "0.5.10",
+    "tailwindcss": "3.4.1"
   }
 }
diff --git a/packages/tailwind-config/tailwind.config.js → packages/tailwind-config/tailwind.config.ts b/packages/tailwind-config/tailwind.config.js → packages/tailwind-config/tailwind.config.ts
@@ -1,12 +1,13 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
+import type {Config} from 'tailwindcss';
+
+const config = {
   content: [
     'src/**/*.{js,ts,jsx,tsx}',
     '../../packages/ui/**/*.{js,ts,jsx,tsx}',
   ],
   theme: {
     extend: {
-      typography: theme => ({
+      typography: (theme: (color: string) => string) => ({
         DEFAULT: {
           css: {
             color: theme('colors.gray.900'),
@@ -87,4 +88,6 @@ module.exports = {
     require('@tailwindcss/typography'),
     require('@tailwindcss/aspect-ratio'),
   ],
-};
+} satisfies Config;
+
+export default config;
diff --git a/packages/ui/tailwind.config.js b/packages/ui/tailwind.config.js
@@ -1,4 +1,4 @@
-const sharedConfig = require('tailwind-config/tailwind.config.js');
+const sharedConfig = require('tailwind-config/tailwind.config.ts');
 
 module.exports = {
   presets: [sharedConfig],