Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

Commit

Permalink
Merge pull request #9 from imyourmanzi/upgrade-nx-15.0.1
Browse files Browse the repository at this point in the history 
Upgrade to Latest Nx (15.0.1) and Update Dependencies
  • Loading branch information
@imyourmanzi
imyourmanzi committed Oct 22, 2022
2 parents 8a7a766 + e1b4919 commit cbcfb6d
Show file tree
Hide file tree
Showing 8 changed files with 4,913 additions and 4,177 deletions.
27 changes: 19 additions & 8 deletions nx.json
View file
Expand Up @@ -4,13 +4,6 @@
"affected": {
"defaultBase": "main"
},
"implicitDependencies": {
"package.json": {
"dependencies": "*",
"devDependencies": "*"
},
".eslintrc.json": "*"
},
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
Expand All @@ -21,7 +14,14 @@
},
"targetDefaults": {
"build": {
"dependsOn": ["^build"]
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"test": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
},
"lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
}
},
"workspaceLayout": {
Expand All @@ -44,5 +44,16 @@
"linter": "eslint"
}
}
},
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": ["{workspaceRoot}/babel.config.json"],
"production": [
"default",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/jest.config.[jt]s",
"!{projectRoot}/.eslintrc.json"
]
}
}
8,983 changes: 4,853 additions & 4,130 deletions package-lock.json
View file

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions package.json
View file
@@ -1,63 +1,63 @@
{
"name": "spotify-playlist-manager",
"version": "0.0.6",
"version": "0.0.7",
"license": "MIT",
"scripts": {},
"private": true,
"devDependencies": {
"@nrwl/cli": "14.5.4",
"@nrwl/cypress": "14.5.4",
"@nrwl/eslint-plugin-nx": "14.5.4",
"@nrwl/jest": "14.5.4",
"@nrwl/js": "14.5.4",
"@nrwl/linter": "14.5.4",
"@nrwl/node": "^14.5.4",
"@nrwl/react": "^14.5.4",
"@nrwl/web": "14.5.4",
"@nrwl/workspace": "14.5.4",
"@testing-library/react": "13.3.0",
"@types/jest": "27.4.1",
"@types/node": "^18.8.4",
"@types/react": "18.0.15",
"@nrwl/cli": "15.0.1",
"@nrwl/cypress": "15.0.1",
"@nrwl/eslint-plugin-nx": "15.0.1",
"@nrwl/jest": "15.0.1",
"@nrwl/js": "15.0.1",
"@nrwl/linter": "15.0.1",
"@nrwl/node": "15.0.1",
"@nrwl/react": "15.0.1",
"@nrwl/web": "15.0.1",
"@nrwl/workspace": "15.0.1",
"@testing-library/react": "13.4.0",
"@types/jest": "28.1.8",
"@types/node": "18.7.18",
"@types/react": "18.0.20",
"@types/react-dom": "18.0.6",
"@types/react-router-dom": "5.3.3",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-jest": "27.5.1",
"@typescript-eslint/eslint-plugin": "5.40.1",
"@typescript-eslint/parser": "5.40.1",
"babel-jest": "28.1.3",
"babel-plugin-macros": "^3.1.0",
"cypress": "^10.2.0",
"cypress": "^10.7.0",
"eslint": "~8.15.0",
"eslint-config-prettier": "8.1.0",
"eslint-plugin-baseui": "^12.1.2",
"eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jsx-a11y": "6.6.1",
"eslint-plugin-react": "7.30.1",
"eslint-plugin-react": "7.31.8",
"eslint-plugin-react-hooks": "4.6.0",
"jest": "27.5.1",
"nx": "14.5.4",
"jest": "28.1.3",
"nx": "15.0.1",
"prettier": "^2.6.2",
"react-test-renderer": "18.2.0",
"ts-jest": "27.1.4",
"ts-node": "~10.8.0",
"typescript": "~4.7.2"
"ts-jest": "28.0.8",
"ts-node": "10.9.1",
"typescript": "4.8.4"
},
"dependencies": {
"@fastify/cookie": "^7.3.1",
"@fastify/cookie": "^8.3.0",
"@fastify/type-provider-typebox": "^2.3.0",
"@fortawesome/fontawesome-svg-core": "^6.2.0",
"@fortawesome/free-regular-svg-icons": "^6.2.0",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@sinclair/typebox": "^0.24.42",
"axios": "^0.27.2",
"axios": "^0.27 || 1.1.0 || ^1.1.4",
"baseui": "^12.1.2",
"core-js": "^3.6.5",
"fastify": "^4.3.0",
"fastify-plugin": "^4.2.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-router-dom": "6.3.0",
"react-router-dom": "6.4.1",
"regenerator-runtime": "0.13.7",
"styletron-engine-atomic": "^1.5.0",
"styletron-react": "^6.1.0",
Expand Down
8 changes: 5 additions & 3 deletions packages/server/project.json
View file
Expand Up @@ -4,12 +4,14 @@
"projectType": "application",
"targets": {
"build": {
"executor": "@nrwl/node:webpack",
"executor": "@nrwl/webpack:webpack",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/packages/server",
"main": "packages/server/src/main.ts",
"tsConfig": "packages/server/tsconfig.app.json"
"tsConfig": "packages/server/tsconfig.app.json",
"target": "node",
"compiler": "tsc"
},
"configurations": {
"production": {
Expand Down Expand Up @@ -45,7 +47,7 @@
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/packages/server"],
"outputs": ["{workspaceRoot}/coverage/packages/server"],
"options": {
"jestConfig": "packages/server/jest.config.ts",
"passWithNoTests": true
Expand Down
2 changes: 1 addition & 1 deletion packages/spotify-sdk/project.json
View file
Expand Up @@ -22,7 +22,7 @@
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/packages/spotify-sdk"],
"outputs": ["{workspaceRoot}/coverage/packages/spotify-sdk"],
"options": {
"jestConfig": "packages/spotify-sdk/jest.config.ts",
"passWithNoTests": true
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/jest.config.ts
View file
Expand Up @@ -4,7 +4,7 @@ export default {
preset: '../../jest.preset.js',
transform: {
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
'^.+\\.[tj]sx?$': 'babel-jest',
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/react/babel'] }],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/packages/ui',
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/project.json
View file
Expand Up @@ -4,7 +4,7 @@
"projectType": "application",
"targets": {
"build": {
"executor": "@nrwl/web:webpack",
"executor": "@nrwl/webpack:webpack",
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
Expand Down Expand Up @@ -44,7 +44,7 @@
}
},
"serve": {
"executor": "@nrwl/web:dev-server",
"executor": "@nrwl/webpack:dev-server",
"defaultConfiguration": "development",
"options": {
"buildTarget": "ui:build",
Expand All @@ -70,7 +70,7 @@
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/packages/ui"],
"outputs": ["{workspaceRoot}/coverage/packages/ui"],
"options": {
"jestConfig": "packages/ui/jest.config.ts",
"passWithNoTests": true
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.base.json
View file
Expand Up @@ -15,10 +15,10 @@
"skipDefaultLibCheck": true,
"baseUrl": ".",
"paths": {
"@spotify-playlist-manager/ui/components/*": ["packages/ui/src/app/components/*"],
"@spotify-playlist-manager/ui/contexts/*": ["packages/ui/src/app/contexts/*"],
"@spotify-playlist-manager/server/*": ["packages/server/src/*"],
"@spotify-playlist-manager/spotify-sdk": ["packages/spotify-sdk/src/index.ts"],
"@spotify-playlist-manager/server/*": ["packages/server/src/*"]
"@spotify-playlist-manager/ui/components/*": ["packages/ui/src/app/components/*"],
"@spotify-playlist-manager/ui/contexts/*": ["packages/ui/src/app/contexts/*"]
}
},
"exclude": ["node_modules", "tmp"]
Expand Down

0 comments on commit cbcfb6d

Please sign in to comment.