Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
cac289f
Merge pull request #26 from kinnytips/feat/nx-cloud/setup
mocolicious May 29, 2025
bd8d15c
chore(deps): bump axios from 0.27.2 to 0.30.0
dependabot[bot] May 29, 2025
cfe002d
chore(deps): bump @nestjs/common from 9.2.1 to 10.4.16
dependabot[bot] May 29, 2025
aba5779
chore(deps): bump undici from 5.3.0 to 5.29.0
dependabot[bot] May 29, 2025
7fd70fb
chore(deps): bump @babel/runtime from 7.18.3 to 7.27.3
dependabot[bot] May 29, 2025
fdaf512
chore(deps): bump http-proxy-middleware from 2.0.6 to 2.0.9
dependabot[bot] May 29, 2025
862a686
chore(deps): bump base-x from 3.0.9 to 3.0.11
dependabot[bot] May 29, 2025
35d5665
Merge pull request #30 from kinnytips/dependabot/npm_and_yarn/axios-0…
mocolicious May 31, 2025
13598b1
Merge pull request #31 from kinnytips/dependabot/npm_and_yarn/nestjs/…
mocolicious May 31, 2025
a95a0aa
Merge pull request #32 from kinnytips/dependabot/npm_and_yarn/undici-…
mocolicious May 31, 2025
1385fa1
Merge pull request #33 from kinnytips/dependabot/npm_and_yarn/babel/r…
mocolicious May 31, 2025
2c9c181
Merge pull request #34 from kinnytips/dependabot/npm_and_yarn/http-pr…
mocolicious May 31, 2025
9c3710b
Merge pull request #35 from kinnytips/dependabot/npm_and_yarn/base-x-…
mocolicious May 31, 2025
00b4312
chore(deps): bump serialize-javascript from 6.0.0 to 6.0.2
dependabot[bot] May 31, 2025
ee7bb2e
chore(deps): bump systeminformation from 5.11.16 to 5.27.1
dependabot[bot] May 31, 2025
59a5f60
Merge pull request #36 from kinnytips/dependabot/npm_and_yarn/seriali…
mocolicious May 31, 2025
c186629
Merge pull request #37 from kinnytips/dependabot/npm_and_yarn/systemi…
mocolicious May 31, 2025
f1f652b
chore(deps): bump rollup from 2.75.0 to 2.79.2
dependabot[bot] May 31, 2025
14819c8
Merge pull request #38 from kinnytips/dependabot/npm_and_yarn/rollup-…
mocolicious May 31, 2025
ea39239
fix(api): resolve Nx build errors, update project configs, and clean …
bbajwadev Aug 6, 2025
ef22792
Apply suggestion from @Copilot
mocolicious Aug 10, 2025
6b86999
Apply suggestion from @Copilot
mocolicious Aug 10, 2025
97d5b95
Apply suggestion from @Copilot
mocolicious Aug 10, 2025
e63eea4
Apply suggestion from @Copilot
mocolicious Aug 10, 2025
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
8 changes: 4 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"plugins": ["@nx/nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
Expand All @@ -26,7 +26,7 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"extends": ["plugin:@nx/nx/typescript"],
"rules": {
"no-unused-vars": "off",
"react-hooks/exhaustive-deps": "off",
Expand All @@ -36,7 +36,7 @@
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"extends": ["plugin:@nx/nx/javascript"],
"rules": {}
}
]
Expand Down
4 changes: 2 additions & 2 deletions apps/api-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"projectType": "application",
"targets": {
"e2e": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "apps/api-e2e/jest.config.ts",
"passWithNoTests": true
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/api-e2e/**/*.ts"]
Expand Down
29 changes: 8 additions & 21 deletions apps/api/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,32 @@
"projectType": "application",
"targets": {
"build": {
"executor": "@nrwl/webpack:webpack",
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/apps/api",
"main": "apps/api/src/main.ts",
"tsConfig": "apps/api/tsconfig.app.json",
"assets": ["apps/api/src/assets"],
"target": "node",
"compiler": "tsc"
},
"configurations": {
"production": {
"optimization": false,
"extractLicenses": true,
"inspect": false,
"fileReplacements": [
{
"replace": "apps/api/src/environments/environment.ts",
"with": "apps/api/src/environments/environment.prod.ts"
}
]
}
"assets": ["apps/api/src/assets"]
}
},
"serve": {
"executor": "@nrwl/node:node",
"executor": "@nx/js:node",
"options": {
"buildTarget": "api:build"
"buildTarget": "api:build",
"watch": true
}
},

"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/api/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/apps/api"],
"options": {
"jestConfig": "apps/api/jest.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion apps/api/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
"target": "es2015"
},
"exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.test.ts"],
"include": ["**/*.ts"]
"include": ["apps/api/**/*.ts", "libs/**/*.ts"]
}
4 changes: 2 additions & 2 deletions apps/sdk-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
}
},
"e2e-local": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "apps/sdk-e2e/jest.config.js",
"passWithNoTests": true
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/sdk-e2e/**/*.ts"]
Expand Down
2 changes: 1 addition & 1 deletion apps/web-e2e/cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig } from 'cypress'
import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset'
import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset'

