-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #416 from cozy/master
Release v0.6.0 π π
- Loading branch information
Showing
192 changed files
with
5,161 additions
and
2,693 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,9 @@ yarn-error.log | |
build/ | ||
coverage/ | ||
|
||
# Stack | ||
storage/ | ||
|
||
# Locales | ||
**/locales/* | ||
!**/locales/en.json | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"name": "cozy-drive", | ||
"version": "0.5.0", | ||
"version": "0.6.0", | ||
"main": "src/main.jsx", | ||
"scripts": { | ||
"build:drive": "npm run build:drive:browser", | ||
|
@@ -9,21 +9,26 @@ | |
"build:photos": "npm run build:photos:browser", | ||
"build:photos:browser": "npm run internal:build -- --env.app=photos --env.target=browser --env.production", | ||
"clean:browser": "rm -rf build/*", | ||
"clean:drive:browser": "rm -rf build/drive/*", | ||
"clean:photos:browser": "rm -rf build/photos/*", | ||
"clean:mobile": "rm -rf targets/*/mobile/www/*", | ||
"deploy:drive": "git-directory-deploy --directory=build/drive/ --username=Cozy [email protected] --repo=https://[email protected]/cozy/cozy-drive.git", | ||
"deploy:photos": "git-directory-deploy --directory=build/photos/ --username=Cozy [email protected] --repo=https://[email protected]/cozy/cozy-drive.git", | ||
"internal:build": "webpack --config webpack.config.js --bail", | ||
"internal:watch": "webpack --config webpack.config.js --watch --display-modules --display-chunks", | ||
"tx": "tx pull --all || true", | ||
"preinternal:build": "npm-run-all lint tx", | ||
"prebuild:browser": "npm run clean:browser", | ||
"prebuild:mobile": "npm run clean:mobile", | ||
"prebuild:drive:browser": "npm run clean:drive:browser", | ||
"prebuild:photos:browser": "npm run clean:photos:browser", | ||
"prebuild:drive:mobile": "npm run clean:mobile", | ||
"pretest": "npm run lint", | ||
"prewatch:browser": "npm run clean:browser", | ||
"prewatch:mobile": "npm run clean:mobile", | ||
"prewatch:drive:browser": "npm run clean:browser", | ||
"prewatch:photos:browser": "npm run clean:browser", | ||
"prewatch:drive:mobile": "npm run clean:mobile", | ||
"lint": "npm-run-all --parallel 'lint:*'", | ||
"lint:js": "standard --parser babel-eslint 'src/**/*.js' 'src/**/*.jsx' 'test/**/*.js'", | ||
"lint:styles": "stylint src/drive/styles --config ./.stylintrc", | ||
"lint:js": "eslint \"{src,test}/**/*.{js,jsx}\"", | ||
"precommit": "lint-staged", | ||
"test": "node_modules/.bin/jest --coverage --config=jest.config.json", | ||
"watch:drive": "npm run watch:drive:browser", | ||
"watch:drive:browser": "npm run internal:watch -- --env.app=drive --env.target=browser", | ||
|
@@ -67,7 +72,7 @@ | |
"devDependencies": { | ||
"autoprefixer": "^6.5.0", | ||
"babel-core": "^6.0.0", | ||
"babel-eslint": "^7.2.1", | ||
"babel-eslint": "^8.0.0", | ||
"babel-jest": "^18.0.0", | ||
"babel-loader": "^6.0.0", | ||
"babel-plugin-transform-class-properties": "^6.23.0", | ||
|
@@ -84,26 +89,38 @@ | |
"css-mqpacker": "^4.0.1", | ||
"csswring": "^5.1.1", | ||
"enzyme": "^2.7.0", | ||
"eslint": "^4.7.2", | ||
"eslint-config-prettier": "^2.5.0", | ||
"eslint-config-standard": "^10.2.1", | ||
"eslint-config-standard-react": "^5.0.0", | ||
"eslint-plugin-import": "^2.7.0", | ||
"eslint-plugin-node": "^5.1.1", | ||
"eslint-plugin-prettier": "^2.3.1", | ||
"eslint-plugin-promise": "^3.5.0", | ||
"eslint-plugin-react": "^7.3.0", | ||
"eslint-plugin-standard": "^3.0.1", | ||
"extract-text-webpack-plugin": "^3.0.0", | ||
"file-loader": "^0.9.0", | ||
"git-directory-deploy": "^1.5.0", | ||
"html-webpack-plugin": "^2.30.1", | ||
"husky": "^0.14.3", | ||
"identity-obj-proxy": "^3.0.0", | ||
"imports-loader": "^0.7.0", | ||
"jest": "^20.0.4", | ||
"json-loader": "^0.5.0", | ||
"lint-staged": "^4.2.1", | ||
"npm-run-all": "^3.1.0", | ||
"postcss": "^5.2.0", | ||
"postcss-assets-webpack-plugin": "^1.0.0", | ||
"postcss-discard-duplicates": "^2.0.2", | ||
"postcss-loader": "^1.1.0", | ||
"prettier": "^1.7.0", | ||
"react": "^15.4.0", | ||
"react-addons-test-utils": "^15.4.2", | ||
"react-dom": "^15.4.0", | ||
"react-test-renderer": "^15.4.0", | ||
"script-ext-html-webpack-plugin": "^1.8.5", | ||
"splashicon-generator": "0.2.12", | ||
"standard": "^8.6.0", | ||
"style-loader": "^0.13.0", | ||
"stylint": "^1.5.9", | ||
"stylus": "^0.54.0", | ||
|
@@ -116,7 +133,7 @@ | |
"dependencies": { | ||
"classnames": "^2.2.0", | ||
"cozy-bar": "4.1.4", | ||
"cozy-client-js": "0.3.14", | ||
"cozy-client-js": "0.3.19", | ||
"cozy-ui": "3.0.0-beta46", | ||
"date-fns": "^1.22.0", | ||
"diacritics": "^1.3.0", | ||
|
@@ -168,10 +185,48 @@ | |
"cozy": {} | ||
} | ||
}, | ||
"standard": { | ||
"env": [ | ||
"browser", | ||
"jest" | ||
"eslintConfig": { | ||
"extends": [ | ||
"standard", | ||
"standard-react", | ||
"prettier", | ||
"prettier/react", | ||
"prettier/standard" | ||
], | ||
"plugins": [ | ||
"react", | ||
"prettier", | ||
"standard" | ||
], | ||
"parser": "babel-eslint", | ||
"parserOptions": { | ||
"ecmaFeatures": { | ||
"jsx": true | ||
} | ||
}, | ||
"rules": { | ||
"prettier/prettier": "error", | ||
"react/prop-types": [ | ||
2, | ||
{ | ||
"skipUndeclared": true | ||
} | ||
], | ||
"react/jsx-no-bind": 1 | ||
}, | ||
"env": { | ||
"browser": true, | ||
"jest": true | ||
} | ||
}, | ||
"prettier": { | ||
"semi": false, | ||
"singleQuote": true | ||
}, | ||
"lint-staged": { | ||
"{src,test}/**/*.{js,jsx}": [ | ||
"prettier --write", | ||
"git add" | ||
] | ||
} | ||
} |
Oops, something went wrong.