diff --git a/.eslintignore b/.eslintignore index b16c5b428..62f64cb7b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,6 +1,7 @@ src/generated/ +.github/ .dist/ dist/ node_modules/ tsd/ -webpack.config.ts +webpack.config.ts \ No newline at end of file diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 4f5a30ab4..5401070dd 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -19,7 +19,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-node@v2 with: - node-version: '12' + node-version: 16 - uses: bahmutov/npm-install@v1 - name: Run tests and generate coverage run: make test_unit_codecov @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-node@v2 with: - node-version: '12' + node-version: 16 - uses: bahmutov/npm-install@v1 - name: Run linter run: make lint @@ -54,7 +54,7 @@ jobs: release: name: Generate Release if: ${{ github.event_name != 'pull_request' }} - needs: [ unit_tests_with_coverage, lint_project, build_docker_image ] + needs: [unit_tests_with_coverage, lint_project, build_docker_image] runs-on: ubuntu-latest steps: - name: Checkout @@ -62,7 +62,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v1 with: - node-version: 12 + node-version: 16 - name: Install dependencies run: yarn install --frozen-lockfile - name: Release @@ -99,7 +99,7 @@ jobs: push_docker_image: name: Build & Push Flyteconsole Image - needs: [ check_for_tag ] + needs: [check_for_tag] uses: flyteorg/flytetools/.github/workflows/publish.yml@master with: version: ${{ needs.check_for_tag.outputs.currentTag }} diff --git a/.tool-versions b/.tool-versions index 2450f7312..8de7df9d7 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -nodejs 14.18.3 +nodejs 16.14.2 yarn 1.22.17 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index dddade56d..693a34687 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14 as builder +FROM node:16 as builder LABEL org.opencontainers.image.source https://github.com/lyft/flyteconsole WORKDIR /code/flyteconsole diff --git a/package.json b/package.json index d8376e0ca..2bc648bd4 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "@types/memoize-one": "^4.1.0", "@types/memory-fs": "^0.3.0", "@types/moment-timezone": "^0.5.13", - "@types/node": "^14.14.31", + "@types/node": "^14.18.12", "@types/object-hash": "^1.2.0", "@types/pure-render-decorator": "^0.2.27", "@types/react": "^16.9.34", diff --git a/tsconfig.json b/tsconfig.json index b822d25c5..0b9c46c84 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,7 @@ "experimentalDecorators": true, "importHelpers": true, "jsx": "react", - "lib": ["es2015", "es2017", "es2019", "dom", "dom.iterable"], + "lib": ["es6", "es2021", "dom", "dom.iterable"], "module": "commonjs", "moduleResolution": "node", "noFallthroughCasesInSwitch": true, diff --git a/yarn.lock b/yarn.lock index 193e8cfde..4d7664047 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4379,7 +4379,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.48.tgz#726e7f25d00bf58d79c8f00dd586dd9a10d06a4f" integrity sha512-Agl6xbYP6FOMDeAsr3QVZ+g7Yzg0uhPHWx0j5g4LFdUBHVtqtU+gH660k/lCEe506jJLOGbEzsnqPDTZGJQLag== -"@types/node@^14.0.10", "@types/node@^14.14.31": +"@types/node@^14.0.10", "@types/node@^14.18.12": version "14.18.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==