Skip to content

Commit

Permalink
Merge pull request #497 from NullVoxPopuli/concurrently-single-command
Browse files Browse the repository at this point in the history
chore(internal): single command v2 addon development
  • Loading branch information
NullVoxPopuli authored May 21, 2022
2 parents 99d57c3 + d4fb3c3 commit f16bc5f
Show file tree
Hide file tree
Showing 6 changed files with 221 additions and 62 deletions.
2 changes: 1 addition & 1 deletion ember-resources/src/deprecated-in-v4/ember-concurrency.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export function proxyClass<
// eslint-disable-next-line ember/no-get
get(taskRunner.currentTask, 'isRunning');
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
// @ts-ignore
get(taskRunner.currentTask, key);
}

Expand Down
2 changes: 1 addition & 1 deletion ember-resources/src/util/ember-concurrency.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export function proxyClass<
// eslint-disable-next-line ember/no-get
get(taskRunner.currentTask, 'isRunning');
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
// @ts-ignore
get(taskRunner.currentTask, key);
}

Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
{
"private": "true",
"private": true,
"repository": "https://github.com/NullVoxPopuli/ember-resources",
"license": "MIT",
"author": "NullVoxPopuli",
"scripts": {
"dev:ember": "pnpm run --filter ember-app start",
"dev:addon": "pnpm run --filter ember-resources start",
"dev": "concurrently 'npm:dev:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
"dev:ember": "pnpm run --filter ember-app start --port 0",
"dev:addon": "pnpm run --filter ember-resources start --no-watch.clearScreen",
"dev:docs": "pnpm run --filter docs docs:watch --preserveWatchOutput",
"ci:update": "cd build/github-workflows && pnpm build",
"build": "pnpm run --filter ember-resources build",
"build:docs": "pnpm run --filter docs docs:collect",
"start:docs": "pnpm run --filter docs docs:watch"
"build:docs": "pnpm run --filter docs docs:collect"
},
"devDependencies": {
"@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^13.1.0",
"@nullvoxpopuli/eslint-configs": "^2.2.19",
"concurrency": "^0.1.4",
"eslint": "^7.32.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.2",
"typescript": "^4.6.4"
},
Expand Down
Loading

0 comments on commit f16bc5f

Please sign in to comment.