Skip to content

Commit

Permalink
Merge branch 'vite_ESM_upgrade' of https://github.com/ShivamMadlani/j…
Browse files Browse the repository at this point in the history
…aeger-ui into vite_ESM_upgrade
  • Loading branch information
ShivamMadlani committed Nov 23, 2023
2 parents d774447 + 4c18c4b commit ab5dc75
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 2,746 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ npm-debug.log
.vscode
.idea
yarn-error.log
lerna-debug.log
.eslintcache
.vscode

Expand Down
6 changes: 1 addition & 5 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ In `./packages/plexus`, `typescript` is used to generate type declarations for t

#### `build`

`lerna run build` executes the build in each of `./packages/*` sub-packages.
`yarn build` executes the build in each of `./packages/*` sub-packages.

#### `eslint`

Expand Down Expand Up @@ -81,10 +81,6 @@ CodeCov is integrated into the unit tests workflow to report coverage data from

[`yarn install --frozen-lockfile`](https://yarnpkg.com/lang/en/docs/cli/install/#toc-yarn-install-frozen-lockfile) ensures installs in CI fail if they would typically mutate the lockfile.

## `lerna.json`

We should probably audit our use of `lerna` to make sure a) it's necessary and b) it's idiomatic if it is necessary. We have ended up relying quite a bit on `yarn` workspaces, which has reduced the relevance of `lerna`. ([Ticket](https://github.com/jaegertracing/jaeger-ui/issues/341))

## `tsconfig.json`

Used to configure the `tsc-lint` script and, in theory, the IDE (such as VS Code).
Expand Down
6 changes: 0 additions & 6 deletions lerna.json

This file was deleted.

15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"devDependencies": {
"@babel/eslint-parser": "^7.19.1",
"@typescript-eslint/eslint-plugin": "6.11.0",
"@typescript-eslint/parser": "6.11.0",
"@typescript-eslint/eslint-plugin": "6.12.0",
"@typescript-eslint/parser": "6.12.0",
"eslint": "8.54.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "9.0.0",
Expand All @@ -19,11 +19,10 @@
"eslint-plugin-react": "7.33.2",
"husky": "8.0.3",
"jsdom": "22.1.0",
"lerna": "7.4.2",
"npm-run-all": "4.1.5",
"prettier": "3.1.0",
"rxjs-compat": "6.6.7",
"typescript": "5.2.2"
"typescript": "5.3.2"
},
"resolutions": {
"**/lodash": "^4.17.21"
Expand All @@ -37,17 +36,17 @@
]
},
"scripts": {
"build": "lerna run build",
"build": "yarn workspaces run build",
"check-license": "./scripts/check-license.sh",
"coverage": "lerna run coverage",
"coverage": "yarn workspaces run coverage",
"depcheck": "./scripts/run-depcheck.sh",
"eslint": "eslint --cache 'scripts/*.{js,jsx,ts,tsx}' 'packages/*/src/**/*.{js,jsx,ts,tsx}' 'packages/*/*.{js,jsx,ts,tsx}'",
"fmt": "yarn prettier",
"lint": "npm-run-all -ln --parallel prettier-lint tsc-lint eslint check-license",
"prepare": "lerna run --stream --sort prepublishOnly",
"prepare": "yarn workspace @jaegertracing/plexus prepublishOnly",
"prettier": "prettier --write '{.,scripts}/*.{js,jsx,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx}'",
"prettier-lint": "prettier --list-different '{.,scripts}/*.{js,jsx,json,md,ts,tsx}' 'packages/*/{src,demo/src}/**/!(layout.worker.bundled|react-vis).{css,js,jsx,json,md,ts,tsx}' 'packages/*/*.{css,js,jsx,json,md,ts,tsx}' || (echo '*** PLEASE RUN yarn prettier AND RESUBMIT ***' && false)",
"test": "lerna run test",
"test": "yarn workspaces run test",
"tsc-lint": "tsc --build",
"tsc-lint-debug": "tsc --listFiles",
"start": "cd packages/jaeger-ui && yarn start"
Expand Down
2 changes: 1 addition & 1 deletion packages/plexus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"directory": "packages/plexus"
},
"devDependencies": {
"@babel/cli": "7.23.0",
"@babel/cli": "7.23.4",
"@babel/core": "7.23.3",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
Expand Down
Loading

0 comments on commit ab5dc75

Please sign in to comment.