Merge pull request #309 from cwillisf/standardize-settings

Standardize settings
This commit is contained in:
Chris Willis-Ford authored and GitHub committed 2017-04-19 09:51:30 -07:00
commit a151f4bfb2
4 files changed
+7 -2

No files matched your search

+2
View File
@@ -14,9 +14,11 @@
*.js text eol=lf
*.js.map text eol=lf
*.json text eol=lf
*.jsx text eol=lf
*.md text eol=lf
*.vert text eol=lf
*.xml text eol=lf
*.yml text eol=lf
# Prefer LF for these files
.editorconfig text eol=lf
+1 -1
View File
@@ -1,7 +1,7 @@
language: node_js
node_js:
- '4.2'
- 'stable'
- 'node'
cache:
directories:
- node_modules
+3 -1
View File
@@ -5,7 +5,7 @@
"main": "./src/index.js",
"scripts": {
"build": "npm run clean && webpack --progress --colors --bail",
"clean": "rm -rf ./build && mkdir -p build",
"clean": "rimraf ./build && mkdirp build",
"deploy": "touch build/.nojekyll && gh-pages -t -d build -m \"Build for $(git log --pretty=format:%H -n1)\"",
"lint": "eslint . --ext .js,.jsx",
"start": "webpack-dev-server",
@@ -43,6 +43,7 @@
"lodash.isequal": "4.5.0",
"lodash.omit": "4.5.0",
"lodash.pick": "4.4.0",
"mkdirp": "^0.5.1",
"minilog": "3.1.0",
"postcss-import": "9.1.0",
"postcss-loader": "1.3.3",
@@ -55,6 +56,7 @@
"react-tabs": "0.8.2",
"redux": "3.6.0",
"redux-throttle": "0.1.1",
"rimraf": "^2.6.1",
"scratch-audio": "latest",
"scratch-blocks": "latest",
"scratch-render": "latest",
+1
View File
@@ -16,6 +16,7 @@ module.exports = {
host: '0.0.0.0',
port: process.env.PORT || 8601
},
devtool: 'cheap-module-source-map',
entry: {
lib: ['react', 'react-dom'],
gui: './src/index.jsx'