Skip to content

Commit

Permalink
deps: update lerna to 7.1.4 (#4792)
Browse files Browse the repository at this point in the history
* Update lerna

* Lerna repair

* Fix lerna scripts

* Fix parser TS issues

* Remove bootstrap

* Fix CI
  • Loading branch information
sebastijankuzner committed Jul 24, 2023
1 parent a29b06f commit db30cae
Show file tree
Hide file tree
Showing 6 changed files with 1,205 additions and 1,343 deletions.
23 changes: 1 addition & 22 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,7 @@ jobs:
node-version: ${{ matrix.node-version }}

- name: Install & Build
run: yarn install && yarn bootstrap
run: yarn install

- name: Lint Source
run: yarn lint
# tests:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# node-version: [16.x]
# steps:
# - uses: actions/checkout@v2
# - name: Cache node modules
# uses: actions/cache@v1
# with:
# path: node_modules
# key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
# restore-keys: ${{ runner.os }}-node-
# - name: Use Node.js ${{ matrix.node-version }}
# uses: actions/setup-node@v1
# with:
# node-version: ${{ matrix.node-version }}
# - name: Install & Build
# run: yarn install && yarn bootstrap
# - name: Lint Source
# run: yarn lint:tests
10 changes: 3 additions & 7 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"lerna": "3.5.0",
"npmClient": "yarn",
"packages": [
"packages/*",
"plugins/*"
],
"useWorkspaces": true,
"version": "3.8.1"
"packages": ["packages/*", "plugins/*"],
"version": "3.8.1",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
210 changes: 104 additions & 106 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,108 +1,106 @@
{
"private": true,
"name": "core",
"description": "The packages that make up the ARK Core",
"scripts": {
"lerna": "node ./node_modules/lerna/cli.js",
"setup": "yarn && yarn bootstrap && yarn build",
"setup:clean": "yarn && yarn clean && yarn bootstrap && yarn build",
"bootstrap": "yarn lerna bootstrap",
"clean": "yarn lerna clean --yes",
"build": "yarn lerna run build",
"lint": "./node_modules/eslint/bin/eslint.js packages --ext .ts --fix",
"lint:tests": "./node_modules/eslint/bin/eslint.js __tests__ --ext .ts --fix",
"prettier": "prettier --write \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\" \"./__tests__/**/*.{ts,js,json,md}\"",
"format": "yarn lint && yarn prettier",
"test": "cross-env CORE_ENV=test jest --runInBand --forceExit",
"test:parallel": "cross-env CORE_ENV=test jest --forceExit",
"test:coverage": "cross-env CORE_ENV=test jest --coverage --coveragePathIgnorePatterns='/(defaults.ts|index.ts)$' --runInBand --forceExit",
"test:debug": "cross-env CORE_ENV=test node --inspect-brk ./node_modules/.bin/jest --runInBand",
"test:watch": "cross-env CORE_ENV=test jest --runInBand --watch",
"test:watch:all": "cross-env CORE_ENV=test jest --runInBand --watchAll",
"test:unit": "cross-env jest __tests__/unit/** --forceExit",
"test:unit:coverage": "cross-env jest __tests__/unit --coverage --coveragePathIgnorePatterns='/(defaults.ts|index.ts)$'",
"test:unit:debug": "cross-env node --inspect-brk ./node_modules/.bin/jest __tests__/unit",
"test:unit:watch": "cross-env jest __tests__/unit --watch",
"test:unit:watch:all": "cross-env CORE_ENV=test jest __tests__/unit --watchAll",
"test:integration": "cross-env CORE_ENV=test jest __tests__/integration --runInBand --forceExit",
"test:integration:coverage": "cross-env CORE_ENV=test jest __tests__/integration --coverage --coveragePathIgnorePatterns='/(defaults.ts|index.ts)$' --runInBand --forceExit",
"test:integration:debug": "cross-env CORE_ENV=test node --inspect-brk ./node_modules/.bin/jest __tests__/integration --runInBand",
"test:integration:watch": "cross-env CORE_ENV=test jest __tests__/integration --runInBand --watch",
"test:integration:watch:all": "cross-env CORE_ENV=test jest __tests__/integration --runInBand --watchAll",
"test:functional": "cross-env CORE_ENV=test jest __tests__/functional --runInBand --forceExit",
"test:functional:coverage": "cross-env CORE_ENV=test jest __tests__/functional --coverage --coveragePathIgnorePatterns='/(defaults.ts|index.ts)$' --runInBand --forceExit",
"test:functional:debug": "cross-env CORE_ENV=test node --inspect-brk ./node_modules/.bin/jest __tests__/functional --runInBand",
"test:functional:watch": "cross-env CORE_ENV=test jest __tests__/functional --runInBand --watch",
"test:functional:watch:all": "cross-env CORE_ENV=test jest __tests__/functional --runInBand --watchAll",
"publish:alpha": "cross-env-shell ./scripts/publish/alpha.sh",
"publish:beta": "cross-env-shell ./scripts/publish/beta.sh",
"publish:rc": "cross-env-shell ./scripts/publish/rc.sh",
"publish:next": "cross-env-shell ./scripts/publish/next.sh",
"publish:latest": "cross-env-shell ./scripts/publish/latest.sh",
"upgrade": "cross-env-shell ./scripts/upgrade.sh",
"version": "cross-env-shell ./scripts/version.sh",
"deps": "cross-env-shell ./scripts/deps/update.sh",
"deps:missing": "node ./scripts/deps/missing.js",
"deps:unused": "node ./scripts/deps/unused.js",
"deps:types": "./node_modules/typesync/bin/typesync",
"madge:circular": "node ./scripts/circular.js",
"madge:graph": "./node_modules/madge/bin/cli.js --image circular-graph.svg --extensions ts ./packages/**/src",
"docker": "node ./scripts/docker/generate-docker.js",
"bench": "node benchmark/index.js"
},
"devDependencies": {
"@babel/core": "7.15.5",
"@babel/preset-env": "7.15.4",
"@commitlint/cli": "11.0.0",
"@commitlint/config-conventional": "11.0.0",
"@faustbrian/benchmarker": "0.1.2",
"@oclif/dev-cli": "1.26.0",
"@types/babel__core": "7.1.16",
"@types/create-hash": "1.2.2",
"@types/depcheck": "0.9.1",
"@types/jest": "26.0.24",
"@types/js-yaml": "3.12.7",
"@types/node": "13.9.5",
"@types/prettier": "2.3.2",
"@types/rimraf": "3.0.2",
"@types/uuid": "8.3.1",
"@typescript-eslint/eslint-plugin": "3.10.1",
"@typescript-eslint/parser": "3.10.1",
"babel-loader": "8.2.2",
"capture-console": "1.0.1",
"create-hash": "1.2.0",
"cross-env": "7.0.3",
"del-cli": "3.0.1",
"depcheck": "1.4.3",
"eslint-config-prettier": "6.15.0",
"eslint-plugin-jest": "24.4.0",
"eslint-plugin-prettier": "3.4.1",
"eslint-plugin-simple-import-sort": "5.0.3",
"eslint": "7.32.0",
"fs-extra": "8.1.0",
"get-port": "5.1.1",
"husky": "4.3.8",
"jest-extended": "0.11.5",
"jest": "26.6.3",
"js-yaml": "3.14.1",
"lerna": "6.0.3",
"lint-staged": "10.5.4",
"madge": "4.0.1",
"moment-timezone": "0.5.33",
"nock": "13.1.3",
"npm-check-updates": "16.0.5",
"prettier": "2.4.0",
"rimraf": "3.0.2",
"sinon": "9.2.4",
"tmp": "0.2.1",
"ts-jest": "26.5.6",
"typedoc": "0.22.17",
"typescript": "3.8.3",
"typesync": "0.8.0",
"uuid": "8.3.2"
},
"workspaces": [
"packages/*",
"plugins/*"
]
"private": true,
"name": "core",
"description": "The packages that make up the ARK Core",
"scripts": {
"setup": "yarn && yarn build",
"setup:clean": "yarn && yarn clean && yarn build",
"clean": "yarn lerna clean --yes",
"build": "yarn lerna run build",
"lint": "./node_modules/eslint/bin/eslint.js packages --ext .ts --fix",
"lint:tests": "./node_modules/eslint/bin/eslint.js __tests__ --ext .ts --fix",
"prettier": "prettier --write \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\" \"./__tests__/**/*.{ts,js,json,md}\"",
"format": "yarn lint && yarn prettier",
"test": "cross-env CORE_ENV=test jest --runInBand --forceExit",
"test:parallel": "cross-env CORE_ENV=test jest --forceExit",
"test:coverage": "cross-env CORE_ENV=test jest --coverage --coveragePathIgnorePatterns='/(defaults.ts|index.ts)$' --runInBand --forceExit",
"test:debug": "cross-env CORE_ENV=test node --inspect-brk ./node_modules/.bin/jest --runInBand",
"test:watch": "cross-env CORE_ENV=test jest --runInBand --watch",
"test:watch:all": "cross-env CORE_ENV=test jest --runInBand --watchAll",
"test:unit": "cross-env jest __tests__/unit/** --forceExit",
"test:unit:coverage": "cross-env jest __tests__/unit --coverage --coveragePathIgnorePatterns='/(defaults.ts|index.ts)$'",
"test:unit:debug": "cross-env node --inspect-brk ./node_modules/.bin/jest __tests__/unit",
"test:unit:watch": "cross-env jest __tests__/unit --watch",
"test:unit:watch:all": "cross-env CORE_ENV=test jest __tests__/unit --watchAll",
"test:integration": "cross-env CORE_ENV=test jest __tests__/integration --runInBand --forceExit",
"test:integration:coverage": "cross-env CORE_ENV=test jest __tests__/integration --coverage --coveragePathIgnorePatterns='/(defaults.ts|index.ts)$' --runInBand --forceExit",
"test:integration:debug": "cross-env CORE_ENV=test node --inspect-brk ./node_modules/.bin/jest __tests__/integration --runInBand",
"test:integration:watch": "cross-env CORE_ENV=test jest __tests__/integration --runInBand --watch",
"test:integration:watch:all": "cross-env CORE_ENV=test jest __tests__/integration --runInBand --watchAll",
"test:functional": "cross-env CORE_ENV=test jest __tests__/functional --runInBand --forceExit",
"test:functional:coverage": "cross-env CORE_ENV=test jest __tests__/functional --coverage --coveragePathIgnorePatterns='/(defaults.ts|index.ts)$' --runInBand --forceExit",
"test:functional:debug": "cross-env CORE_ENV=test node --inspect-brk ./node_modules/.bin/jest __tests__/functional --runInBand",
"test:functional:watch": "cross-env CORE_ENV=test jest __tests__/functional --runInBand --watch",
"test:functional:watch:all": "cross-env CORE_ENV=test jest __tests__/functional --runInBand --watchAll",
"publish:alpha": "cross-env-shell ./scripts/publish/alpha.sh",
"publish:beta": "cross-env-shell ./scripts/publish/beta.sh",
"publish:rc": "cross-env-shell ./scripts/publish/rc.sh",
"publish:next": "cross-env-shell ./scripts/publish/next.sh",
"publish:latest": "cross-env-shell ./scripts/publish/latest.sh",
"upgrade": "cross-env-shell ./scripts/upgrade.sh",
"version": "cross-env-shell ./scripts/version.sh",
"deps": "cross-env-shell ./scripts/deps/update.sh",
"deps:missing": "node ./scripts/deps/missing.js",
"deps:unused": "node ./scripts/deps/unused.js",
"deps:types": "./node_modules/typesync/bin/typesync",
"madge:circular": "node ./scripts/circular.js",
"madge:graph": "./node_modules/madge/bin/cli.js --image circular-graph.svg --extensions ts ./packages/**/src",
"docker": "node ./scripts/docker/generate-docker.js",
"bench": "node benchmark/index.js"
},
"devDependencies": {
"@babel/core": "7.15.5",
"@babel/preset-env": "7.15.4",
"@commitlint/cli": "11.0.0",
"@commitlint/config-conventional": "11.0.0",
"@faustbrian/benchmarker": "0.1.2",
"@oclif/dev-cli": "1.26.0",
"@types/babel__core": "7.1.16",
"@types/create-hash": "1.2.2",
"@types/depcheck": "0.9.1",
"@types/jest": "26.0.24",
"@types/js-yaml": "3.12.7",
"@types/node": "13.9.5",
"@types/prettier": "2.3.2",
"@types/rimraf": "3.0.2",
"@types/uuid": "8.3.1",
"@typescript-eslint/eslint-plugin": "3.10.1",
"@typescript-eslint/parser": "3.10.1",
"babel-loader": "8.2.2",
"capture-console": "1.0.1",
"create-hash": "1.2.0",
"cross-env": "7.0.3",
"del-cli": "3.0.1",
"depcheck": "1.4.3",
"eslint-config-prettier": "6.15.0",
"eslint-plugin-jest": "24.4.0",
"eslint-plugin-prettier": "3.4.1",
"eslint-plugin-simple-import-sort": "5.0.3",
"eslint": "7.32.0",
"fs-extra": "8.1.0",
"get-port": "5.1.1",
"husky": "4.3.8",
"jest-extended": "0.11.5",
"jest": "26.6.3",
"js-yaml": "3.14.1",
"lerna": "7.1.4",
"lint-staged": "10.5.4",
"madge": "4.0.1",
"moment-timezone": "0.5.33",
"nock": "13.1.3",
"npm-check-updates": "16.0.5",
"prettier": "2.4.0",
"rimraf": "3.0.2",
"sinon": "9.2.4",
"tmp": "0.2.1",
"ts-jest": "26.5.6",
"typedoc": "0.22.17",
"typescript": "3.8.3",
"typesync": "0.8.0",
"uuid": "8.3.2"
},
"workspaces": [
"packages/*",
"plugins/*"
]
}
6 changes: 4 additions & 2 deletions packages/core-cli/src/input/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ export class InputParser {
* @returns
* @memberof InputParser
*/
public static parseArgv(args: string[]) {
public static parseArgv(args: string[]): { args: string[]; flags: yargs.Arguments } {
const parsed: yargs.Arguments = yargs(args, { count: ["v"] });

const argv: string[] = parsed._;

const argv = parsed._.map((argument) => argument.toString());

// @ts-ignore
delete parsed._;

return { args: argv, flags: parsed };
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"strict": true,
"stripInternal": true,
"target": "es2020",
"typeRoots": ["reflect-metadata", "node_modules/@types"],
"typeRoots": ["reflect-metadata", "node_modules/@types"]
},
"exclude": ["node_modules", "**/*.spec.ts", "**/*.test.ts"]
}
Loading

0 comments on commit db30cae

Please sign in to comment.