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: bump deps #71

Merged
merged 4 commits into from
Dec 21, 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
6 changes: 3 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
}
],
Expand All @@ -16,7 +16,7 @@
"error",
{ "ignoreRestSiblings": true }
],
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: pnpm lint

- name: Run Typescript
run: pnpm tsc
run: pnpm typecheck

- name: Run Tests
run: pnpm test
2 changes: 1 addition & 1 deletion .lintstagedrc.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default {
"*.{js,jsx,ts,tsx}": () => "nx affected --target=lint --fix --max-warnings 0",
"*.{ts,tsx}": () => "nx affected --target=tsc",
"*.{ts,tsx}": () => "nx affected --target=typecheck",
"*.{js,jsx,ts,tsx,md,mdx,css,json}": "prettier --write",
};
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.18.2
v20.10.0
2 changes: 1 addition & 1 deletion apps/docs/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"],
"extends": ["plugin:@nx/react", "../../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": []
}
6 changes: 1 addition & 5 deletions apps/docs/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ const config: StorybookConfig = {
"../../../libs/react/**/src/**/*.stories.tsx",
"../../../libs/react/**/src/**/*.mdx",
],
addons: [
"@storybook/addon-essentials",
"@nx/react/plugins/storybook",
"storybook-dark-mode",
],
addons: ["@storybook/addon-essentials", "storybook-dark-mode"],
staticDirs: ["../public"],
typescript: {
reactDocgen: "react-docgen-typescript",
Expand Down
2 changes: 1 addition & 1 deletion apps/e2e-web/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"lintFilePatterns": ["apps/e2e-web/**/*.{js,ts}"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": ["tsc -p apps/e2e-web/tsconfig.json --noEmit"]
Expand Down
10 changes: 2 additions & 8 deletions apps/next-app/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
{
"extends": [
// Recover ths with bumb to nx 17
// "plugin:@nrwl/nx/react",
"next",
"next/core-web-vitals",
"../../.eslintrc.json"
],
"extends": ["next", "next/core-web-vitals", "../../.eslintrc.json"],
"ignorePatterns": ["!**/*", ".next/**/*"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@next/next/no-html-link-for-pages": ["error", "apps/next-app/pages"],
"@nrwl/nx/enforce-module-boundaries": ["off"]
"@nx/enforce-module-boundaries": ["off"]
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions apps/next-app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
},
"test": {
"executor": "@nrwl/vite:test",
"executor": "@nx/vite:test",
"options": {
"passWithNoTests": true,
"reportsDirectory": "../../coverage/apps/next-app",
Expand All @@ -44,7 +44,7 @@
"lintFilePatterns": ["apps/next-app/pages/**/*.{ts,tsx,js,jsx}"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": [
Expand Down
2 changes: 1 addition & 1 deletion libs/base/env/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"lintFilePatterns": ["libs/base/env/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": ["tsc -p libs/base/env/tsconfig.json --noEmit"]
Expand Down
2 changes: 1 addition & 1 deletion libs/base/errors/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"lintFilePatterns": ["libs/base/errors/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": ["tsc -p libs/base/errors/tsconfig.json --noEmit"]
Expand Down
2 changes: 1 addition & 1 deletion libs/base/types/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"lintFilePatterns": ["libs/base/types/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": ["tsc -p libs/base/types/tsconfig.json --noEmit"]
Expand Down
4 changes: 2 additions & 2 deletions libs/content/interview-flashcards/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"lintFilePatterns": ["libs/content/interview-flashcards/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": [
Expand All @@ -31,7 +31,7 @@
}
},
"test": {
"executor": "@nrwl/vite:test",
"executor": "@nx/vite:test",
"outputs": [],
"options": {
"passWithNoTests": true,
Expand Down
1 change: 1 addition & 0 deletions libs/content/interview-flashcards/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export default defineConfig({

test: {
globals: true,
reporters: ["default"],
include: ["**/*.{test,spec}.{ts,tsx}"],
cache: {
dir: "../../../node_modules/.vitest",
Expand Down
4 changes: 2 additions & 2 deletions libs/content/question-bank-737/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"lintFilePatterns": ["libs/content/question-bank-737/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": [
Expand All @@ -31,7 +31,7 @@
}
},
"test": {
"executor": "@nrwl/vite:test",
"executor": "@nx/vite:test",
"outputs": [],
"options": {
"passWithNoTests": false,
Expand Down
1 change: 1 addition & 0 deletions libs/content/question-bank-737/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export default defineConfig({

test: {
globals: true,
reporters: ["default"],
include: ["**/*.{test,spec}.{ts,tsx}"],
cache: {
dir: "../../../node_modules/.vitest",
Expand Down
1 change: 0 additions & 1 deletion libs/content/question-bank-a320/migrate/content.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ export const readAllQuestionsFromFs = async (): Promise<QuestionTemplate[]> => {
const filePath = path.join(dirPath, file);
const jsonString = await fs.readFile(filePath, "utf-8");
const jsonData = JSON.parse(jsonString) as QuestionTemplateJson[];
console.log(file);
const jsonDataWithSrcLocation = jsonData.map((q) => ({
...q,
srcLocation: filePath.replace(process.cwd(), ""),
Expand Down
5 changes: 2 additions & 3 deletions libs/content/question-bank-a320/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"lintFilePatterns": ["libs/content/question-bank-a320/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": [
Expand All @@ -31,8 +31,7 @@
}
},
"test": {
"executor": "@nrwl/vite:test",
"outputs": [],
"executor": "@nx/vite:test",
"options": {
"passWithNoTests": false,
"reportsDirectory": "../../coverage/libs/content/question-bank-a320",
Expand Down
6 changes: 1 addition & 5 deletions libs/content/question-bank-a320/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@ export default defineConfig({

test: {
globals: true,
reporters: ["default"],
include: ["**/*.{test,spec}.{ts,tsx}"],
cache: {
dir: "../../../node_modules/.vitest",
},
coverage: {
all: true,
provider: "istanbul",
},
},

define: {
process: {
env: {
Expand Down
4 changes: 2 additions & 2 deletions libs/content/question-bank-atpl/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"lintFilePatterns": ["libs/content/question-bank-atpl/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": [
Expand All @@ -32,7 +32,7 @@
}
},
"test": {
"executor": "@nrwl/vite:test",
"executor": "@nx/vite:test",
"outputs": [],
"options": {
"passWithNoTests": false,
Expand Down
1 change: 1 addition & 0 deletions libs/content/question-bank-atpl/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export default defineConfig({

test: {
globals: true,
reporters: ["default"],
include: ["**/*.{test,spec}.{ts,tsx}"],
cache: {
dir: "../../../node_modules/.vitest",
Expand Down
2 changes: 1 addition & 1 deletion libs/core/analytics/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"lintFilePatterns": ["libs/core/analytics/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": ["tsc -p libs/core/analytics/tsconfig.json --noEmit"]
Expand Down
4 changes: 2 additions & 2 deletions libs/core/app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
}
},
"test": {
"executor": "@nrwl/vite:test",
"executor": "@nx/vite:test",
"outputs": ["{workspaceRoot}/coverage/libs/core/app"],
"options": {
"passWithNoTests": false,
"reportsDirectory": "{workspaceRoot}/coverage/libs/core/app",
"config": "{projectRoot}/vitest.config.ts"
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": [
Expand Down
2 changes: 1 addition & 1 deletion libs/core/github/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"lintFilePatterns": ["libs/core/github/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": ["tsc -p libs/core/github/tsconfig.json --noEmit"]
Expand Down
2 changes: 1 addition & 1 deletion libs/core/schemas/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"lintFilePatterns": ["libs/core/schemas/**/*.ts"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": ["tsc -p libs/core/schemas/tsconfig.json --noEmit"]
Expand Down
2 changes: 1 addition & 1 deletion libs/react/analytics/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": ["tsc -p libs/react/analytics/tsconfig.json --noEmit"]
Expand Down
7 changes: 1 addition & 6 deletions libs/react/components/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{
"extends": [
// Recover ths with bumb to nx 17
// "plugin:@nrwl/nx/react",
"next",
"../../../.eslintrc.json"
],
"extends": ["next", "../../../.eslintrc.json"],
"rules": {
// Consider reviewing the policy on this...
"@next/next/no-img-element": "off"
Expand Down
4 changes: 2 additions & 2 deletions libs/react/components/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"lintFilePatterns": ["libs/react/components/src/**/*.{ts,tsx,js,jsx}"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": [
Expand All @@ -22,7 +22,7 @@
}
},
"test": {
"executor": "@nrwl/vite:test",
"executor": "@nx/vite:test",
"outputs": [],
"options": {
"passWithNoTests": false,
Expand Down
2 changes: 1 addition & 1 deletion libs/react/components/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// <reference types="vitest" />
import { default as react } from "@vitejs/plugin-react";
import { defineConfig } from "vite";
import { default as viteTsConfigPaths } from "vite-tsconfig-paths";
import { defineConfig } from "vitest/config";

export default defineConfig({
cacheDir: "../../../node_modules/.vite/chair-flight-components",
Expand Down
2 changes: 1 addition & 1 deletion libs/react/containers/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"],
"extends": ["plugin:@nx/react", "../../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": []
}
4 changes: 2 additions & 2 deletions libs/react/containers/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"lintFilePatterns": ["libs/react/containers/**/*.{ts,tsx,js,jsx}"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": ["tsc -p libs/react/containers/tsconfig.lib.json --noEmit"]
}
},
"test": {
"executor": "@nrwl/vite:test",
"executor": "@nx/vite:test",
"outputs": [],
"options": {
"passWithNoTests": false,
Expand Down
2 changes: 1 addition & 1 deletion libs/react/games/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["plugin:@nrwl/nx/react", "../../../.eslintrc.json"],
"extends": ["plugin:@nx/react", "../../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": []
}
2 changes: 1 addition & 1 deletion libs/react/games/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"lintFilePatterns": ["libs/react/games/src/**/*.{ts,tsx,js,jsx}"]
}
},
"tsc": {
"typecheck": {
"executor": "nx:run-commands",
"options": {
"commands": [
Expand Down
Loading