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.

Sign up for GitHub

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

Jump to bottom

chore: fix builds/tests/eslint #4780

Merged
merged 23 commits into from Sep 9, 2022
Merged

chore: fix builds/tests/eslint #4780

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ed42195
chore(deps): upgrade `typescript`
balazsorban44 Jun 28, 2022
81ff0fd
chore(ts): don't exclude test files in tsconfig
balazsorban44 Jun 28, 2022
2a60c6f
test: expect error when overriding `NODE_ENV`
balazsorban44 Jun 28, 2022
8fc43e1
chore: remove unused import
balazsorban44 Jun 28, 2022
292e529
format
balazsorban44 Jun 28, 2022
4bab688
chore: use pnpm@7 in action
balazsorban44 Jun 28, 2022
e9566d4
chore: fix eslint
balazsorban44 Jun 28, 2022
12f7dde
chore: remove pnpm from engines
balazsorban44 Jun 28, 2022
4b4066e
chore: fix configs/builds
balazsorban44 Jun 28, 2022
418de3f
fix: make eslint works
ThangHuuVu Sep 3, 2022
7b0549e
Merge branch 'main' into chore/add-tests
thang-vu-20230331 Sep 5, 2022
f5f5892
Update pnpm-lock.yaml
ThangHuuVu Sep 5, 2022
c92332f
fix: build failure
ThangHuuVu Sep 5, 2022
ac677dd
fix: add react to paths
ThangHuuVu Sep 5, 2022
c6a2870
ignore upstash for now
ThangHuuVu Sep 5, 2022
e81ec43
add eslintignore, add a bunch of tsconfig.eslint.json
ThangHuuVu Sep 5, 2022
050c825
ignore mikro orm for now
ThangHuuVu Sep 5, 2022
e110836
Delete tsconfig.eslint.json
ThangHuuVu Sep 5, 2022
3e29da3
Update package.json
ThangHuuVu Sep 5, 2022
446436e
Merge branch 'main' into chore/add-tests
ThangHuuVu Sep 8, 2022
7e15ece
Update pnpm-lock.yaml
ThangHuuVu Sep 8, 2022
8a71d59
move eslint back to package.json
ThangHuuVu Sep 8, 2022
fa9e6ce
move eslintrc.js out
ThangHuuVu Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 33 additions & 0 deletions .eslintrc.js
View file
Open in desktop
@@ -0,0 +1,33 @@
const path = require('path')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved eslint config to here to use the path.resolve in parserOptions.project


module.exports = {
root: true,
parser: "@typescript-eslint/parser",
parserOptions: {
project: [
path.resolve(__dirname, './packages/next-auth/tsconfig.json'),
path.resolve(__dirname, 'tsconfig.json')
],
tsconfigRootDir: __dirname
},
extends: [
"standard-with-typescript",
"prettier"
],
globals: {
localStorage: "readonly",
location: "readonly",
fetch: "readonly"
},
rules: {
"camelcase": "off",
"@typescript-eslint/naming-convention": "off",
"@typescript-eslint/strict-boolean-expressions": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/restrict-template-expressions": "off"
},
plugins: ['jest'],
"env": {
"jest/globals": true
}
}
59 changes: 6 additions & 53 deletions package.json
View file
Open in desktop
Expand Up @@ -27,18 +27,20 @@
"eslint-config-prettier": "^8.3.0",
"eslint-config-standard-with-typescript": "^21.0.1",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^25.3.0",
"eslint-plugin-jest": "^25.7.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.0.0",
"husky": "^7.0.4",
"prettier": "2.4.1",
"pretty-quick": "^3.1.2",
"semver": "7.3.5",
"stream-to-array": "2.3.0",
"ts-node": "10.5.0",
"turbo": "1.3.1",
"typescript": "^4.5.2"
"typescript": "4.7.4"
},
"engines": {
"node": "^12.19.0 || ^14.15.0 || ^16.13.0",
"pnpm": ">=6.32.3"
"node": "^12.19.0 || ^14.15.0 || ^16.13.0"
},
"prettier": {
"semi": false,
Expand All @@ -52,55 +54,6 @@
}
]
},
"eslintConfig": {
"parser": "@typescript-eslint/parser",
"extends": [
"standard-with-typescript",
"prettier"
],
"ignorePatterns": [
"node_modules",
"next-env.d.ts",
"types",
".next",
"dist",
"/core",
"/react.js"
],
"globals": {
"localStorage": "readonly",
"location": "readonly",
"fetch": "readonly"
},
"rules": {
"camelcase": "off",
"@typescript-eslint/naming-convention": "off",
"@typescript-eslint/strict-boolean-expressions": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/restrict-template-expressions": "off"
},
"overrides": [
{
"files": [
"./**/*test.js"
],
"env": {
"jest/globals": true
},
"extends": [
"plugin:jest/recommended"
],
"plugins": [
"jest"
]
}
]
},
"eslintIgnore": [
"./*.d.ts",
"**/tests",
"**/__tests__"
],
"packageManager": "pnpm@7.5.1",
"funding": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-dgraph/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-dynamodb/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-fauna/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-firebase/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-mikro-orm/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-mongodb/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-neo4j/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-pouchdb/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/base.json",
"extends": "@next-auth/tsconfig/tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-prisma/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-sequelize/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-typeorm-legacy/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter-upstash-redis/tsconfig.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "@next-auth/tsconfig/adapters.json",
"extends": "@next-auth/tsconfig/tsconfig.adapters.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
Expand Down
17 changes: 4 additions & 13 deletions packages/next-auth/package.json
View file
Open in desktop
Expand Up @@ -39,7 +39,8 @@
"scripts": {
"build": "pnpm clean && pnpm build:js && pnpm build:css",
"clean": "rm -rf client css utils providers core jwt react next index.d.ts index.js adapters.d.ts middleware.d.ts middleware.js",
"build:js": "pnpm clean && pnpm generate-providers && tsc && babel --config-file ./config/babel.config.js src --out-dir . --extensions \".tsx,.ts,.js,.jsx\"",
"build:types": "tsc --project tsconfig.build.json",
"build:js": "pnpm clean && pnpm generate-providers && pnpm build:types && babel --config-file ./config/babel.config.js src --out-dir . --extensions \".tsx,.ts,.js,.jsx\"",
"build:css": "postcss --config config/postcss.config.js src/**/*.css --base src --dir . && node config/wrap-css.js",
"watch:css": "postcss --config config/postcss.config.js --watch src/**/*.css --base src --dir .",
"test": "jest --config ./config/jest.config.js",
Expand Down Expand Up @@ -94,7 +95,7 @@
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@next-auth/tsconfig": "workspace:^0.0.0",
"@next-auth/tsconfig": "workspace:*",
"@swc/core": "^1.2.198",
"@swc/jest": "^0.2.21",
"@testing-library/dom": "^8.13.0",
Expand Down Expand Up @@ -126,15 +127,5 @@
},
"engines": {
"node": "^12.19.0 || ^14.15.0 || ^16.13.0"
},
"eslintConfig": {
"parserOptions": {
"project": "./tsconfig.eslint.json"
}
},
"eslintIgnore": [
"./*.d.ts",
"**/tests",
"**/__tests__"
]
}
}
2 changes: 2 additions & 0 deletions packages/next-auth/tests/getServerSession.test.ts
View file
Open in desktop
Expand Up @@ -10,13 +10,15 @@ const req: any = { headers: {} }
const res: any = { setHeader: jest.fn(), getHeader: jest.fn() }

