Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ffMathy/nx-extend
Browse files Browse the repository at this point in the history
  • Loading branch information
ffMathy committed Sep 30, 2023
2 parents 6407609 + 9b16a72 commit 36822b2
Show file tree
Hide file tree
Showing 73 changed files with 2,877 additions and 1,513 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
- `npm install --save-dev @nx-extend/playwright`
- [Terraform](./packages/terraform/README.md)
- `npm install --save-dev @nx-extend/terraform`
- [Pulumi](./packages/Pulumi/README.md)
- [Pulumi](./packages/pulumi/README.md)
- `npm install --save-dev @nx-extend/Pulumi`

## GitHub actions
Expand Down
31 changes: 6 additions & 25 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@
"default": {
"runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
"lint",
"test",
"e2e"
],
"cacheableOperations": ["build", "lint", "test", "e2e"],
"accessToken": "ZGQ5Y2MwYjUtMjA2MS00NDEwLTgzZmQtYzE0MTUwNTMwMzFmfHJlYWQtd3JpdGU=",
"canTrackAnalytics": false,
"showUsageWarnings": true,
Expand All @@ -27,30 +22,16 @@
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"dependsOn": [
"^build"
],
"inputs": [
"production",
"^production"
]
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"test": {
"inputs": [
"default",
"^production",
"{workspaceRoot}/jest.preset.js"
]
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
}
},
"namedInputs": {
"default": [
"{projectRoot}/**/*",
"sharedGlobals"
],
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": [],
"production": [
"default"
]
"production": ["default", "!{projectRoot}/src/test-setup.[jt]s"]
}
}
56 changes: 28 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,54 +32,54 @@
"workspace-generator": "nx workspace-generator"
},
"dependencies": {
"@actions/core": "^1.10.0",
"@nx/devkit": "16.3.2",
"@nx/workspace": "16.3.2",
"@actions/core": "^1.10.1",
"@nx/devkit": "16.8.1",
"@nx/workspace": "16.8.1",
"@types/tar": "^6.1.5",
"axios": "^1.4.0",
"axios": "^1.5.0",
"crypto-js": "^4.1.1",
"deepmerge": "^4.3.1",
"rxjs-for-await": "^1.0.0",
"shelljs": "^0.8.5",
"tar": "^6.1.15",
"tslib": "^2.6.1",
"tar": "^6.2.0",
"tslib": "^2.6.2",
"yargs": "^17.7.2"
},
"devDependencies": {
"@google-cloud/functions-framework": "^3.3.0",
"@google-cloud/storage": "^6.12.0",
"@google-cloud/storage": "^7.1.0",
"@jamesives/github-pages-deploy-action": "^4.4.3",
"@jscutlery/semver": "^3.1.0",
"@nx/eslint-plugin": "16.3.2",
"@nx/jest": "16.3.2",
"@nx/js": "16.3.2",
"@nx/node": "16.3.2",
"@nx/plugin": "16.3.2",
"@nx/react": "16.3.2",
"@nx/webpack": "16.3.2",
"@swc-node/register": "^1.6.6",
"@swc/core": "^1.3.73",
"@types/jest": "29.5.3",
"@types/node": "20.4.5",
"@nx/eslint-plugin": "16.8.1",
"@nx/jest": "16.8.1",
"@nx/js": "16.8.1",
"@nx/node": "16.8.1",
"@nx/plugin": "16.8.1",
"@nx/react": "16.8.1",
"@nx/webpack": "16.8.1",
"@swc-node/register": "^1.6.7",
"@swc/core": "^1.3.84",
"@types/jest": "29.5.4",
"@types/node": "20.6.0",
"@types/shelljs": "^0.8.12",
"@types/yargs": "^17.0.24",
"@typescript-eslint/eslint-plugin": "6.2.1",
"@typescript-eslint/parser": "6.2.1",
"@typescript-eslint/eslint-plugin": "6.7.0",
"@typescript-eslint/parser": "6.7.0",
"dotenv": "16.3.1",
"eslint": "8.46.0",
"eslint-config-prettier": "8.9.0",
"eslint": "8.49.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"express": "^4.18.2",
"husky": "^8.0.3",
"jest": "29.6.2",
"jest-environment-jsdom": "29.6.2",
"nx": "16.3.2",
"nx-cloud": "16.2.0",
"prettier": "3.0.0",
"jest": "29.6.4",
"jest-environment-jsdom": "29.6.4",
"nx": "16.8.1",
"nx-cloud": "16.4.0",
"prettier": "3.0.3",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"tslint": "~6.1.3",
"typescript": "5.1.6"
"typescript": "5.2.2"
},
"packageManager": "[email protected]"
}
8 changes: 8 additions & 0 deletions packages/changelog-notify/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [4.1.2](https://github.com/TriPSs/nx-extend/compare/[email protected]@4.1.2) (2023-08-31)



## [4.1.1](https://github.com/TriPSs/nx-extend/compare/[email protected]@4.1.1) (2023-08-25)



# [4.1.0](https://github.com/TriPSs/nx-extend/compare/[email protected]@4.1.0) (2023-06-22)


Expand Down
2 changes: 1 addition & 1 deletion packages/changelog-notify/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nx-extend/changelog-notify",
"version": "4.1.0",
"version": "4.1.2",
"keywords": [
"nx",
"changelog",
Expand Down
5 changes: 3 additions & 2 deletions packages/changelog-notify/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
"glob": "executors.json",
"output": "."
}
]
],
"updateBuildableProjectDepsInPackageJson": true
}
},
"version": {
Expand All @@ -56,7 +57,7 @@
"publish": {
"executor": "nx:run-commands",
"options": {
"command": "npm publish ./dist/packages/changelog-notify --access public"
"command": "npm publish ./dist/packages/changelog-notify --access public || true"
}
}
},
Expand Down
27 changes: 27 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,33 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [4.4.1](https://github.com/TriPSs/nx-extend/compare/[email protected]@4.4.1) (2023-09-14)


### Bug Fixes

* **core:** Remove package group as it did not have expected effect ([1506697](https://github.com/TriPSs/nx-extend/commit/15066972ca4f9f3bad7d1bde0ea26276f85b1bf0))
* **pulumi:** Use minimal logging ([c32c883](https://github.com/TriPSs/nx-extend/commit/c32c883bf75cbf72e13439662087eebc954b2495)), closes [#154](https://github.com/TriPSs/nx-extend/issues/154)



# [4.4.0](https://github.com/TriPSs/nx-extend/compare/[email protected]@4.4.0) (2023-09-07)


### Features

* **core:** Group migrations together ([81a34dd](https://github.com/TriPSs/nx-extend/commit/81a34ddc834791c2d6b49a63a22977a67d8483e7))



## [4.3.2](https://github.com/TriPSs/nx-extend/compare/[email protected]@4.3.2) (2023-08-31)



## [4.3.1](https://github.com/TriPSs/nx-extend/compare/[email protected]@4.3.1) (2023-08-25)



# [4.3.0](https://github.com/TriPSs/nx-extend/compare/[email protected]@4.3.0) (2023-07-21)


Expand Down
3 changes: 3 additions & 0 deletions packages/core/migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"generators": {}
}
7 changes: 5 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"name": "@nx-extend/core",
"version": "4.3.0",
"main": "src/index.js"
"version": "4.4.1",
"main": "src/index.js",
"nx-migrations": {
"migrations": "./migrations.json"
}
}
5 changes: 3 additions & 2 deletions packages/core/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
"glob": "executors.json",
"output": "."
}
]
],
"updateBuildableProjectDepsInPackageJson": true
}
},
"version": {
Expand All @@ -55,7 +56,7 @@
"publish": {
"executor": "nx:run-commands",
"options": {
"command": "npm publish ./dist/packages/core --access public"
"command": "npm publish ./dist/packages/core --access public || true"
}
}
},
Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/utils/use-verbose-logging.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { isCI } from './is-ci'

