Skip to content

Commit

Permalink
Merge pull request #1027 from gperdomor/fix/updates
Browse files Browse the repository at this point in the history
fix(deps): bump nrwl monorepo from 18.3.2 to v18.3.3
  • Loading branch information
gperdomor authored Apr 21, 2024
2 parents 59eae8b + d68c141 commit fa3225b
Show file tree
Hide file tree
Showing 37 changed files with 291 additions and 331 deletions.
42 changes: 42 additions & 0 deletions .eslintrc.base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
},
{
"files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
"env": {
"jest": true
},
"rules": {}
}
]
}
7 changes: 2 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nx"],
"overrides": [
{
"files": "*.json",
Expand All @@ -28,12 +26,10 @@
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
},
{
Expand All @@ -43,5 +39,6 @@
},
"rules": {}
}
]
],
"extends": ["./.eslintrc.base.json"]
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Gustavo Perdomo
Copyright (c) 2020-2024 Gustavo Perdomo

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getJestProjects } from '@nx/jest';
import { getJestProjectsAsync } from '@nx/jest';

export default {
projects: getJestProjects(),
};
export default async () => ({
projects: await getJestProjectsAsync(),
});
57 changes: 27 additions & 30 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,5 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"@nx/eslint:lint": {
"cache": true,
"inputs": [
"default",
"{workspaceRoot}/.eslintrc.json",
"{workspaceRoot}/.eslintignore",
"{workspaceRoot}/eslint.config.js"
]
},
"@nx/jest:jest": {
"cache": true,
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"options": {
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
}
}
},
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"production": [
Expand All @@ -43,5 +14,31 @@
],
"sharedGlobals": []
},
"nxCloudAccessToken": "NWQ5YjFmMDAtZGE0Yi00N2FjLWJhODktZTYzMDI2ZGIyNzEzfHJlYWQ="
"nxCloudAccessToken": "NWQ5YjFmMDAtZGE0Yi00N2FjLWJhODktZTYzMDI2ZGIyNzEzfHJlYWQ=",
"targetDefaults": {
"@nx/js:tsc": {
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
}
},
"release": {
"version": {
"preVersionCommand": "pnpm dlx nx run-many -t build"
}
},
"plugins": [
{
"plugin": "@nx/eslint/plugin",
"options": {
"targetName": "lint"
}
},
{
"plugin": "@nx/jest/plugin",
"options": {
"targetName": "test"
}
}
]
}
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
},
"private": true,
"engines": {
"node": ">=18.0.0 || >=20.0.0"
"node": ">=18.12.0 || >=20.0.0"
},
"dependencies": {
"@actions/exec": "1.1.1",
"@actions/github": "6.0.0",
"@actions/io": "1.1.3",
"@nx/devkit": "18.3.2",
"@nx/devkit": "18.3.3",
"@octokit/openapi-types": "19.1.0",
"@renovate/pep440": "1.0.0",
"@swc/helpers": "0.5.3",
Expand All @@ -39,12 +39,12 @@
"@commitlint/config-conventional": "19.2.2",
"@commitlint/config-nx-scopes": "19.2.1",
"@commitlint/cz-commitlint": "19.2.0",
"@nx/eslint": "18.3.2",
"@nx/eslint-plugin": "18.3.2",
"@nx/jest": "18.3.2",
"@nx/js": "18.3.2",
"@nx/plugin": "18.3.2",
"@nx/workspace": "18.3.2",
"@nx/eslint": "18.3.3",
"@nx/eslint-plugin": "18.3.3",
"@nx/jest": "18.3.3",
"@nx/js": "18.3.3",
"@nx/plugin": "18.3.3",
"@nx/workspace": "18.3.3",
"@prisma/client": "5.12.1",
"@swc-node/register": "1.8.0",
"@swc/cli": "~0.1.62",
Expand All @@ -65,7 +65,7 @@
"jest-environment-node": "29.7.0",
"lint-staged": "15.2.2",
"mocked-env": "1.3.5",
"nx": "18.3.2",
"nx": "18.3.3",
"prettier": "2.8.8",
"ts-jest": "29.1.1",
"ts-node": "10.9.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/ci-context/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["../../.eslintrc.json"],
"extends": ["../../.eslintrc.base.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
Expand Down
26 changes: 12 additions & 14 deletions packages/ci-context/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/ci-context/src",
"projectType": "library",
"release": {
"version": {
"generatorOptions": {
"packageRoot": "dist/{projectRoot}",
"currentVersionResolver": "git-tag"
}
}
},
"tags": ["type:lib", "scope:nx-container"],
"targets": {
"build": {
"executor": "@nx/js:tsc",
Expand All @@ -14,21 +23,10 @@
"assets": ["packages/ci-context/*.md"]
}
},
"publish": {
"command": "node tools/scripts/publish.mjs ci-context {args.ver} {args.tag}",
"dependsOn": ["build"]
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"nx-release-publish": {
"options": {
"jestConfig": "packages/ci-context/jest.config.ts"
"packageRoot": "dist/{projectRoot}"
}
}
},
"tags": ["nx-container"]
}
}
2 changes: 1 addition & 1 deletion packages/container-metadata/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["../../.eslintrc.json"],
"extends": ["../../.eslintrc.base.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
Expand Down
26 changes: 12 additions & 14 deletions packages/container-metadata/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/container-metadata/src",
"projectType": "library",
"release": {
"version": {
"generatorOptions": {
"packageRoot": "dist/{projectRoot}",
"currentVersionResolver": "git-tag"
}
}
},
"tags": ["type:lib", "scope:nx-container"],
"targets": {
"build": {
"executor": "@nx/js:tsc",
Expand All @@ -14,21 +23,10 @@
"assets": ["packages/container-metadata/*.md"]
}
},
"publish": {
"command": "node tools/scripts/publish.mjs container-metadata {args.ver} {args.tag}",
"dependsOn": ["build"]
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"nx-release-publish": {
"options": {
"jestConfig": "packages/container-metadata/jest.config.ts"
"packageRoot": "dist/{projectRoot}"
}
}
},
"tags": ["nx-container"]
}
}
2 changes: 1 addition & 1 deletion packages/core/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["../../.eslintrc.json"],
"extends": ["../../.eslintrc.base.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
Expand Down
26 changes: 12 additions & 14 deletions packages/core/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/core/src",
"projectType": "library",
"release": {
"version": {
"generatorOptions": {
"packageRoot": "dist/{projectRoot}",
"currentVersionResolver": "git-tag"
}
}
},
"tags": ["type:lib", "scope:shared"],
"targets": {
"build": {
"executor": "@nx/js:tsc",
Expand All @@ -14,21 +23,10 @@
"assets": ["packages/core/*.md"]
}
},
"publish": {
"command": "node tools/scripts/publish.mjs core {args.ver} {args.tag}",
"dependsOn": ["build"]
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"nx-release-publish": {
"options": {
"jestConfig": "packages/core/jest.config.ts"
"packageRoot": "dist/{projectRoot}"
}
}
},
"tags": ["core"]
}
}
2 changes: 1 addition & 1 deletion packages/nx-container/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["../../.eslintrc.json"],
"extends": ["../../.eslintrc.base.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
Expand Down
26 changes: 12 additions & 14 deletions packages/nx-container/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/nx-container/src",
"projectType": "library",
"release": {
"version": {
"generatorOptions": {
"packageRoot": "dist/{projectRoot}",
"currentVersionResolver": "git-tag"
}
}
},
"tags": ["type:plugin", "scope:nx-container"],
"targets": {
"build": {
"executor": "@nx/js:tsc",
Expand Down Expand Up @@ -36,21 +45,10 @@
]
}
},
"publish": {
"command": "node tools/scripts/publish.mjs nx-container {args.ver} {args.tag}",
"dependsOn": ["build"]
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"nx-release-publish": {
"options": {
"jestConfig": "packages/nx-container/jest.config.ts"
"packageRoot": "dist/{projectRoot}"
}
}
},
"tags": ["type:plugin"]
}
}
Loading

0 comments on commit fa3225b

Please sign in to comment.