Skip to content

Commit

Permalink
Merge 14d73a4 into 1a93d5c
Browse files Browse the repository at this point in the history
  • Loading branch information
mcrowder65 committed Mar 23, 2019
2 parents 1a93d5c + 14d73a4 commit b2e9413
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 3 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
{
"name": "mooks",
"version": "1.0.8",
"version": "1.0.9",
"description": "",
"main": "lib/index.js",
"files": [
"lib/",
"package.json"
],
"main": "src/index.js",
"scripts": {
"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": [],
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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(<LoaderButton />);
Expand Down
Original file line number Diff line number Diff line change
@@ -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(<LoaderCard />);
Expand Down
Original file line number Diff line number Diff line change
@@ -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", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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(<Signup />);
Expand Down
Empty file.
File renamed without changes.
10 changes: 5 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/components/login/login.js → src/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
File renamed without changes.

0 comments on commit b2e9413

Please sign in to comment.