export const USE_VERBOSE_LOGGING = isCI() || Boolean(process.env.NX_VERBOSE_LOGGING)

export const USE_VERBOSE_LOGGING_MINIMAL = Boolean(process.env.NX_VERBOSE_LOGGING || process.env. ACTIONS_RUNNER_DEBUG)
25 changes: 20 additions & 5 deletions packages/e2e-runner/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,32 @@
{
"extends": ["../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"extends": [
"../../.eslintrc.json"
],
"ignorePatterns": [
"!**/*"
],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"files": [
"*.ts",
"*.tsx",
"*.js",
"*.jsx"
],
"rules": {}
},
{
"files": ["*.ts", "*.tsx"],
"files": [
"*.ts",
"*.tsx"
],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"files": [
"*.js",
"*.jsx"
],
"rules": {}
}
]
Expand Down
28 changes: 28 additions & 0 deletions packages/e2e-runner/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,34 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

# [7.0.0](https://github.com/TriPSs/nx-extend/compare/[email protected]@7.0.0) (2023-08-31)


### Bug Fixes

* **e2e-runner:** Use correct path for `run-commands` ([d239992](https://github.com/TriPSs/nx-extend/commit/d2399921f4f26719b643f5c3b03e287412be87ce)), closes [#147](https://github.com/TriPSs/nx-extend/issues/147)


### Features

* **e2e-runner:** Added migration from runner `playwright` -> `@nx/playwright` ([32770e0](https://github.com/TriPSs/nx-extend/commit/32770e02bc3e342e260a495724029a25cd2eb176))


### BREAKING CHANGES

* **e2e-runner:** This package is no longer maintained in favor of `@nx/playwright`



# [6.3.0](https://github.com/TriPSs/nx-extend/compare/[email protected]@6.3.0) (2023-08-25)


### Features

* **e2e-runner:** Added support for `@nx/playwright` ([f689d1e](https://github.com/TriPSs/nx-extend/commit/f689d1e594709b28b23e2b8f33429c959d7f60f2))



## [6.2.1](https://github.com/TriPSs/nx-extend/compare/[email protected]@6.2.1) (2023-08-06)


Expand Down
9 changes: 9 additions & 0 deletions packages/e2e-runner/migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"generators": {
"update-7.0.0": {
"version": "7.0.0",
"description": "Migrate from runner playwright to @nx/playwright",
"implementation": "./src/migrations/update-7.0.0/update-7.0.0"
}
}
}
10 changes: 8 additions & 2 deletions packages/e2e-runner/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nx-extend/e2e-runner",
"version": "6.2.1",
"version": "7.0.0",
"main": "src/index.js",
"generators": "./generators.json",
"executors": "./executors.json",
Expand All @@ -12,5 +12,11 @@
"type": "git",
"url": "git+https://github.com/tripss/nx-extend"
},
"license": "MIT"
"license": "MIT",
"nx-migrations": {
"migrations": "./migrations.json"
},
"dependencies": {
"@nx/devkit": "16.7.4"
}
}
Loading

0 comments on commit 36822b2

Please sign in to comment.