Skip to content

Commit

Permalink
TS-35007 Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
DreierF committed Jul 13, 2023
1 parent 6f07ce3 commit 859e607
Show file tree
Hide file tree
Showing 30 changed files with 1,931 additions and 15,161 deletions.
49 changes: 40 additions & 9 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,50 @@
{
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "./tsconfig.json"
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended-type-checked",
"plugin:@typescript-eslint/stylistic-type-checked",
"plugin:workspaces/recommended",
"standard",
"prettier",
"plugin:@typescript-eslint/recommended"
"prettier"
],
"root": true,
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": [
"./packages/*/tsconfig.json",
"./packages/teamscale-javascript-instrumenter/tsconfig.vaccine.json"
]
},
"plugins": [
"@typescript-eslint",
"workspaces"
],
"plugins": ["@typescript-eslint", "workspaces"],
"env": {
"es6": true,
"node": true
},
"ignorePatterns": ["dist", "lib", "node_modules", "examples", "scripts", "test"]
"ignorePatterns": [
"dist",
"lib",
"node_modules",
"examples",
"scripts",
"test"
],
"rules": {
// All of those would probably make sense, but needs to be enabled and fixed one by one
"@typescript-eslint/consistent-type-definitions": "off",
"@typescript-eslint/no-unsafe-assignment": "off",
"@typescript-eslint/no-unsafe-argument": "off",
"@typescript-eslint/no-unsafe-call": "off",
"@typescript-eslint/prefer-nullish-coalescing": "off",
"@typescript-eslint/unbound-method": "off",
"@typescript-eslint/restrict-template-expressions": "off",
"@typescript-eslint/array-type": "off",
"@typescript-eslint/consistent-generic-constructors": "off",
"@typescript-eslint/require-await": "off",
"@typescript-eslint/no-misused-promises": "off",
"@typescript-eslint/restrict-plus-operands": "off",
"@typescript-eslint/consistent-indexed-object-style": "off",
"@typescript-eslint/no-unsafe-member-access": "off"
}
}
79 changes: 66 additions & 13 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
on:
push:
branches: '*'
tags: 'v*'
pull_request:
branches: '*'

Expand All @@ -21,41 +22,40 @@ jobs:
name: Install pnpm
id: pnpm-install
with:
version: 7
version: 8
run_install: false

- name: Get pnpm store directory
id: pnpm-cache
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
name: Setup pnpm cache
with:
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
key: pnpm-store-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- uses: actions/cache@v3
name: Setup Cypress cache
with:
path: ~/.cache/Cypress
key: cypress-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
- name: Install dependencies
run: pnpm install
- name: Install, build, and test the Commons Library
run: pnpm install --frozen-lockfile
- name: Build and test the Commons Library
working-directory: ./packages/cqse-commons
run: |
pnpm install
pnpm build
pnpm test
- name: Install, build, and test the Instrumenter
- name: Build and test the Instrumenter
working-directory: ./packages/teamscale-javascript-instrumenter
run: |
pnpm install
pnpm build
pnpm test
- name: Install, build, and test the Collector
- name: Build and test the Collector
working-directory: ./packages/teamscale-coverage-collector
run: |
pnpm install
pnpm build
pnpm test
- name: Set up Python
Expand All @@ -66,5 +66,58 @@ jobs:
uses: GabrielBB/xvfb-action@v1
with:
run: pnpm systemtest
- run: echo "Done."
- name: Publish the Commons Library
if: startsWith(github.ref, 'refs/tags/v')
working-directory: ./packages/cqse-commons
run: |
npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
npm publish --ignore-scripts
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Publish the Collector
if: startsWith(github.ref, 'refs/tags/v')
working-directory: ./packages/teamscale-coverage-collector
run: |
npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
npm publish --ignore-scripts
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Publish the Instrumenter
if: startsWith(github.ref, 'refs/tags/v')
working-directory: ./packages/teamscale-javascript-instrumenter
run: |
npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
npm publish --ignore-scripts
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

docker:
name: Release the Docker Image
runs-on: ubuntu-latest
steps:
- name: Check out the code
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: cqse/teamscale-coverage-collector
- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- run: ls
- name: Build and push
uses: docker/build-push-action@v4
with:
context: ./packages/teamscale-coverage-collector
file: ./packages/teamscale-coverage-collector/Dockerfile
push: ${{ startsWith(github.ref, 'refs/tags/v') }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
99 changes: 0 additions & 99 deletions .github/workflows/release.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .idea/teamscale-javascript-profiler.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 28 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,38 @@
"build": "pnpm -r --filter='./packages/*' run build",
"test": "pnpm -r --filter='./packages/*' run test",
"systemtest": "pnpm build && node ./test/systemtest.mjs",
"lint": "pnpm run eslint . --ext .ts"
"lint": "pnpm exec eslint . --ext .ts"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^4.31.1",
"@typescript-eslint/parser": "^4.31.1",
"cypress": "^12.8.1",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.24.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"cypress": "^12.17.1",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-promise": "^5.1.0",
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-workspaces": "^0.6.2",
"http-server": "^14.1.0",
"local-web-server": "^5.1.1",
"mkdirp": "^1.0.4",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-workspaces": "^0.9.0",
"http-server": "^14.1.1",
"local-web-server": "^5.3.0",
"mkdirp": "^3.0.1",
"mock-http-server": "^1.4.5",
"prettier": "^2.7.1",
"tempfile": "^4.0.0",
"prettier": "^3.0.0",
"tempfile": "^5.0.0",
"tree-kill": "^1.2.2",
"typescript": "^4.4.3"
"typescript": "^5.1.6"
},
"pnpm": {
"overrides": {
"@types/istanbul-lib-instrument>source-map": "0.7.4",
"@babel/traverse>@babel/types": "7.22.5",
"@babel/parser>@babel/types": "7.22.5",
"@types/babel__traverse>@babel/types": "7.22.5"
},
"patchedDependencies": {
"mockttp@3.7.6": "patches/mockttp@3.7.6.patch"
}
}
}
20 changes: 10 additions & 10 deletions packages/cqse-commons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
"typescript-optional": "^2.0.1"
},
"devDependencies": {
"@babel/core": "^7.21.8",
"@babel/preset-env": "^7.21.5",
"@types/jest": "^29.5.1",
"@types/node": "^15.0.1",
"babel-jest": "^29.5.0",
"jest": "^29.5.0",
"rimraf": "^3.0.2",
"ts-jest": "^29.1.0",
"ts-node": "^10.2.1",
"typescript": "^4.4.3"
"@babel/core": "^7.22.8",
"@babel/preset-env": "^7.22.7",
"@types/jest": "^29.5.3",
"@types/node": "^20.4.1",
"babel-jest": "^29.6.1",
"jest": "^29.6.1",
"rimraf": "^5.0.1",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"typescript": "^5.1.6"
},
"publishConfig": {
"access": "public"
Expand Down
7 changes: 6 additions & 1 deletion packages/teamscale-coverage-collector/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,10 @@ module.exports = {
collectCoverage: true,

// The glob patterns Jest uses to detect test files.
testMatch: ['**/test/**/*.test.ts']
testMatch: ['**/test/**/*.test.ts'],

moduleNameMapper: {
// Force module uuid to resolve with the CJS entry point, because Jest does not support package.json.exports. See https://github.com/uuidjs/uuid/issues/451
uuid: require.resolve('uuid')
}
};
Loading

0 comments on commit 859e607

Please sign in to comment.