beforeEach(() => {
// @ts-expect-error
process.env.NODE_ENV = "production"
process.env.NEXTAUTH_URL = "http://localhost"
console.warn = jest.fn()
})

afterEach(() => {
logger = mockLogger()
// @ts-expect-error
process.env.NODE_ENV = "test"
delete process.env.NEXTAUTH_URL
console.warn = originalWarn
Expand Down
10 changes: 10 additions & 0 deletions packages/next-auth/tsconfig.build.json
View file
Open in desktop
@@ -0,0 +1,10 @@
{
"extends": "./tsconfig.json",
"exclude": [
"./*.js",
"./*.d.ts",
"./config",
"./tests",
"./**/__test__"
]
}
4 changes: 0 additions & 4 deletions packages/next-auth/tsconfig.eslint.json
View file
Open in desktop

This file was deleted.

12 changes: 3 additions & 9 deletions packages/next-auth/tsconfig.json
View file
Open in desktop
@@ -1,6 +1,7 @@
{
"extends": "@next-auth/tsconfig/base.json",
"extends": "@next-auth/tsconfig/tsconfig.base.json",
"compilerOptions": {
"declaration": true,
"emitDeclarationOnly": true,
"strictNullChecks": true,
"lib": ["dom", "dom.iterable", "esnext"],
Expand All @@ -19,12 +20,5 @@
"next": ["node_modules/next"]
}
},
"exclude": [
"./*.js",
"./*.d.ts",
"config",
"**/__tests__",
"tests",
"coverage"
]
"exclude": ["./*.js", "./*.d.ts"]
}
8 changes: 4 additions & 4 deletions packages/tsconfig/package.json
View file
Open in desktop
@@ -1,11 +1,11 @@
{
"private": true,
"name": "@next-auth/tsconfig",
"private": true,
"version": "0.0.0",
"license": "MIT",
"main": "index.js",
"files": [
"adapters.json",
"base.json"
"tsconfig.adapters.json",
"tsconfig.base.json",
"tsconfig.eslint.json"
]
}
4 changes: 2 additions & 2 deletions packages/tsconfig/adapters.json → packages/tsconfig/tsconfig.adapters.json
View file
Open in desktop
@@ -1,8 +1,8 @@
{
"extends": "./base.json",
"extends": "./tsconfig.base.json",
"compilerOptions": {
"target": "ES2019",
"module": "commonjs",
"strict": true
}
}
}
2 changes: 1 addition & 1 deletion packages/tsconfig/base.json → packages/tsconfig/tsconfig.base.json
View file
Open in desktop
Expand Up @@ -4,6 +4,6 @@
"forceConsistentCasingInFileNames": true,
"esModuleInterop": true,
"declaration": true,
"skipLibCheck": true
"skipLibCheck": true,
}
}