From 6939583422eb7b95cf025643682050737c7fd6d7 Mon Sep 17 00:00:00 2001 From: Jaya Krishna Date: Fri, 22 Sep 2023 14:30:37 +0530 Subject: [PATCH 1/3] (chore): Update to node 18 --- package.json | 3 ++- yarn.lock | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8ed6cd3aa..4ef212119 100755 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ } }, "engines": { - "node": "16.x" + "node": ">=18.x" }, "repository": { "type": "git", @@ -57,6 +57,7 @@ "jest": "^26.6.3", "lerna": "^5.3.0", "lerna-changelog": "^2.2.0", + "prettier": "^3.0.3", "pretty-quick": "^3.1.0", "rimraf": "^3.0.0", "ts-jest": "^26.5.6", diff --git a/yarn.lock b/yarn.lock index 372b89d3c..b9a3f1f74 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9153,6 +9153,11 @@ prettier@^2.3.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== +prettier@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" + integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== + pretty-error@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" From e7d9ac9acd6b18009746bfbe7093cb18b0c21695 Mon Sep 17 00:00:00 2001 From: Jaya Krishna Date: Fri, 22 Sep 2023 14:35:24 +0530 Subject: [PATCH 2/3] Update node version to 18 --- package.json | 2 +- .../src/project-template.ts | 3 +++ yarn.lock | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4ef212119..a656b05e6 100755 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "jest": "^26.6.3", "lerna": "^5.3.0", "lerna-changelog": "^2.2.0", - "prettier": "^3.0.3", + "prettier": "2.3.1", "pretty-quick": "^3.1.0", "rimraf": "^3.0.0", "ts-jest": "^26.5.6", diff --git a/packages/teleport-project-generator-next/src/project-template.ts b/packages/teleport-project-generator-next/src/project-template.ts index cc4c17a33..e4918b948 100644 --- a/packages/teleport-project-generator-next/src/project-template.ts +++ b/packages/teleport-project-generator-next/src/project-template.ts @@ -21,6 +21,9 @@ export default { "next": "^12.1.0", "react": "^17.0.2", "react-dom": "^17.0.2" + }, + "engines": { + "node": ">=18.x" } }`, fileType: 'json', diff --git a/yarn.lock b/yarn.lock index b9a3f1f74..121d86a97 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9148,16 +9148,16 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= +prettier@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6" + integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA== + prettier@^2.3.1: version "2.5.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== -prettier@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" - integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== - pretty-error@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" From 4d140194bc143595bde54c19722ba830497555cc Mon Sep 17 00:00:00 2001 From: Jaya Krishna Date: Fri, 22 Sep 2023 14:37:46 +0530 Subject: [PATCH 3/3] update node version is CI --- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 74e61dc4f..9038802f8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-node@v2 with: - node-version: "16.x" + node-version: "18.x" - run: yarn - run: yarn run lint diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e14e11b9..16b9d11c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,8 +1,8 @@ name: CI for PR -on: +on: push: - branches: + branches: - '**' - '!development' @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: - node-version: "16.x" + node-version: "18.x" - run: yarn - run: yarn run lint - run: yarn run build