Skip to content

Commit

Permalink
Using correct ts to remove api from being required arg
Browse files Browse the repository at this point in the history
  • Loading branch information
bakerac4 committed Oct 21, 2022
1 parent 7fb06f3 commit 0018742
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 143 deletions.
274 changes: 137 additions & 137 deletions ember-table/package.json
Original file line number Diff line number Diff line change
@@ -1,140 +1,140 @@
{
"name": "@gavant/ember-table",
"version": "3.2.1",
"description": "Data tables built using ember-table",
"keywords": [
"ember-addon",
"gavant",
"table",
"ember-table"
],
"repository": "https://github.com/Gavant/gavant-ember-table",
"license": "MIT",
"author": "Gavant Software, Inc.",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "rollup --config",
"lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'",
"lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
"lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern",
"lint:js": "eslint . --cache",
"lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
"lint:js:fix": "eslint . --fix",
"start": "rollup --config --watch",
"test": "echo 'A v2 addon does not have tests, run tests in test-app'",
"prepublishOnly": "rollup --config"
},
"dependencies": {
"@embroider/addon-shim": "^1.0.0",
"@embroider/util": "^1.0.0",
"@gavant/glint-template-types": "^0.1.8"
},
"peerDependencies": {
"@ember/render-modifiers": "^2.0.4",
"ember-on-resize-modifier": "^1.0.0",
"ember-responsive": "^4.0.2",
"ember-table": "^5.0.0",
"ember-truth-helpers": "^3.0.0",
"ember-source": ">= 3.28.0",
"ember-useragent": "^0.12.0"
},
"devDependencies": {
"@babel/core": "^7.18.2",
"@babel/plugin-proposal-class-properties": "^7.17.12",
"@babel/plugin-proposal-decorators": "^7.18.2",
"@babel/plugin-proposal-private-methods": "^7.16.11",
"@babel/plugin-transform-runtime": "^7.16.10",
"@babel/plugin-transform-typescript": "^7.16.8",
"@babel/preset-env": "^7.16.11",
"@babel/preset-typescript": "^7.17.12",
"@babel/runtime": "^7.16.7",
"@embroider/addon-dev": "^1.7.1",
"@glint/core": "^0.9.4",
"@glint/environment-ember-loose": "^0.9.4",
"@rollup/plugin-babel": "^5.3.1",
"@types/ember-qunit": "^5.0.0",
"@types/ember-resolver": "^5.0.11",
"@types/ember__application": "^4.0.0",
"@types/ember__array": "^4.0.1",
"@types/ember__component": "^4.0.8",
"@types/ember__controller": "^4.0.0",
"@types/ember__debug": "^4.0.1",
"@types/ember__engine": "^4.0.0",
"@types/ember__error": "^4.0.0",
"@types/ember__object": "^4.0.2",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.7",
"@types/ember__runloop": "^4.0.1",
"@types/ember__service": "^4.0.0",
"@types/ember__string": "^3.0.9",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__test-helpers": "^2.6.1",
"@types/ember__utils": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^5.18.0",
"@typescript-eslint/parser": "^5.18.0",
"babel-eslint": "^10.1.0",
"ember-template-lint": "^4.3.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.1",
"release-it": "^14.14.0",
"rollup": "^2.75.5",
"rollup-plugin-ts": "^3.0.1",
"typescript": "^4.8.4"
},
"typesVersions": {
"*": {
"*": [
"dist/*"
],
"components/table": [
"dist/components/table/index.d.ts"
],
"components/row/expandable-row": [
"dist/components/row/expandable-row/index.d.ts"
]
}
},
"engines": {
"node": "14.* || >= 16"
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"version": 2,
"type": "addon",
"main": "addon-main.js",
"app-js": {
"./components/ember-table-override/index.js": "./dist/_app_/components/ember-table-override/index.js",
"./components/ember-tbody-override/index.js": "./dist/_app_/components/ember-tbody-override/index.js",
"./components/progress-spinner/index.js": "./dist/_app_/components/progress-spinner/index.js",
"./components/row/expandable-row/index.js": "./dist/_app_/components/row/expandable-row/index.js",
"./components/row/loading/index.js": "./dist/_app_/components/row/loading/index.js",
"./components/row/no-results/index.js": "./dist/_app_/components/row/no-results/index.js",
"./components/table/index.js": "./dist/_app_/components/table/index.js"
}
},
"publishConfig": {
"access": "public"
},
"exports": {
".": "./dist/index.js",
"./*": {
"default": "./dist/*.js"
},
"./addon-main.js": "./addon-main.js"
},
"volta": {
"extends": "../package.json"
"name": "@gavant/ember-table",
"version": "3.2.1",
"description": "Data tables built using ember-table",
"keywords": [
"ember-addon",
"gavant",
"table",
"ember-table"
],
"repository": "https://github.com/Gavant/gavant-ember-table",
"license": "MIT",
"author": "Gavant Software, Inc.",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "rollup --config",
"lint": "concurrently 'npm:lint:*(!fix)' --names 'lint:'",
"lint:fix": "concurrently 'npm:lint:*:fix' --names 'fix:'",
"lint:hbs": "ember-template-lint . --no-error-on-unmatched-pattern",
"lint:js": "eslint . --cache",
"lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
"lint:js:fix": "eslint . --fix",
"start": "rollup --config --watch",
"test": "echo 'A v2 addon does not have tests, run tests in test-app'",
"prepublishOnly": "rollup --config"
},
"dependencies": {
"@embroider/addon-shim": "^1.0.0",
"@embroider/util": "^1.0.0",
"@gavant/glint-template-types": "^0.1.8"
},
"peerDependencies": {
"@ember/render-modifiers": "^2.0.4",
"ember-on-resize-modifier": "^1.0.0",
"ember-responsive": "^4.0.2",
"ember-table": "^5.0.0",
"ember-truth-helpers": "^3.0.0",
"ember-source": ">= 3.28.0",
"ember-useragent": "^0.12.0"
},
"devDependencies": {
"@babel/core": "^7.18.2",
"@babel/plugin-proposal-class-properties": "^7.17.12",
"@babel/plugin-proposal-decorators": "^7.18.2",
"@babel/plugin-proposal-private-methods": "^7.16.11",
"@babel/plugin-transform-runtime": "^7.16.10",
"@babel/plugin-transform-typescript": "^7.16.8",
"@babel/preset-env": "^7.16.11",
"@babel/preset-typescript": "^7.17.12",
"@babel/runtime": "^7.16.7",
"@embroider/addon-dev": "^1.7.1",
"@glint/core": "^0.9.4",
"@glint/environment-ember-loose": "^0.9.4",
"@rollup/plugin-babel": "^5.3.1",
"@types/ember-qunit": "^5.0.0",
"@types/ember-resolver": "^5.0.11",
"@types/ember__application": "^4.0.0",
"@types/ember__array": "^4.0.1",
"@types/ember__component": "^4.0.8",
"@types/ember__controller": "^4.0.0",
"@types/ember__debug": "^4.0.1",
"@types/ember__engine": "^4.0.0",
"@types/ember__error": "^4.0.0",
"@types/ember__object": "^4.0.2",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.7",
"@types/ember__runloop": "^4.0.1",
"@types/ember__service": "^4.0.0",
"@types/ember__string": "^3.0.9",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__test-helpers": "^2.6.1",
"@types/ember__utils": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^5.18.0",
"@typescript-eslint/parser": "^5.18.0",
"babel-eslint": "^10.1.0",
"ember-template-lint": "^4.3.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^10.5.9",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-qunit": "^7.2.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.6.1",
"release-it": "^14.14.0",
"rollup": "^2.75.5",
"rollup-plugin-ts": "^3.0.1",
"typescript": "^4.8.4"
},
"typesVersions": {
"*": {
"*": [
"dist/*"
],
"components/table": [
"dist/components/table/index.d.ts"
],
"components/row/expandable-row": [
"dist/components/row/expandable-row/index.d.ts"
]
}
},
"engines": {
"node": "14.* || >= 16"
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"version": 2,
"type": "addon",
"main": "addon-main.js",
"app-js": {
"./components/ember-table-override/index.js": "./dist/_app_/components/ember-table-override/index.js",
"./components/ember-tbody-override/index.js": "./dist/_app_/components/ember-tbody-override/index.js",
"./components/progress-spinner/index.js": "./dist/_app_/components/progress-spinner/index.js",
"./components/row/expandable-row/index.js": "./dist/_app_/components/row/expandable-row/index.js",
"./components/row/loading/index.js": "./dist/_app_/components/row/loading/index.js",
"./components/row/no-results/index.js": "./dist/_app_/components/row/no-results/index.js",
"./components/table/index.js": "./dist/_app_/components/table/index.js"
}
},
"publishConfig": {
"access": "public"
},
"exports": {
".": "./dist/index.js",
"./*": {
"default": "./dist/*.js"
},
"./addon-main.js": "./addon-main.js"
},
"volta": {
"extends": "../package.json"
}
}
4 changes: 2 additions & 2 deletions ember-table/src/components/table/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ export interface RowClickEvent<R, TM> {
tableMeta?: TableMeta<TM>;
}

