Skip to content

Commit

Permalink
Chore/update dependencies (#560)
Browse files Browse the repository at this point in the history
* chore: update dependencies

* chore: remove npm-run-all dependency

* chore: update dependencies

* refactor: run prettier

* chore: update dependencies

* chore: update node version in ci

* chore: update typescript dep
  • Loading branch information
clementdessoude committed Nov 26, 2022
1 parent a36b2cc commit a331886
Show file tree
Hide file tree
Showing 6 changed files with 3,176 additions and 3,388 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
strategy:
matrix:
node_version:
- 12.x
- 14.x
- 16.x
- 18.x
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand Down
25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"scripts": {
"lerna:version": "lerna version --exact --git-remote upstream",
"lerna:publish": "lerna publish from-git --yes",
"ci": "npm-run-all build lint format:validate test",
"ci": "yarn build && yarn lint && yarn format:validate && yarn test",
"ci:all": "yarn run ci && yarn run test:prettier-plugin-java test:e2e-jhipster1 && yarn run test:prettier-plugin-java test:e2e-jhipster2",
"test": "lerna run test --stream",
"test:prettier-plugin-java": "lerna --stream --scope=prettier-plugin-java run",
"lint": "eslint packages/**/*.js",
"format:fix": "prettier --write \"**/*.@(js|json|md)\"",
"format:validate": "prettier --list-different \"**/*.@(js|json|md)\"",
"format:fix": "prettier --write \"**/*.@(js|json|md|ts)\"",
"format:validate": "prettier --list-different \"**/*.@(js|json|md|ts)\"",
"build": "yarn build:prettier-plugin-java && node packages/java-parser/scripts/unicode.js packages/java-parser/resources/Unicode/UnicodeData.txt && prettier --write packages/java-parser/src/unicodesets.js && node packages/java-parser/scripts/gen-diagrams.js",
"build:prettier-plugin-java": "cd packages/prettier-plugin-java && yarn build && cd ../..",
"prettier": "prettier --plugin=./packages/prettier-plugin-java --parser=java",
Expand All @@ -30,19 +30,18 @@
},
"devDependencies": {
"benchmark": "^2.1.4",
"chai": "^4.3.4",
"eslint": "7.28.0",
"chai": "^4.3.7",
"eslint": "8.28.0",
"eslint-config-google": "0.14.0",
"eslint-config-prettier": "8.3.0",
"fs-extra": "^10.0.0",
"husky": "4.3.0",
"eslint-config-prettier": "8.5.0",
"fs-extra": "^10.1.0",
"husky": "8.0.2",
"klaw-sync": "^6.0.0",
"lerna": "4.0.0",
"lint-staged": "11.0.0",
"mocha": "^9.0.0",
"npm-run-all": "^4.1.5",
"lerna": "6.0.3",
"lint-staged": "13.0.4",
"mocha": "^10.1.0",
"nyc": "^15.1.0",
"prettier": "2.3.1",
"prettier": "2.8.0",
"sinon": "^9.2.1"
}
}
2 changes: 1 addition & 1 deletion packages/java-parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"lodash": "4.17.21"
},
"scripts": {
"test": "npm-run-all clone-samples test:execute",
"test": "yarn run clone-samples && yarn run test:execute",
"test:execute": "mocha \"test/**/*-spec.js\"",
"clone-samples": "node ./scripts/clone-samples"
}
Expand Down
32 changes: 16 additions & 16 deletions packages/prettier-plugin-java/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,32 @@
"prettier": "2.3.1"
},
"scripts": {
"test": "npm-run-all test:unit test:e2e-core",
"test": "yarn run test:unit && yarn run test:e2e-core",
"test:unit": "mocha \"test/unit-test/**/*.spec.ts\" \"test/unit-test/**/*-spec.ts\"",
"test:e2e-core": "node scripts/clone-samples e2e-core && mocha \"test/repository-test/core-test.ts\"",
"test:e2e-jhipster1": "node scripts/clone-samples e2e-jhipster1 && mocha \"test/repository-test/jhipster-1-test.ts\"",
"test:e2e-jhipster2": "node scripts/clone-samples e2e-jhipster2 && mocha \"test/repository-test/jhipster-2-test.ts\"",
"test:all": "npm-run-all test test:e2e-jhipster1 test:e2e-jhipster2",
"test:all": "yarn run test && yarn run test:e2e-jhipster1 && yarn run test:e2e-jhipster2",
"clone-samples": "node scripts/clone-samples.js",
"build": "tsc -p tsconfig.build.json --outDir dist",
"build:watch": "tsc -p tsconfig.build.json --outDir dist -w"
},
"devDependencies": {
"@babel/cli": "7.14.8",
"@babel/core": "7.15.0",
"@babel/preset-env": "7.15.0",
"@babel/preset-typescript": "7.15.0",
"@babel/register": "7.15.3",
"@babel/cli": "7.19.3",
"@babel/core": "7.20.2",
"@babel/preset-env": "7.20.2",
"@babel/preset-typescript": "7.18.6",
"@babel/register": "7.18.9",
"@chevrotain/types": "9.0.2",
"@types/chai": "4.2.21",
"@types/fs-extra": "9.0.12",
"@types/jest": "27.0.1",
"@types/chai": "4.3.4",
"@types/fs-extra": "9.0.13",
"@types/jest": "29.2.3",
"@types/klaw-sync": "6.0.1",
"@types/lodash": "4.14.172",
"@types/node": "16.7.1",
"@types/prettier": "2.3.1",
"@types/sinon": "10.0.2",
"ts-node": "10.2.1",
"typescript": "4.3.5"
"@types/lodash": "4.14.190",
"@types/node": "18.11.9",
"@types/prettier": "2.7.1",
"@types/sinon": "10.0.13",
"ts-node": "10.9.1",
"typescript": "4.9.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export class PackagesAndModulesPrettierVisitor extends BaseCstPrettierPrinter {
])
);
}

return rejectAndConcat([
concat([ctx.Exports[0], " "]),
packageName,
Expand Down

0 comments on commit a331886

Please sign in to comment.