Skip to content

Commit

Permalink
Merge 8b227af into a201efd
Browse files Browse the repository at this point in the history
  • Loading branch information
hvolschenk committed Apr 14, 2018
2 parents a201efd + 8b227af commit 31ac9e5
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 84 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM node:carbon
WORKDIR /app
FROM node:carbon-alpine

WORKDIR /home/node/app

CMD ["npm", "test"]
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ services:
build: "."
container_name: "materialr-linear-progress"
volumes:
- ./:/app
- ./:/home/node/app
23 changes: 23 additions & 0 deletions jest.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"coveragePathIgnorePatterns": [
"/node_modules/",
"<rootDir>/.jest"
],
"moduleNameMapper": {
"\\.scss$": "<rootDir>/.jest/style-mock.js"
},
"roots": [
"<rootDir>/src"
],
"setupFiles": [
"<rootDir>/.jest/shim.js",
"<rootDir>/.jest/test-setup.js"
],
"testPathIgnorePatterns": [
"/node_modules/",
"<rootDir>/.jest"
],
"transformIgnorePatterns": [
"<rootDir>/node_modules/(!@material)"
]
}
120 changes: 69 additions & 51 deletions package-lock.json

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

37 changes: 7 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"lint": "eslint --ext .js .",
"semantic-release": "semantic-release",
"test": "npm run lint && npm run test:vulnerabilities && npm run test:scripts",
"test:scripts": "jest --coverage",
"test:scripts": "jest --coverage --config ./jest.config.json",
"test:vulnerabilities": "nsp check"
},
"repository": {
Expand All @@ -28,10 +28,10 @@
},
"homepage": "https://github.com/materialr/linear-progress#readme",
"dependencies": {
"@material/linear-progress": "^0.33.0",
"@material/linear-progress": "^0.34.0",
"classnames": "^2.2.5",
"prop-types": "^15.6.1",
"react": "^16.2.0"
"react": "^16.3.1"
},
"devDependencies": {
"babel-cli": "^6.26.0",
Expand All @@ -43,37 +43,14 @@
"coveralls": "^3.0.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"eslint": "^4.19.0",
"eslint": "^4.19.1",
"eslint-config-airbnb": "^16.1.0",
"eslint-plugin-import": "^2.9.0",
"eslint-plugin-import": "^2.11.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.7.0",
"jest": "^22.4.3",
"nsp": "^3.2.1",
"react-dom": "^16.2.0",
"semantic-release": "^15.1.3"
},
"jest": {
"coveragePathIgnorePatterns": [
"/node_modules/",
"<rootDir>/.jest"
],
"moduleNameMapper": {
"\\.scss$": "<rootDir>/.jest/style-mock.js"
},
"roots": [
"<rootDir>/src"
],
"setupFiles": [
"<rootDir>/.jest/shim.js",
"<rootDir>/.jest/test-setup.js"
],
"testPathIgnorePatterns": [
"/node_modules/",
"<rootDir>/.jest"
],
"transformIgnorePatterns": [
"<rootDir>/node_modules/(!@material)"
]
"react-dom": "^16.3.1",
"semantic-release": "^15.1.7"
}
}

0 comments on commit 31ac9e5

Please sign in to comment.