export type BodyArgs<R, TM> = Exclude<EmberTableBodySignature['Args'], 'api'> & {
export type BodyArgs<R, TM> = Omit<EmberTableBodySignature['Args'], 'api'> & {
rows: R[];
selection?: R[] | R | null;
tableMeta?: TableMeta<TM>;
};

export type HeadArgs<TM> = Exclude<EmberTableHeaderSignature['Args'], 'api'> & {
export type HeadArgs<TM> = Omit<EmberTableHeaderSignature['Args'], 'api'> & {
tableMeta?: TableMeta<TM>;
};

Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1456,10 +1456,10 @@
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.3.0.tgz#a508df35ded585c4e071cb5d9d7c89623c837fae"
integrity sha512-1W0PZezq2rxlAssoWemi9gFRD8IQxvf0FPL5Km3TOmGHFG7ib0TbFBJ0yC7D/1NsxunjNTK6WjUXV8ao/mKZ5w==

"@gavant/glint-template-types@^0.1.7":
version "0.1.7"
resolved "https://registry.yarnpkg.com/@gavant/glint-template-types/-/glint-template-types-0.1.7.tgz#0704796a26214f472226549160ad04e5e4a9217b"
integrity sha512-JUmculztRlya6ALIHczEWfdecMuQ0rZPlZ7eUCdoGvZjgH1jYsfWDBoZMoHXufm3IqpNvXquIfwiN0uUD8S2Sg==
"@gavant/glint-template-types@^0.1.7", "@gavant/glint-template-types@^0.1.8":
version "0.1.8"
resolved "https://registry.yarnpkg.com/@gavant/glint-template-types/-/glint-template-types-0.1.8.tgz#ae2e4db12a8683b9f98294c720c988fd5b3d5774"
integrity sha512-zMzs/Dpa9MGtLK+9Oz7m3gHxa06f3dUzrmq/P0FxRt/RMrVd5XlVjMwV9qcuh9mtjzsDFqI4JmJsJroEEwBtMA==

"@glimmer/component@^1.0.4", "@glimmer/component@^1.1.2":
version "1.1.2"
Expand Down

0 comments on commit 0018742

Please sign in to comment.