From 2c9a7ac59ef51d96aca95e0afd8f5d05188f3842 Mon Sep 17 00:00:00 2001 From: Matt Crowder Date: Sat, 23 Mar 2019 11:04:15 -0400 Subject: [PATCH 1/4] got src --- .../default-value => __tests__}/default-value.test.js | 2 +- .../loader-button => __tests__}/loader-button.test.js | 4 ++-- .../loader-card => __tests__}/loader-card.test.js | 4 ++-- src/{components/login => }/__tests__/login.test.js | 2 +- src/{components/signup => __tests__}/signup.test.js | 4 ++-- src/components/loader-button/README.md | 0 src/{components/default-value => }/default-value.js | 0 src/index.js | 10 +++++----- src/{components/loader-button => }/loader-button.js | 0 src/{components/loader-card => }/loader-card.js | 0 src/{components/login => }/login.js | 2 +- src/{components/signup => }/signup.js | 0 12 files changed, 14 insertions(+), 14 deletions(-) rename src/{components/default-value => __tests__}/default-value.test.js (86%) rename src/{components/loader-button => __tests__}/loader-button.test.js (77%) rename src/{components/loader-card => __tests__}/loader-card.test.js (77%) rename src/{components/login => }/__tests__/login.test.js (70%) rename src/{components/signup => __tests__}/signup.test.js (55%) delete mode 100644 src/components/loader-button/README.md rename src/{components/default-value => }/default-value.js (100%) rename src/{components/loader-button => }/loader-button.js (100%) rename src/{components/loader-card => }/loader-card.js (100%) rename src/{components/login => }/login.js (98%) rename src/{components/signup => }/signup.js (100%) diff --git a/src/components/default-value/default-value.test.js b/src/__tests__/default-value.test.js similarity index 86% rename from src/components/default-value/default-value.test.js rename to src/__tests__/default-value.test.js index 34d680e..0071c2a 100644 --- a/src/components/default-value/default-value.test.js +++ b/src/__tests__/default-value.test.js @@ -1,4 +1,4 @@ -import DefaultValue from "./default-value"; +import DefaultValue from "../default-value"; test("when value is undefined, null is returned", () => { expect(DefaultValue({ value: undefined })).toEqual(null); diff --git a/src/components/loader-button/loader-button.test.js b/src/__tests__/loader-button.test.js similarity index 77% rename from src/components/loader-button/loader-button.test.js rename to src/__tests__/loader-button.test.js index c74b2bb..f9d29ce 100644 --- a/src/components/loader-button/loader-button.test.js +++ b/src/__tests__/loader-button.test.js @@ -1,6 +1,6 @@ import React from "react"; -import { render } from "../../../test/test-utils"; -import LoaderButton from "./loader-button"; +import { render } from "../../test/test-utils"; +import LoaderButton from "../loader-button"; test("that it renders without issues", () => { render(); diff --git a/src/components/loader-card/loader-card.test.js b/src/__tests__/loader-card.test.js similarity index 77% rename from src/components/loader-card/loader-card.test.js rename to src/__tests__/loader-card.test.js index ec37edd..743e2d9 100644 --- a/src/components/loader-card/loader-card.test.js +++ b/src/__tests__/loader-card.test.js @@ -1,6 +1,6 @@ import React from "react"; -import { render } from "../../../test/test-utils"; -import LoaderCard from "./loader-card"; +import { render } from "../../test/test-utils"; +import LoaderCard from "../loader-card"; test("that it renders without errors", () => { render(); diff --git a/src/components/login/__tests__/login.test.js b/src/__tests__/login.test.js similarity index 70% rename from src/components/login/__tests__/login.test.js rename to src/__tests__/login.test.js index e2c0004..08604b0 100644 --- a/src/components/login/__tests__/login.test.js +++ b/src/__tests__/login.test.js @@ -1,5 +1,5 @@ import React from "react"; -import { render } from "../../../../test/test-utils"; +import { render } from "../../test/test-utils"; import Login from "../login"; test("that it renders without issues", () => { diff --git a/src/components/signup/signup.test.js b/src/__tests__/signup.test.js similarity index 55% rename from src/components/signup/signup.test.js rename to src/__tests__/signup.test.js index aff07ab..45c5eab 100644 --- a/src/components/signup/signup.test.js +++ b/src/__tests__/signup.test.js @@ -1,6 +1,6 @@ import React from "react"; -import { render } from "../../../test/test-utils"; -import Signup from "./signup"; +import { render } from "../../test/test-utils"; +import Signup from "../signup"; test("that it renders without errors", () => { render(); diff --git a/src/components/loader-button/README.md b/src/components/loader-button/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/default-value/default-value.js b/src/default-value.js similarity index 100% rename from src/components/default-value/default-value.js rename to src/default-value.js diff --git a/src/index.js b/src/index.js index 189a1b6..2881b72 100644 --- a/src/index.js +++ b/src/index.js @@ -4,11 +4,11 @@ import { getElements } from "./get-elements"; import { useLoader } from "./use-loader"; import { sleep } from "./sleep"; import { compose } from "./compose"; -import DefaultValue from "./components/default-value/default-value"; -import LoaderButton from "./components/loader-button/loader-button"; -import LoaderCard from "./components/loader-card/loader-card"; -import Login from "./components/login/login"; -import Signup from "./components/signup/signup"; +import DefaultValue from "./default-value"; +import LoaderButton from "./loader-button"; +import LoaderCard from "./loader-card"; +import Login from "./login"; +import Signup from "./signup"; import { hello } from "./hello"; export { diff --git a/src/components/loader-button/loader-button.js b/src/loader-button.js similarity index 100% rename from src/components/loader-button/loader-button.js rename to src/loader-button.js diff --git a/src/components/loader-card/loader-card.js b/src/loader-card.js similarity index 100% rename from src/components/loader-card/loader-card.js rename to src/loader-card.js diff --git a/src/components/login/login.js b/src/login.js similarity index 98% rename from src/components/login/login.js rename to src/login.js index ac794fe..49c0279 100644 --- a/src/components/login/login.js +++ b/src/login.js @@ -9,7 +9,7 @@ import Card from "@material-ui/core/Card"; import Grid from "@material-ui/core/Grid"; import withStyles from "@material-ui/core/styles/withStyles"; -import { compose } from "../../compose"; +import { compose } from "./compose"; const styles = { content: { diff --git a/src/components/signup/signup.js b/src/signup.js similarity index 100% rename from src/components/signup/signup.js rename to src/signup.js From 29bff41920dff91757238f40913fe29e48e74032 Mon Sep 17 00:00:00 2001 From: Matt Crowder Date: Sat, 23 Mar 2019 11:06:44 -0400 Subject: [PATCH 2/4] try to publish src --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 887e14e..feaf9f8 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "linter": "eslint src --ext .js", "jest": "jest --coverage --silent", "test": "npm run linter && npm run jest", - "build": "babel src --out-dir lib --ignore \"src/**/*.spec.js\",\"src/**/*.test.js\"", + "build": "babel src --out-dir src --ignore \"src/**/*.spec.js\",\"src/**/*.test.js\"", "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls" }, "keywords": [], From 71a082e74c2019328baef0a1afc9f0e6cc7bc89f Mon Sep 17 00:00:00 2001 From: Matt Crowder Date: Sat, 23 Mar 2019 11:08:02 -0400 Subject: [PATCH 3/4] build --- .travis.yml | 2 +- package.json | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index efec953..38402e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,10 @@ language: node_js node_js: 10.15.0 cache: npm script: - - npm run build - npm run linter; - npm run jest; - npm run coveralls; + - npm run build deploy: provider: npm email: "$NPM_EMAIL" diff --git a/package.json b/package.json index feaf9f8..b1cdba9 100644 --- a/package.json +++ b/package.json @@ -2,11 +2,7 @@ "name": "mooks", "version": "1.0.8", "description": "", - "main": "lib/index.js", - "files": [ - "lib/", - "package.json" - ], + "main": "src/index.js", "scripts": { "linter": "eslint src --ext .js", "jest": "jest --coverage --silent", From 14d73a48405fd27b4c6924885c409ce514e40bfb Mon Sep 17 00:00:00 2001 From: Matt Crowder Date: Sat, 23 Mar 2019 11:08:08 -0400 Subject: [PATCH 4/4] 1.0.9 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7d3127..fca9967 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "mooks", - "version": "1.0.8", + "version": "1.0.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b1cdba9..b66698a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mooks", - "version": "1.0.8", + "version": "1.0.9", "description": "", "main": "src/index.js", "scripts": {