Skip to content

Commit

Permalink
Merge 33ec24c into fd8583b
Browse files Browse the repository at this point in the history
  • Loading branch information
nhardy committed Feb 15, 2022
2 parents fd8583b + 33ec24c commit 657a13e
Show file tree
Hide file tree
Showing 29 changed files with 3,240 additions and 4,224 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x, 14.x]
node-version: [12.x, 14.x, 16.x]

steps:
- name: Checkout Repository
Expand Down
68 changes: 32 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,45 +38,41 @@
}
},
"dependencies": {
"@babel/core": "^7.12.16",
"@babel/plugin-proposal-class-properties": "^7.12.13",
"@babel/plugin-proposal-numeric-separator": "^7.12.13",
"@babel/plugin-transform-runtime": "^7.12.15",
"@babel/preset-env": "^7.12.16",
"@babel/preset-react": "^7.12.13",
"@babel/preset-typescript": "^7.12.16",
"@babel/register": "^7.12.13",
"@changesets/cli": "^2.14.1",
"@manypkg/cli": "^0.17.0",
"@types/babel__core": "^7.1.12",
"@types/content-type": "^1.1.3",
"@types/enzyme": "^3.10.8",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/jest": "^26.0.10",
"@types/jest-when": "^2.7.2",
"@types/react-dom": "^17.0.1",
"@typescript-eslint/eslint-plugin": "^4.14.1",
"@typescript-eslint/parser": "^4.14.1",
"babel-eslint": "^10.1.0",
"@babel/core": "^7.17.2",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-numeric-separator": "^7.16.7",
"@babel/plugin-transform-runtime": "^7.17.0",
"@babel/preset-env": "^7.16.11",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@babel/register": "^7.17.0",
"@changesets/cli": "^2.20.0",
"@manypkg/cli": "^0.19.1",
"@testing-library/jest-dom": "^5.16.2",
"@types/babel__core": "^7.1.18",
"@types/content-type": "^1.1.5",
"@types/jest": "^27.4.0",
"@types/jest-when": "^3.5.0",
"@types/react-dom": "^17.0.11",
"@typescript-eslint/eslint-plugin": "^5.12.0",
"@typescript-eslint/parser": "^5.12.0",
"babel-plugin-lodash": "^3.3.4",
"core-js": "^3.8.3",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"eslint": "^7.8.1",
"eslint-config-prettier": "^7.2.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.22.0",
"jest": "^26.6.3",
"jest-enzyme": "^7.1.2",
"jsdom": "^16.4.0",
"core-js": "^3.21.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.28.0",
"jest": "^27.5.1",
"jsdom": "^19.0.0",
"jsdom-global": "^3.0.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.2.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"prettier": "^2.5.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"rimraf": "^3.0.2",
"ts-jest": "^26.5.1",
"typescript": "^4.1.5"
"ts-jest": "^27.1.3",
"typescript": "^4.5.5"
}
}
26 changes: 13 additions & 13 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kablamo/eslint-config",
"version": "0.0.2",
"version": "0.0.3",
"main": "index.js",
"repository": "https://github.com/KablamoOSS/kerosene/tree/master/packages/eslint-config",
"bugs": {
Expand All @@ -15,25 +15,25 @@
"test": "exit 0"
},
"peerDependencies": {
"eslint": "^7.0.0"
"eslint": "^7 || ^8"
},
"devDependencies": {
"eslint": "^7.8.1"
"eslint": "^7.32.0"
},
"engines": {
"node": ">=10.13.0"
},
"dependencies": {
"@kablamo/eslint-plugin": "^2.0.0",
"@typescript-eslint/eslint-plugin": "^4.14.1",
"@typescript-eslint/parser": "^4.14.1",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-prettier": "^7.2.0",
"@kablamo/eslint-plugin": "^2.0.1",
"@typescript-eslint/eslint-plugin": "^5.12.0",
"@typescript-eslint/parser": "^5.12.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.3.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-react-hooks": "^4.2.0"
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0"
}
}
8 changes: 4 additions & 4 deletions packages/eslint-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kablamo/eslint-plugin",
"version": "2.0.0",
"version": "2.0.1",
"main": "src/index.js",
"repository": "https://github.com/KablamoOSS/kerosene/tree/master/packages/eslint-plugin",
"bugs": {
Expand All @@ -15,10 +15,10 @@
"test": "src/test.js"
},
"peerDependencies": {
"eslint": "^7.0.0"
"eslint": "^7 || ^8"
},
"devDependencies": {
"@types/eslint": "^7.2.6",
"eslint": "^7.8.1"
"@types/eslint": "^8.4.1",
"eslint": "^7.32.0"
}
}
2 changes: 1 addition & 1 deletion packages/eslint-plugin/src/test/rule-tester.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { RuleTester } from "eslint";

