Update dependencies and start using yarn (#506)
This commit is contained in:
parent
9d13c985c2
commit
eb240af15b
4 changed files with 5785 additions and 23 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -39,6 +39,10 @@ node_modules/
|
|||
npm-debug.log
|
||||
.npminstall
|
||||
|
||||
# yarn
|
||||
#
|
||||
.yarninstall
|
||||
|
||||
# BUCK
|
||||
buck-out/
|
||||
\.buckd/
|
||||
|
|
|
|||
14
Makefile
14
Makefile
|
|
@ -6,15 +6,15 @@
|
|||
ios_target := $(filter-out build-ios,$(MAKECMDGOALS))
|
||||
android_target := $(filter-out build-android,$(MAKECMDGOALS))
|
||||
|
||||
.npminstall: package.json
|
||||
@if ! [ $(shell command -v npm 2> /dev/null) ]; then \
|
||||
echo "npm is not installed"; \
|
||||
.yarninstall: package.json
|
||||
@if ! [ $(shell command -v yarn 2> /dev/null) ]; then \
|
||||
echo "yarn is not installed https://yarnpkg.com"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
@echo Getting dependencies using npm
|
||||
|
||||
npm install
|
||||
yarn install
|
||||
|
||||
touch $@
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ dist/assets: $(BASE_ASSETS) $(OVERRIDE_ASSETS)
|
|||
|
||||
node scripts/make-dist-assets.js
|
||||
|
||||
pre-run: .npminstall dist/assets
|
||||
pre-run: .yarninstall dist/assets
|
||||
|
||||
run: run-ios
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ run-android: | start prepare-android-build
|
|||
test: pre-run
|
||||
npm test
|
||||
|
||||
check-style: .npminstall
|
||||
check-style: .yarninstall
|
||||
@echo Checking for style guide compliance
|
||||
|
||||
npm run check
|
||||
|
|
@ -88,7 +88,7 @@ clean:
|
|||
|
||||
npm cache clean
|
||||
rm -rf node_modules
|
||||
rm -f .npminstall
|
||||
rm -f .yarninstall
|
||||
rm -rf dist
|
||||
|
||||
post-install:
|
||||
|
|
|
|||
38
package.json
38
package.json
|
|
@ -1,6 +1,10 @@
|
|||
{
|
||||
"name": "Mattermost",
|
||||
"name": "mattermost-mobile",
|
||||
"version": "0.0.1",
|
||||
"description": "Mattermost Mobile with React Native",
|
||||
"repository": "git@github.com:mattermost/mattermost-mobile.git",
|
||||
"author": "Mattermost, Inc.",
|
||||
"license": "Apache 2.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"commonmark": "hmhealey/commonmark.js#46784f1461fa34e148940534c1763af6d344ab0f",
|
||||
|
|
@ -15,9 +19,9 @@
|
|||
"react-native-bottom-sheet": "1.0.1",
|
||||
"react-native-button": "1.8.2",
|
||||
"react-native-cookies": "2.0.0",
|
||||
"react-native-device-info": "0.10.1",
|
||||
"react-native-device-info": "0.10.2",
|
||||
"react-native-drawer": "2.3.0",
|
||||
"react-native-image-crop-picker": "0.12.9",
|
||||
"react-native-image-crop-picker": "0.13.0",
|
||||
"react-native-keyboard-aware-scroll-view": "0.2.8",
|
||||
"react-native-linear-gradient": "2.0.0",
|
||||
"react-native-message-bar": "1.6.0",
|
||||
|
|
@ -25,12 +29,12 @@
|
|||
"react-native-push-notification": "2.2.1",
|
||||
"react-native-search-bar": "enahum/react-native-search-bar.git",
|
||||
"react-native-smart-splash-screen": "2.3.3",
|
||||
"react-native-svg": "5.1.6",
|
||||
"react-native-svg": "5.1.7",
|
||||
"react-native-tooltip": "5.0.0",
|
||||
"react-native-vector-icons": "4.0.0",
|
||||
"react-redux": "5.0.3",
|
||||
"react-native-vector-icons": "4.0.1",
|
||||
"react-redux": "5.0.4",
|
||||
"redux": "3.6.0",
|
||||
"redux-batched-actions": "0.1.5",
|
||||
"redux-batched-actions": "0.2.0",
|
||||
"redux-persist": "4.6.0",
|
||||
"redux-persist-transform-filter": "0.0.9",
|
||||
"redux-thunk": "2.2.0",
|
||||
|
|
@ -39,25 +43,27 @@
|
|||
"url-parse" : "1.1.8"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-cli": "6.24.0",
|
||||
"babel-eslint": "7.2.1",
|
||||
"babel-cli": "6.24.1",
|
||||
"babel-eslint": "7.2.3",
|
||||
"babel-plugin-module-resolver": "2.7.0",
|
||||
"babel-preset-es2015": "6.24.0",
|
||||
"babel-preset-stage-0": "6.22.0",
|
||||
"babel-preset-es2015": "6.24.1",
|
||||
"babel-preset-latest": "6.24.1",
|
||||
"babel-preset-react": "6.24.1",
|
||||
"babel-preset-react-native": "1.9.1",
|
||||
"babel-register": "6.24.0",
|
||||
"babel-preset-stage-0": "6.24.1",
|
||||
"babel-register": "6.24.1",
|
||||
"chai": "3.5.0",
|
||||
"chai-enzyme": "0.6.1",
|
||||
"deep-freeze": "0.0.1",
|
||||
"enzyme": "2.8.0",
|
||||
"enzyme": "2.8.2",
|
||||
"eslint": "3.19.0",
|
||||
"eslint-plugin-mocha": "4.9.0",
|
||||
"eslint-plugin-react": "6.10.3",
|
||||
"fetch-mock": "5.9.4",
|
||||
"form-data": "2.1.2",
|
||||
"fetch-mock": "5.10.0",
|
||||
"form-data": "2.1.4",
|
||||
"jsdom": "9.12.0",
|
||||
"jsdom-global": "2.1.1",
|
||||
"mocha": "3.2.0",
|
||||
"mocha": "3.3.0",
|
||||
"mocha-react-native": "0.5.0",
|
||||
"react-addons-test-utils": "15.4.2",
|
||||
"react-dom": "15.4.2",
|
||||
|
|
|
|||
Loading…
Reference in a new issue