From 31a7e6ce9dfc22cd244427211b791a184b2e05a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Thu, 31 Aug 2023 02:03:49 +0200 Subject: [PATCH] feat: move to ESM --- .eslintrc.js => .eslintrc.cjs | 0 .eslintrc.repo.js => .eslintrc.repo.cjs | 2 +- cypress/{.eslintrc.js => .eslintrc.cjs} | 0 package.json | 5 +++-- postcss.config.js => postcss.config.cjs | 0 remix.config.js | 4 ++-- remix.init/index.js | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) rename .eslintrc.js => .eslintrc.cjs (100%) rename .eslintrc.repo.js => .eslintrc.repo.cjs (96%) rename cypress/{.eslintrc.js => .eslintrc.cjs} (100%) rename postcss.config.js => postcss.config.cjs (100%) diff --git a/.eslintrc.js b/.eslintrc.cjs similarity index 100% rename from .eslintrc.js rename to .eslintrc.cjs diff --git a/.eslintrc.repo.js b/.eslintrc.repo.cjs similarity index 96% rename from .eslintrc.repo.js rename to .eslintrc.repo.cjs index 67f48962..a3796fa2 100644 --- a/.eslintrc.repo.js +++ b/.eslintrc.repo.cjs @@ -6,7 +6,7 @@ const WARN = 1; /** @type {import('eslint').Linter.Config} */ module.exports = { extends: [ - "./.eslintrc.js", + "./.eslintrc.cjs", "@remix-run/eslint-config/internal", "plugin:markdown/recommended", ], diff --git a/cypress/.eslintrc.js b/cypress/.eslintrc.cjs similarity index 100% rename from cypress/.eslintrc.js rename to cypress/.eslintrc.cjs diff --git a/package.json b/package.json index 0e067665..aedc5cea 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "indie-stack-template", "private": true, "sideEffects": false, + "type": "module", "scripts": { "build": "remix build", "dev": "remix dev -c \"npm run dev:serve\"", @@ -9,7 +10,7 @@ "format": "prettier --write .", "format:repo": "npm run format && npm run lint:repo -- --fix", "lint": "eslint --cache --cache-location ./node_modules/.cache/eslint .", - "lint:repo": "npm run lint -- --config .eslintrc.repo.js", + "lint:repo": "npm run lint -- --config .eslintrc.repo.cjs", "setup": "prisma generate && prisma migrate deploy && prisma db seed", "start": "remix-serve build", "start:mocks": "binode --require ./mocks -- @remix-run/serve:remix-serve build", @@ -81,6 +82,6 @@ "node": ">=14.0.0" }, "prisma": { - "seed": "ts-node --require tsconfig-paths/register prisma/seed.ts" + "seed": "ts-node --esm --require tsconfig-paths/register prisma/seed.ts" } } diff --git a/postcss.config.js b/postcss.config.cjs similarity index 100% rename from postcss.config.js rename to postcss.config.cjs diff --git a/remix.config.js b/remix.config.js index 5b743123..feda42dd 100644 --- a/remix.config.js +++ b/remix.config.js @@ -1,5 +1,5 @@ /** @type {import('@remix-run/dev').AppConfig} */ -module.exports = { +export default { cacheDirectory: "./node_modules/.cache/remix", future: { v2_dev: true, @@ -11,6 +11,6 @@ module.exports = { }, ignoredRouteFiles: ["**/.*", "**/*.test.{js,jsx,ts,tsx}"], postcss: true, - serverModuleFormat: "cjs", + serverModuleFormat: "esm", tailwind: true, }; diff --git a/remix.init/index.js b/remix.init/index.js index 521944d4..b399bb7f 100644 --- a/remix.init/index.js +++ b/remix.init/index.js @@ -260,7 +260,7 @@ const main = async ({ isTypeScript, packageManager, rootDirectory }) => { fs.rm(path.join(rootDirectory, ".github", "workflows", "no-response.yml")), fs.rm(path.join(rootDirectory, ".github", "dependabot.yml")), fs.rm(path.join(rootDirectory, ".github", "PULL_REQUEST_TEMPLATE.md")), - fs.rm(path.join(rootDirectory, ".eslintrc.repo.js")), + fs.rm(path.join(rootDirectory, ".eslintrc.repo.cjs")), fs.rm(path.join(rootDirectory, "LICENSE.md")), ];