export default defineConfig({
e2e: nxE2EPreset(__dirname),
Expand Down
4 changes: 2 additions & 2 deletions apps/web-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projectType": "application",
"targets": {
"e2e": {
"executor": "@nrwl/cypress:cypress",
"executor": "@nx/cypress:cypress",
"options": {
"cypressConfig": "apps/web-e2e/cypress.config.ts",
"devServerTarget": "web:serve:development",
Expand All @@ -18,7 +18,7 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/web-e2e/**/*.{js,ts}"]
Expand Down
2 changes: 1 addition & 1 deletion apps/web/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/react/babel",
"@nx/react/babel",
{
"runtime": "automatic"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/.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/nx/react", "../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
Expand Down
4 changes: 2 additions & 2 deletions apps/web/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ export default {
displayName: 'web',
preset: '../../jest.preset.js',
transform: {
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/react/babel'] }],
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
'^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
coverageDirectory: '../../coverage/apps/web',
Expand Down
10 changes: 5 additions & 5 deletions apps/web/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"projectType": "application",
"targets": {
"build": {
"executor": "@nrwl/webpack:webpack",
"executor": "@nx/webpack:webpack",
"outputs": ["{options.outputPath}"],
"defaultConfiguration": "production",
"options": {
Expand All @@ -19,7 +19,7 @@
"assets": ["apps/web/src/favicon.ico", "apps/web/src/assets"],
"styles": ["apps/web/src/styles.css"],
"scripts": [],
"webpackConfig": "@nrwl/react/plugins/webpack"
"webpackConfig": "@nx/react/plugins/webpack"
},
"configurations": {
"development": {
Expand All @@ -45,7 +45,7 @@
}
},
"serve": {
"executor": "@nrwl/webpack:dev-server",
"executor": "@nx/webpack:dev-server",
"defaultConfiguration": "development",
"options": {
"buildTarget": "web:build",
Expand All @@ -63,14 +63,14 @@
}
},
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/web/**/*.{ts,tsx,js,jsx}"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "apps/web/jest.config.ts",
Expand Down
5 changes: 1 addition & 4 deletions apps/web/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"outDir": "../../dist/out-tsc",
"types": ["node"]
},
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
],
"files": ["../../node_modules/@nx/react/typings/cssmodule.d.ts", "../../node_modules/@nx/react/typings/image.d.ts"],
"exclude": [
"jest.config.ts",
"**/*.spec.ts",
Expand Down
5 changes: 1 addition & 4 deletions apps/web/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,5 @@
"**/*.spec.jsx",
"**/*.d.ts"
],
"files": [
"../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
"../../node_modules/@nrwl/react/typings/image.d.ts"
]
"files": ["../../node_modules/@nx/react/typings/cssmodule.d.ts", "../../node_modules/@nx/react/typings/image.d.ts"]
}
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { getJestProjects } = require('@nrwl/jest')
const { getJestProjects } = require('@nx/jest')

module.exports = {
projects: getJestProjects(),
Expand Down
2 changes: 1 addition & 1 deletion jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const nxPreset = require('@nrwl/jest/preset').default
const nxPreset = require('@nx/jest/preset').default

module.exports = { ...nxPreset }
2 changes: 1 addition & 1 deletion libs/api/account/data-access/.babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
"presets": [["@nx/web/babel", { "useBuiltIns": "usage" }]]
}
4 changes: 2 additions & 2 deletions libs/api/account/data-access/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"projectType": "library",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/api/account/data-access/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/api/account/data-access"],
"options": {
"jestConfig": "libs/api/account/data-access/jest.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion libs/api/account/feature/.babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
"presets": [["@nx/web/babel", { "useBuiltIns": "usage" }]]
}
4 changes: 2 additions & 2 deletions libs/api/account/feature/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"projectType": "library",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/api/account/feature/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/api/account/feature"],
"options": {
"jestConfig": "libs/api/account/feature/jest.config.ts",
Expand Down
4 changes: 2 additions & 2 deletions libs/api/airdrop/data-access/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"sourceRoot": "libs/api/airdrop/data-access/src",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/api/airdrop/data-access/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/api/airdrop/data-access"],
"options": {
"jestConfig": "libs/api/airdrop/data-access/jest.config.ts",
Expand Down
4 changes: 2 additions & 2 deletions libs/api/airdrop/feature/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"sourceRoot": "libs/api/airdrop/feature/src",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/api/airdrop/feature/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/api/airdrop/feature"],
"options": {
"jestConfig": "libs/api/airdrop/feature/jest.config.ts",
Expand Down
2 changes: 1 addition & 1 deletion libs/api/airdrop/util/.babelrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"presets": [
[
"@nrwl/web/babel",
"@nx/web/babel",
{
"useBuiltIns": "usage"
}
Expand Down
4 changes: 2 additions & 2 deletions libs/api/airdrop/util/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"projectType": "library",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/api/airdrop/util/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/api/airdrop/util"],
"options": {
"jestConfig": "libs/api/airdrop/util/jest.config.ts",
Expand Down
4 changes: 2 additions & 2 deletions libs/api/app/data-access/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"sourceRoot": "libs/api/app/data-access/src",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/api/app/data-access/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/api/app/data-access"],
"options": {
"jestConfig": "libs/api/app/data-access/jest.config.ts",
Expand Down
4 changes: 2 additions & 2 deletions libs/api/app/feature/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"sourceRoot": "libs/api/app/feature/src",
"targets": {
"lint": {
"executor": "@nrwl/linter:eslint",
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/api/app/feature/**/*.ts"]
}
},
"test": {
"executor": "@nrwl/jest:jest",
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/libs/api/app/feature"],
"options": {
"jestConfig": "libs/api/app/feature/jest.config.ts",
Expand Down
Loading
Loading