Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/follow-r…

…edirects-1.15.5' into improvements-v2

.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
 

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)
 
 

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/[email protected]@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/[email protected]@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/[email protected]@8.0.1) (2023-12-09)
 
 

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
         }
       ]
     }

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",

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<void> {
   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

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/[email protected]@6.0.4) (2023-12-24)
+
+
+
 ## [6.0.3](https://github.com/TriPSs/nx-extend/compare/[email protected]@6.0.3) (2023-12-09)
 
 

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"

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/[email protected]@7.2.6) (2024-01-07)
+
+
+
+## [7.2.5](https://github.com/TriPSs/nx-extend/compare/[email protected]@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/[email protected]@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/[email protected]@7.2.3) (2023-12-09)
 
 

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.

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"

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}`,

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

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/[email protected]@11.1.3) (2023-12-24)
+
+
+
+## [11.1.2](https://github.com/TriPSs/nx-extend/compare/[email protected]@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/[email protected]@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/[email protected]@11.1.0) (2023-12-09)
 
 

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"

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/[email protected]@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/[email protected]@7.0.2) (2023-12-09)
 
 

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"

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/[email protected]@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/[email protected]@5.0.1) (2023-12-09)
 
 

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",

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/[email protected]@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)

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"

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/[email protected]@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))

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"