export default new RuleTester({
parser: require.resolve("babel-eslint"),
parser: require.resolve("@babel/eslint-parser"),
parserOptions: {
parserOptions: {
ecmaVersion: 6,
Expand Down
12 changes: 6 additions & 6 deletions packages/kerosene-test/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kablamo/kerosene-test",
"version": "0.0.9",
"version": "0.0.10",
"repository": "https://github.com/KablamoOSS/kerosene/tree/master/packages/kerosene-test",
"bugs": {
"url": "https://github.com/KablamoOSS/kerosene/issues"
Expand Down Expand Up @@ -46,14 +46,14 @@
"utils"
],
"dependencies": {
"@types/lodash": "^4.14.168",
"@types/sinon": "^9.0.10",
"@types/lodash": "^4.14.178",
"@types/sinon": "^10.0.11",
"lodash": "^4.17.21",
"sinon": "^9.2.4"
"sinon": "^13.0.1"
},
"devDependencies": {
"react": "^16.13.1",
"react-dom": "^16.13.1"
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"peerDependencies": {
"react": ">=16.8.6",
Expand Down
23 changes: 14 additions & 9 deletions packages/kerosene-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kablamo/kerosene-ui",
"version": "0.0.22",
"version": "0.0.23",
"repository": "https://github.com/KablamoOSS/kerosene/tree/master/packages/kerosene-ui",
"bugs": {
"url": "https://github.com/KablamoOSS/kerosene/issues"
Expand All @@ -21,19 +21,24 @@
"node": ">= 10"
},
"dependencies": {
"@babel/runtime": "^7.12.13",
"@kablamo/kerosene": "^0.0.21",
"@types/lodash": "^4.14.168",
"@babel/runtime": "^7.17.2",
"@kablamo/kerosene": "^0.0.23",
"@types/lodash": "^4.14.178",
"lodash": "^4.17.21"
},
"devDependencies": {
"@rollup/plugin-babel": "^5.3.0",
"enzyme": "^3.11.0",
"@sinonjs/fake-timers": "^9.1.0",
"@testing-library/dom": "^8.11.3",
"@testing-library/react": "^12.1.2",
"@testing-library/react-hooks": "^7.0.2",
"@testing-library/user-event": "^13.5.0",
"@types/sinonjs__fake-timers": "^8.1.1",
"jest-sandbox": "^1.1.2",
"jest-when": "^3.2.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"rollup": "^2.39.0",
"jest-when": "^3.5.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"rollup": "^2.67.2",
"rollup-plugin-node-resolve": "^5.2.0"
},
"peerDependencies": {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/kerosene-ui/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
require("../../babel-register");
module.exports = require("./rollup.config.ts");
module.exports = require("./rollup-config.ts");

This file was deleted.

66 changes: 30 additions & 36 deletions packages/kerosene-ui/src/ShowWhen/index.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,45 +1,39 @@
import { shallow } from "enzyme";
import { render } from "@testing-library/react";
import * as React from "react";
import ShowWhen from ".";

interface Case {
name: string;
when: boolean;
children: React.ReactNode;
}
const text = "Test";

const cases: Case[] = [
{
name: "Should return Test as text",
when: true,
children: "Test",
},
{
name: "Should return Test in a <span />",
when: true,
children: <span>Test</span>,
},
{
name: "Should return null",
when: false,
children: "Test",
},
];
describe("ShowWhen", () => {
it.each([
{
name: "Should return Test as text",
when: true,
children: text,
},
{
name: "Should return Test in a <span />",
when: true,
children: <span>{text}</span>,
},
{
name: "Should return null",
when: false,
children: text,
},
])("ShowWhen %j", ({ name, when, children }) => {
const result = render(<ShowWhen when={when}>{children}</ShowWhen>);

test.each(cases)("ShowWhen %j", ({ name, when, children }: Case) => {
const wrapper = shallow(<ShowWhen when={when}>{children}</ShowWhen>);

if (when === false) {
expect(wrapper.getElement()).toBeNull();
}
if (when === false) {
expect(result.queryByText(text)).not.toBeInTheDocument();
}

if (when === true) {
expect(wrapper.text()).not.toBeNull();
expect(wrapper.text()).toMatchSnapshot(name);
if (when === true) {
expect(result.queryByText(text)).toBeInTheDocument();

if (typeof children === "string") {
expect(wrapper.text()).not.toBeNull();
expect(wrapper.text()).toEqual(children);
if (typeof children !== "string") {
expect(result.container.querySelector("span")).toBeInTheDocument();
}
}
}
});
});
30 changes: 8 additions & 22 deletions packages/kerosene-ui/src/hooks/useAbortController.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,38 +1,24 @@
import { mount } from "enzyme";
import * as React from "react";
import { renderHook } from "@testing-library/react-hooks";
import useAbortController from "./useAbortController";

describe("#useAbortController", () => {
it("should manage a series of AbortControllers", () => {
const Component = ({
resultRef,
}: {
resultRef: React.MutableRefObject<ReturnType<typeof useAbortController>>;
}) => {
const result = useAbortController();
// eslint-disable-next-line no-param-reassign
resultRef.current = result;
return null;
};
const result = ({ current: undefined } as Partial<
React.MutableRefObject<ReturnType<typeof useAbortController>>
>) as React.MutableRefObject<ReturnType<typeof useAbortController>>;
const root = mount(<Component resultRef={result} />);
expect(result.current.ref).toEqual({ current: undefined });
const utils = renderHook(() => useAbortController());
expect(utils.result.current.ref.current).toBe(undefined);

const first = result.current.next();
const first = utils.result.current.next();
expect(first).toBeInstanceOf(AbortController);
expect(first.signal.aborted).toBe(false);
expect(result.current.ref.current).toBe(first);
expect(utils.result.current.ref.current).toBe(first);

const second = result.current.next();
const second = utils.result.current.next();
expect(second).toBeInstanceOf(AbortController);
expect(second.signal.aborted).toBe(false);
expect(result.current.ref.current).toBe(second);
expect(utils.result.current.ref.current).toBe(second);

expect(first.signal.aborted).toBe(true);

root.unmount();
utils.unmount();
expect(second.signal.aborted).toBe(true);
});
});

0 comments on commit 657a13e

Please sign in to comment.