diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6ea060d0..ef9cc415 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -37,7 +37,7 @@ jobs: target: [ 'build', 'e2e' , 'test'] steps: - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: 20.x diff --git a/actions/set-shas/CHANGELOG.md b/actions/set-shas/CHANGELOG.md index 97b06474..a8ec4699 100644 --- a/actions/set-shas/CHANGELOG.md +++ b/actions/set-shas/CHANGELOG.md @@ -2,6 +2,15 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +## [0.1.1](https://github.com/TriPSs/nx-extend/compare/actions-set-shas-0.1.0...actions-set-shas-0.1.1) (2023-12-09) + + +### Bug Fixes + +* **set-shas:** Fixed incorrect base sha if no tags exist ([9086868](https://github.com/TriPSs/nx-extend/commit/9086868cfa99070a9c02f4d8c2c879be30ed9e6e)) + + + # 0.1.0 (2023-10-31) diff --git a/packages/e2e-runner/CHANGELOG.md b/packages/e2e-runner/CHANGELOG.md index 4e32b21e..56e141b7 100644 --- a/packages/e2e-runner/CHANGELOG.md +++ b/packages/e2e-runner/CHANGELOG.md @@ -2,6 +2,24 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +# [8.2.0](https://github.com/TriPSs/nx-extend/compare/e2e-runner@8.1.0...e2e-runner@8.2.0) (2023-12-20) + + +### Features + +* **e2e-runner:** enable or disable target logging via options ([662f22f](https://github.com/TriPSs/nx-extend/commit/662f22f13173bf13df8b9b655d0e7178dbd8f98a)), closes [#202](https://github.com/TriPSs/nx-extend/issues/202) + + + +# [8.1.0](https://github.com/TriPSs/nx-extend/compare/e2e-runner@8.0.1...e2e-runner@8.1.0) (2023-12-19) + + +### Features + +* **e2e-runner:** Support injecting env variables into `checkUrl` ([321e745](https://github.com/TriPSs/nx-extend/commit/321e7453da3b3b3ca9f4233359e0617a4cfb162c)), closes [#88](https://github.com/TriPSs/nx-extend/issues/88) + + + ## [8.0.1](https://github.com/TriPSs/nx-extend/compare/e2e-runner@8.0.0...e2e-runner@8.0.1) (2023-12-09) diff --git a/packages/e2e-runner/README.md b/packages/e2e-runner/README.md index 335e81e1..e9609245 100644 --- a/packages/e2e-runner/README.md +++ b/packages/e2e-runner/README.md @@ -34,6 +34,7 @@ Each target can be configured with the following options. env?: { [key: string]: string } // Extra parameters provided to the target on startup. reuseExistingServer?: boolean // Set to true to allow using a previously started target. rejectUnauthorized?: boolean // Set to false to allow the use of self-signed certificates in your target. + logging?: boolean // Set to true to forwards the logs of the target, set to false to hide the logs of the target. When undefined, the logs are only forwarded with the `--verbose` flag. } ``` @@ -56,7 +57,8 @@ Example target { "target": "api:serve", "checkUrl": "http://localhost:9000/health", - "checkMaxTries": 50 + "checkMaxTries": 50, + "logging": false } ] } diff --git a/packages/e2e-runner/package.json b/packages/e2e-runner/package.json index 87977eb5..7a6e0c54 100644 --- a/packages/e2e-runner/package.json +++ b/packages/e2e-runner/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/e2e-runner", - "version": "8.0.1", + "version": "8.2.0", "main": "src/index.js", "generators": "./generators.json", "executors": "./executors.json", diff --git a/packages/e2e-runner/src/executors/run/utils/nx-target.ts b/packages/e2e-runner/src/executors/run/utils/nx-target.ts index aca23e6e..096a5ee1 100644 --- a/packages/e2e-runner/src/executors/run/utils/nx-target.ts +++ b/packages/e2e-runner/src/executors/run/utils/nx-target.ts @@ -13,6 +13,7 @@ export interface NxTargetOptions { env?: { [key: string]: string } reuseExistingServer?: boolean rejectUnauthorized?: boolean + logging?: boolean } export class NxTarget { @@ -101,7 +102,8 @@ export class NxTarget { onExit: (code) => ( processExitedReject(new Error(`Target "${this.options.target}" was not able to start. Exit code: ${code}`)) ), - env: this.options.env + env: this.options.env, + logging: this.options.logging }) if (this.killed) { @@ -162,10 +164,13 @@ function launchProcess( options: { onExit: (exitCode: number | null, signal: string | null) => void env?: { [key: string]: string } + logging?: boolean } ): () => Promise { const { project, target, configuration } = parseTargetString(targetString, readCachedProjectGraph()) + const shouldLog = options.logging ?? USE_VERBOSE_LOGGING + const spawnedProcess = childProcess.spawn( `${getPackageManagerExecCommand()} nx ${target} ${project} ${ configuration ? `--configuration=${configuration}` : '' @@ -175,7 +180,7 @@ function launchProcess( detached: true, shell: true, cwd: process.cwd(), - stdio: USE_VERBOSE_LOGGING ? 'inherit' : undefined, + stdio: shouldLog ? 'inherit' : undefined, env: { ...process.env, // Make sure NODE_ENV is set to test diff --git a/packages/firebase-hosting/CHANGELOG.md b/packages/firebase-hosting/CHANGELOG.md index 19f1452c..e1a0a9eb 100644 --- a/packages/firebase-hosting/CHANGELOG.md +++ b/packages/firebase-hosting/CHANGELOG.md @@ -2,6 +2,10 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +## [6.0.4](https://github.com/TriPSs/nx-extend/compare/firebase-hosting@6.0.3...firebase-hosting@6.0.4) (2023-12-24) + + + ## [6.0.3](https://github.com/TriPSs/nx-extend/compare/firebase-hosting@6.0.2...firebase-hosting@6.0.3) (2023-12-09) diff --git a/packages/firebase-hosting/package.json b/packages/firebase-hosting/package.json index 488b975a..2ec831c0 100644 --- a/packages/firebase-hosting/package.json +++ b/packages/firebase-hosting/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/firebase-hosting", - "version": "6.0.3", + "version": "6.0.4", "homepage": "https://github.com/TriPSs/nx-extend/blob/master/packages/firebase-hosting/README.md", "bugs": { "url": "https://github.com/tripss/nx-extend/issues" diff --git a/packages/gcp-cloud-run/CHANGELOG.md b/packages/gcp-cloud-run/CHANGELOG.md index 68c85268..f7f0c4a0 100644 --- a/packages/gcp-cloud-run/CHANGELOG.md +++ b/packages/gcp-cloud-run/CHANGELOG.md @@ -2,6 +2,28 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +## [7.2.6](https://github.com/TriPSs/nx-extend/compare/gcp-cloud-run@7.2.5...gcp-cloud-run@7.2.6) (2024-01-07) + + + +## [7.2.5](https://github.com/TriPSs/nx-extend/compare/gcp-cloud-run@7.2.4...gcp-cloud-run@7.2.5) (2023-12-19) + + +### Bug Fixes + +* **gcp-cloud-run:** Fixed source directory undefined when generating repo info file ([f7f630c](https://github.com/TriPSs/nx-extend/commit/f7f630c49b3d035b54e24220e1f54f5595039894)) + + + +## [7.2.4](https://github.com/TriPSs/nx-extend/compare/gcp-cloud-run@7.2.3...gcp-cloud-run@7.2.4) (2023-12-10) + + +### Bug Fixes + +* **gcp-cloud-run:** No longer use `gcloud beta` when deploying with secrets ([a5b189e](https://github.com/TriPSs/nx-extend/commit/a5b189e3d9d5abf36d943388816f9798f97e4cb3)) + + + ## [7.2.3](https://github.com/TriPSs/nx-extend/compare/gcp-cloud-run@7.2.2...gcp-cloud-run@7.2.3) (2023-12-09) diff --git a/packages/gcp-cloud-run/README.md b/packages/gcp-cloud-run/README.md index 67bbf2a4..84efd43a 100644 --- a/packages/gcp-cloud-run/README.md +++ b/packages/gcp-cloud-run/README.md @@ -20,14 +20,27 @@ npm install -D @nx-extend/gcp-cloud-run #### Available options: -| name | type | default | description | -|------------------------------|-----------|------------------|------------------------------------------------------| -| **`--site`** | `string` | `null` | specify the site to deploy from the `.firebase.json` | -| **`--region`** | `string` | | region to deploy to | -| **`--project`** | `string` | | GCP project to deploy to | -| **`--name`** | `string` | `project.prefix` | name of the cloud run instance | -| **`--allowUnauthenticated`** | `boolean` | `true` | allow unauthenticated requests | -| **`--concurrency`** | `number` | 250 | amount of concurrent requests for instance | -| **`--maxInstances`** | `number` | 10 | maximum amount of instances | -| **`--minInstances`** | `number` | 0 | minimum amount of instances | - +| name | type | default | description | +|----------------------------------|----------------------|------------------|-------------------------------------------------------------------------| +| **`--region`** | `string` | - | Region to deploy cloud run revision to. +| **`--project`** | `string` | - | GCP project to deploy cloud run revision to. +| **`--name`** | `string` | `project name` | Name of the cloud run revision. +| **`--concurrency`** | `number` | 250 | Maximum number of concurrent requests allowed per container instance. +| **`--maxInstances`** | `number` | 10 | Maximum number of container instances to run. +| **`--minInstances`** | `number` | 0 | Minimum number of container instances to run. +| **`--allowUnauthenticated`** | `boolean` | `true` | Whether to allow unauthenticated requests to cloud run service. +| **`--envVars`** | `{[k: string]: string}` | - | Environment variables to load into cloud run instance's environment. +| **`--secrets`** | `string[]` | - | Secrets to load into cloud run instance's environment. +| **`--memory`** | `string` | `128Mi` | Amount of memory to reserve for cloud run instance. +| **`--cloudSqlInstance`** | `string` | - | Name of the cloud SQL instance to connect to run instance. +| **`--http2`** | `boolean` | `false` | Whether or not to enforce run instance to use HTTP/2 for all end-to-end connections. +| **`--serviceAccount`** | `string` | - | Service account email of another identity if not using compute engine's default service account. +| **`--buildWith`** | `string` | `artifact-registry` | Only accepts value `artifact-registry`. ***If provided***, deploy is ran with the `--source` options set to current app's directory. ***If not provided***, submits a build to Cloud Build, sourcing app's dist directory. Deploy is then ran using `--image`, which is given the location of the previous Cloud Build's built image. +| **`--logsDir`** | `string` | - | ***Note***: only relevant if not specifying `--buildWith`. Directory in GCS where to hold Cloud Build's build logs. +| **`--tagWithVersion`** | `string` | - | Whether or not to tag run service with a version. (**note**: sources version from package.json) +| **`--noTraffic`** | `boolean` | `false` | Set to true to ensure cloud run avoids sending traffic to the revision being deployed. +| **`--revisionSuffix`** | `boolean` | `false` | Set to append to deployed revision's name. +| **`--timeout`** | `number` | - | set the maximum request execution time. +| **`--cpu`** | `number` | - | set a CPU limit in Kubernetes cpu units. +| **`--cpuBoost`** | `boolean` | - | Whether to allocate extra CPU to containers on startup to reduce the perceived latency of a cold start request. +| **`--ingress`** | `string` | - | Set the ingress traffic sources allowed to call the service. diff --git a/packages/gcp-cloud-run/package.json b/packages/gcp-cloud-run/package.json index edbaaafb..d4790f0d 100644 --- a/packages/gcp-cloud-run/package.json +++ b/packages/gcp-cloud-run/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/gcp-cloud-run", - "version": "7.2.3", + "version": "7.2.6", "homepage": "https://github.com/TriPSs/nx-extend/blob/master/packages/gcp-cloud-run/README.md", "bugs": { "url": "https://github.com/tripss/nx-extend/issues" diff --git a/packages/gcp-cloud-run/src/executors/deploy/deploy.impl.ts b/packages/gcp-cloud-run/src/executors/deploy/deploy.impl.ts index d4e47fec..8ffaa8da 100644 --- a/packages/gcp-cloud-run/src/executors/deploy/deploy.impl.ts +++ b/packages/gcp-cloud-run/src/executors/deploy/deploy.impl.ts @@ -39,7 +39,6 @@ export async function deployExecutor( revisionSuffix = false, buildWith = 'artifact-registry', autoCreateArtifactsRepo = true, - generateRepoInfoFile = false, timeout = null, cpu, @@ -118,16 +117,6 @@ export async function deployExecutor( return { success: false } } - if (generateRepoInfoFile) { - logger.info('Generating repo info file') - - execCommand(buildCommand([ - 'gcloud debug source gen-repo-info-file', - `--source-directory=${sourceRoot || './'}`, - `--output-directory=${distDirectory}` - ])) - } - const deployCommand = buildCommand([ `gcloud run deploy ${name}`, !buildWithArtifactRegistry && `--image=${containerName}`, diff --git a/packages/gcp-cloud-run/src/executors/schema.d.ts b/packages/gcp-cloud-run/src/executors/schema.d.ts index c2075cd0..5ea03608 100644 --- a/packages/gcp-cloud-run/src/executors/schema.d.ts +++ b/packages/gcp-cloud-run/src/executors/schema.d.ts @@ -23,7 +23,6 @@ export interface ExecutorSchema { buildWith?: 'artifact-registry' autoCreateArtifactsRepo?: boolean noTraffic?: boolean - generateRepoInfoFile?: boolean timeout?: number cpu?: number cpuBoost?: boolean diff --git a/packages/gcp-functions/CHANGELOG.md b/packages/gcp-functions/CHANGELOG.md index cae4eada..455e764b 100644 --- a/packages/gcp-functions/CHANGELOG.md +++ b/packages/gcp-functions/CHANGELOG.md @@ -2,6 +2,28 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +## [11.1.3](https://github.com/TriPSs/nx-extend/compare/gcp-functions@11.1.2...gcp-functions@11.1.3) (2023-12-24) + + + +## [11.1.2](https://github.com/TriPSs/nx-extend/compare/gcp-functions@11.1.1...gcp-functions@11.1.2) (2023-12-10) + + +### Bug Fixes + +* **gcp-functions:** No longer use `gcloud beta` when deploying with secrets ([5ffdeaf](https://github.com/TriPSs/nx-extend/commit/5ffdeaf48a44485fc19fd3f23a3154ceac258b3f)) + + + +## [11.1.1](https://github.com/TriPSs/nx-extend/compare/gcp-functions@11.1.0...gcp-functions@11.1.1) (2023-12-09) + + +### Bug Fixes + +* **gcp-functions:** Fixed schema still having `gen` default set to `1` ([2f753b8](https://github.com/TriPSs/nx-extend/commit/2f753b84f22451eb23e507607d26a29484a10f41)) + + + # [11.1.0](https://github.com/TriPSs/nx-extend/compare/gcp-functions@11.0.0...gcp-functions@11.1.0) (2023-12-09) diff --git a/packages/gcp-functions/package.json b/packages/gcp-functions/package.json index 89ecbd26..e78bccab 100644 --- a/packages/gcp-functions/package.json +++ b/packages/gcp-functions/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/gcp-functions", - "version": "11.1.0", + "version": "11.1.3", "homepage": "https://github.com/TriPSs/nx-extend/blob/master/packages/gcp-functions/README.md", "bugs": { "url": "https://github.com/tripss/nx-extend/issues" diff --git a/packages/gcp-secrets/CHANGELOG.md b/packages/gcp-secrets/CHANGELOG.md index 8571ec6c..0562fc4d 100644 --- a/packages/gcp-secrets/CHANGELOG.md +++ b/packages/gcp-secrets/CHANGELOG.md @@ -2,6 +2,15 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +## [7.0.3](https://github.com/TriPSs/nx-extend/compare/gcp-secrets@7.0.2...gcp-secrets@7.0.3) (2023-12-24) + + +### Bug Fixes + +* **gcp-secrets:** Don't try to destroy/disable secret versions that do not exist ([7b635e8](https://github.com/TriPSs/nx-extend/commit/7b635e8052bb4828f368f70d65d51897ef025cbe)) + + + ## [7.0.2](https://github.com/TriPSs/nx-extend/compare/gcp-secrets@7.0.1...gcp-secrets@7.0.2) (2023-12-09) diff --git a/packages/gcp-secrets/package.json b/packages/gcp-secrets/package.json index 2840f558..bfb67080 100644 --- a/packages/gcp-secrets/package.json +++ b/packages/gcp-secrets/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/gcp-secrets", - "version": "7.0.2", + "version": "7.0.3", "homepage": "https://github.com/TriPSs/nx-extend/blob/master/packages/gcp-secrets/README.md", "bugs": { "url": "https://github.com/tripss/nx-extend/issues" diff --git a/packages/gcp-storage/CHANGELOG.md b/packages/gcp-storage/CHANGELOG.md index 9ce8ee9a..c7dae58b 100644 --- a/packages/gcp-storage/CHANGELOG.md +++ b/packages/gcp-storage/CHANGELOG.md @@ -2,6 +2,20 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +# [6.0.0](https://github.com/TriPSs/nx-extend/compare/gcp-storage@5.0.1...gcp-storage@6.0.0) (2023-12-29) + + +### Features + +* **gcp-storage:** Use `directory` option as definition on what to upload ([402d282](https://github.com/TriPSs/nx-extend/commit/402d2828caa25358b32fc9532d9babff159c917c)) + + +### BREAKING CHANGES + +* **gcp-storage:** `directory` is now required and needs to be the full path to the directory + + + ## [5.0.1](https://github.com/TriPSs/nx-extend/compare/gcp-storage@5.0.0...gcp-storage@5.0.1) (2023-12-09) diff --git a/packages/gcp-storage/package.json b/packages/gcp-storage/package.json index 47f2f1b0..2e350d1c 100644 --- a/packages/gcp-storage/package.json +++ b/packages/gcp-storage/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/gcp-storage", - "version": "5.0.1", + "version": "6.0.0", "keywords": [ "nx", "google cloud platform", diff --git a/packages/react-email/CHANGELOG.md b/packages/react-email/CHANGELOG.md new file mode 100644 index 00000000..b181c30d --- /dev/null +++ b/packages/react-email/CHANGELOG.md @@ -0,0 +1,14 @@ +# Changelog + +This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). + +# [0.1.0](https://github.com/TriPSs/nx-extend/compare/react-email@0.0.1...react-email@0.1.0) (2023-12-19) + + +### Features + +* **react-email:** Added react email package ([e5e64c8](https://github.com/TriPSs/nx-extend/commit/e5e64c8ce600176b5d40b6c5e6f11affb8349169)) + + + +## 0.0.1 (2023-12-19) diff --git a/packages/react-email/package.json b/packages/react-email/package.json index 22e94138..dc5ccc50 100644 --- a/packages/react-email/package.json +++ b/packages/react-email/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/react-email", - "version": "0.0.1", + "version": "0.1.0", "keywords": [ "nx", "react-email" diff --git a/packages/shadcn-ui/CHANGELOG.md b/packages/shadcn-ui/CHANGELOG.md new file mode 100644 index 00000000..667769b4 --- /dev/null +++ b/packages/shadcn-ui/CHANGELOG.md @@ -0,0 +1,21 @@ +# Changelog + +This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). + +## [0.1.1](https://github.com/TriPSs/nx-extend/compare/shadcn-ui@0.1.0...shadcn-ui@0.1.1) (2024-01-18) + + +### Bug Fixes + +* **shadcn-ui:** Create react libs instead of node ([b9922b3](https://github.com/TriPSs/nx-extend/commit/b9922b32fc69c38485424390a2b8cc4fbb38062a)) +* **shadcn-ui:** Fixed tailwind config missing require ([e284cdf](https://github.com/TriPSs/nx-extend/commit/e284cdf248c64890d012c49e1ea3d6494902bdc4)) + + + +# 0.1.0 (2024-01-18) + + +### Features + +* **shadcn-ui:** Added `add` executor to add new components ([eac038e](https://github.com/TriPSs/nx-extend/commit/eac038e97a673493a249a6c2a5d639f54d816453)) +* **shadcn-ui:** Added package ([954889d](https://github.com/TriPSs/nx-extend/commit/954889dff1b7b618a002b6f38ba62f8254806232)) diff --git a/packages/shadcn-ui/package.json b/packages/shadcn-ui/package.json index 5634ad43..ff29fc06 100644 --- a/packages/shadcn-ui/package.json +++ b/packages/shadcn-ui/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/shadcn-ui", - "version": "0.0.1", + "version": "0.1.1", "keywords": [ "nx", "shadcn-ui" diff --git a/packages/strapi/CHANGELOG.md b/packages/strapi/CHANGELOG.md index 4296977e..7af46300 100644 --- a/packages/strapi/CHANGELOG.md +++ b/packages/strapi/CHANGELOG.md @@ -2,6 +2,19 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +## [8.0.6](https://github.com/TriPSs/nx-extend/compare/strapi@8.0.5...strapi@8.0.6) (2023-12-24) + + + +## [8.0.5](https://github.com/TriPSs/nx-extend/compare/strapi@8.0.4...strapi@8.0.5) (2023-12-13) + + +### Bug Fixes + +* **strapi:** Use cached project graph for `withNx` ([afc270f](https://github.com/TriPSs/nx-extend/commit/afc270f515a5a2897d28ec257b050bfb3358b2fa)) + + + ## [8.0.4](https://github.com/TriPSs/nx-extend/compare/strapi@8.0.3...strapi@8.0.4) (2023-12-09) diff --git a/packages/strapi/package.json b/packages/strapi/package.json index 96893059..4753111b 100644 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/strapi", - "version": "8.0.4", + "version": "8.0.6", "keywords": [ "nx", "strapi" diff --git a/packages/terraform/CHANGELOG.md b/packages/terraform/CHANGELOG.md index e0081cd0..3f2540a8 100644 --- a/packages/terraform/CHANGELOG.md +++ b/packages/terraform/CHANGELOG.md @@ -2,6 +2,24 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +# [4.2.0](https://github.com/TriPSs/nx-extend/compare/terraform@4.1.0...terraform@4.2.0) (2023-12-15) + + +### Features + +* Added lock option to providers target. ([5c839fd](https://github.com/TriPSs/nx-extend/commit/5c839fdeef0fed92b46654a14755ea6f12842be7)) + + + +# [4.1.0](https://github.com/TriPSs/nx-extend/compare/terraform@4.0.4...terraform@4.1.0) (2023-12-15) + + +### Features + +* Added init options -upgrade and -migrate-state to init target. ([dabe05a](https://github.com/TriPSs/nx-extend/commit/dabe05a7d9ff0095e447d51896347e2c8f46e917)) + + + ## [4.0.4](https://github.com/TriPSs/nx-extend/compare/terraform@4.0.3...terraform@4.0.4) (2023-12-09) diff --git a/packages/terraform/package.json b/packages/terraform/package.json index 09740a61..ae172dd6 100644 --- a/packages/terraform/package.json +++ b/packages/terraform/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/terraform", - "version": "4.0.4", + "version": "4.2.0", "keywords": [ "nx", "terraform" diff --git a/packages/terraform/src/executors/fmt/schema.json b/packages/terraform/src/executors/fmt/schema.json index 703518d9..9d890e2d 100644 --- a/packages/terraform/src/executors/fmt/schema.json +++ b/packages/terraform/src/executors/fmt/schema.json @@ -6,7 +6,7 @@ "title": "Format executor", "description": "Format", "properties": { - "write": { + "formatWrite": { "type": "boolean", "title": "Write to file", "description": "Write to file", diff --git a/packages/terraform/src/executors/init/schema.json b/packages/terraform/src/executors/init/schema.json index 0868826b..297e00b0 100644 --- a/packages/terraform/src/executors/init/schema.json +++ b/packages/terraform/src/executors/init/schema.json @@ -3,7 +3,20 @@ "outputCapture": "direct-nodejs", "$schema": "http://json-schema.org/schema", "type": "object", - "title": "Plan executor", - "description": "Plan", - "properties": {} + "title": "Init executor", + "description": "Init", + "properties": { + "upgrade": { + "type": "boolean", + "title": "Install the latest module and provider versions.", + "description": "Install the latest module and provider versions allowed within configured constraints, overriding the default behavior of selecting exactly the version recorded in the dependency lockfile.", + "default": false + }, + "migrate-state": { + "type": "boolean", + "title": "Reconfigure a backend, and attempt to migrate any existing state.", + "description": "Reconfigure a backend, and attempt to migrate any existing state.", + "default": false + } + } } diff --git a/packages/terraform/src/executors/providers/schema.json b/packages/terraform/src/executors/providers/schema.json index d7db0f35..4a4e72e4 100644 --- a/packages/terraform/src/executors/providers/schema.json +++ b/packages/terraform/src/executors/providers/schema.json @@ -5,5 +5,12 @@ "type": "object", "title": "Providers executor", "description": "Providers", - "properties": {} + "properties": { + "lock": { + "type": "boolean", + "title": "Write out dependency locks for the configured providers.", + "description": "Write out dependency locks for the configured providers.", + "default": false + } + } } diff --git a/packages/terraform/src/generators/init/init.impl.ts b/packages/terraform/src/generators/init/init.impl.ts index df1ee776..9f5e34b4 100644 --- a/packages/terraform/src/generators/init/init.impl.ts +++ b/packages/terraform/src/generators/init/init.impl.ts @@ -49,19 +49,23 @@ export default async function ( initialize: { executor: '@nx-extend/terraform:init', options: { - ciMode: true + ciMode: true, + upgrade: false, + migrateState: false } }, providers: { executor: '@nx-extend/terraform:providers', options: { - ciMode: true + ciMode: true, + lock: true } }, fmt: { executor: '@nx-extend/terraform:fmt', options: { - ciMode: true + ciMode: true, + formatWrite: false } }, apply: { diff --git a/packages/terraform/src/utils/create-executor.ts b/packages/terraform/src/utils/create-executor.ts index 3dee4926..139c4a1b 100644 --- a/packages/terraform/src/utils/create-executor.ts +++ b/packages/terraform/src/utils/create-executor.ts @@ -8,6 +8,10 @@ export interface ExecutorOptions { autoApproval: boolean planFile: string ciMode: boolean + formatWrite: boolean + upgrade: boolean + migrateState: boolean + lock: boolean [key: string]: string | unknown } @@ -22,7 +26,7 @@ export function createExecutor(command: string) { } const { sourceRoot } = context.workspace.projects[context.projectName] - const { backendConfig = [], planFile, ciMode, autoApproval, formatWrite } = options + const { backendConfig = [], planFile, ciMode, autoApproval, formatWrite, upgrade, migrateState, lock } = options let env = {} if (ciMode) { @@ -45,7 +49,9 @@ export function createExecutor(command: string) { command === 'apply' && planFile, command === 'fmt' && '--recursive', command === 'fmt' && !formatWrite && '--check --list', - command === 'fmt' && formatWrite && '--write --diff' + command === 'init' && upgrade && '-upgrade', + command === 'init' && migrateState && '-migrate-state', + command === 'providers' && lock && 'lock', ]), { cwd: sourceRoot, diff --git a/packages/vercel/CHANGELOG.md b/packages/vercel/CHANGELOG.md index 69b4ace2..4bd94044 100644 --- a/packages/vercel/CHANGELOG.md +++ b/packages/vercel/CHANGELOG.md @@ -2,6 +2,15 @@ This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver). +## [6.0.4](https://github.com/TriPSs/nx-extend/compare/vercel@6.0.3...vercel@6.0.4) (2024-01-18) + + +### Bug Fixes + +* **vercel:** Added `remix` as framework option ([2aebc32](https://github.com/TriPSs/nx-extend/commit/2aebc32c2b44988f0a64cb51d7a7fc9d9dcc8ef6)) + + + ## [6.0.3](https://github.com/TriPSs/nx-extend/compare/vercel@6.0.2...vercel@6.0.3) (2023-12-09) diff --git a/packages/vercel/package.json b/packages/vercel/package.json index 44859cd7..16b9ebbf 100644 --- a/packages/vercel/package.json +++ b/packages/vercel/package.json @@ -1,6 +1,6 @@ { "name": "@nx-extend/vercel", - "version": "6.0.3", + "version": "6.0.4", "keywords": [ "nx", "vercel" diff --git a/yarn.lock b/yarn.lock index 912c4a11..c6fc0ef0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14355,27 +14355,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.0": - version: 1.15.2 - resolution: "follow-redirects@npm:1.15.2" - peerDependenciesMeta: - debug: - optional: true - checksum: 8be0d39919770054812537d376850ccde0b4762b0501c440bd08724971a078123b55f57704f2984e0664fecc0c86adea85add63295804d9dce401cd9604c91d3 - languageName: node - linkType: hard - -"follow-redirects@npm:^1.15.2": - version: 1.15.3 - resolution: "follow-redirects@npm:1.15.3" - peerDependenciesMeta: - debug: - optional: true - checksum: 60d98693f4976892f8c654b16ef6d1803887a951898857ab0cdc009570b1c06314ad499505b7a040ac5b98144939f8597766e5e6a6859c0945d157b473aa6f5f - languageName: node - linkType: hard - -"follow-redirects@npm:^1.15.4": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.0, follow-redirects@npm:^1.15.2, follow-redirects@npm:^1.15.4": version: 1.15.5 resolution: "follow-redirects@npm:1.15.5" peerDependenciesMeta: