Skip to content

Commit

Permalink
Merge branch 'master' into dependencies.io-update-build-162.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Hypnosphi
Hypnosphi authored Jan 8, 2018
2 parents b588ec7 + e696379 commit acad559
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 38 deletions.
2 changes: 1 addition & 1 deletion app/angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"babel-plugin-transform-decorators-legacy": "^1.3.4",
"codelyzer": "^3.1.2",
"mock-fs": "^4.3.0",
"nodemon": "^1.14.8",
"nodemon": "^1.14.9",
"typescript": "^2.4.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions app/react-native/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
"ws": "^3.3.3"
},
"devDependencies": {
"react-native": "^0.51.0"
"react-native": "^0.52.0"
},
"peerDependencies": {
"babel-core": "^6.26.0 || ^7.0.0-0",
"react": "*",
"react-native": ">=0.27.0"
"react-native": "0.52.0"
}
}
4 changes: 2 additions & 2 deletions app/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"json-stringify-safe": "^5.0.1",
"json5": "^0.5.1",
"lodash.flattendeep": "^4.4.0",
"markdown-loader": "^2.0.1",
"markdown-loader": "^2.0.2",
"npmlog": "^4.1.2",
"postcss-flexbugs-fixes": "^3.2.0",
"postcss-loader": "^2.0.10",
Expand All @@ -83,7 +83,7 @@
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"nodemon": "^1.14.8"
"nodemon": "^1.14.9"
},
"peerDependencies": {
"babel-core": "^6.26.0 || ^7.0.0-0",
Expand Down
2 changes: 1 addition & 1 deletion app/vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"nodemon": "^1.14.8",
"nodemon": "^1.14.9",
"vue": "^2.5.13",
"vue-loader": "^13.6.2",
"vue-template-compiler": "^2.5.13"
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"docs:deploy:manual": "npm --prefix docs run deploy:manual",
"docs:dev": "npm --prefix docs run dev",
"github-release": "github-release-from-changelog",
"lint": "yarn lint:js . && yarn lint:ts && yarn lint:md .",
"lint": "yarn lint:js . && yarn lint:ts **/*.ts && yarn lint:md .",
"lint:js": "cross-env NODE_ENV=production eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.json",
"lint:ts": "tslint -p . -t stylish -e '{**/node_modules/**,**/dist/**,lib/cli/test/**,**/storybook-static/**}' **/*.ts",
"lint:ts": "tslint -p . -c tslint.json -t stylish",
"lint:md": "remark",
"publish": "lerna publish",
"postpublish": "yarn --cwd lib/cli test -o",
Expand Down Expand Up @@ -77,7 +77,7 @@
"lerna": "^2.5.1",
"lint-staged": "^6.0.0",
"lodash": "^4.17.4",
"nodemon": "^1.14.8",
"nodemon": "^1.14.9",
"npmlog": "^4.1.2",
"prettier": "^1.9.2",
"puppeteer": "^0.13.0",
Expand Down
8 changes: 8 additions & 0 deletions tslint.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,5 +146,13 @@
"no-access-missing-member": true,
"templates-use-public": true,
"invoke-injectable": true
},
"linterOptions": {
"exclude": [
"lib/cli/test/**",
"**/node_modules/**",
"**/dist/**",
"**/storybook-static/**"
]
}
}
105 changes: 76 additions & 29 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ babel-eslint@^8.1.2:
eslint-scope "~3.7.1"
eslint-visitor-keys "^1.0.0"

babel-generator@^6.18.0, babel-generator@^6.24.1, babel-generator@^6.26.0:
babel-generator@^6.18.0, babel-generator@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
dependencies:
Expand Down Expand Up @@ -7613,15 +7613,21 @@ jest-diff@^22.0.3:
jest-get-type "^22.0.3"
pretty-format "^22.0.3"

[email protected]:
version "22.0.0"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.0.0.tgz#2e6a79360172b90bd2cd235a4832e38388b3b658"
dependencies:
detect-newline "^2.1.0"

jest-docblock@^20.0.3:
version "20.0.3"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"

jest-docblock@^21, jest-docblock@^21.0.0, jest-docblock@^21.2.0:
jest-docblock@^21.0.0, jest-docblock@^21.2.0:
version "21.2.0"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"

jest-docblock@^22.0.3:
jest-docblock@^22.0.0, jest-docblock@^22.0.3:
version "22.0.3"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.0.3.tgz#c33aa22682b9fc68a5373f5f82994428a2ded601"
dependencies:
Expand Down Expand Up @@ -7687,6 +7693,17 @@ jest-get-type@^22.0.3:
version "22.0.3"
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.0.3.tgz#fa894b677c0fcd55eff3fd8ee28c7be942e32d36"

[email protected]:
version "22.0.0"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.0.0.tgz#aa0730a16a07c287100c0c213c118dc9a4255d2d"
dependencies:
fb-watchman "^2.0.0"
graceful-fs "^4.1.11"
jest-docblock "^22.0.0"
jest-worker "^22.0.0"
micromatch "^2.3.11"
sane "^2.0.0"

jest-haste-map@^20.0.4:
version "20.0.5"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.0.5.tgz#abad74efb1a005974a7b6517e11010709cab9112"
Expand All @@ -7698,7 +7715,7 @@ jest-haste-map@^20.0.4:
sane "~1.6.0"
worker-farm "^1.3.1"

jest-haste-map@^21, jest-haste-map@^21.2.0:
jest-haste-map@^21.2.0:
version "21.2.0"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-21.2.0.tgz#1363f0a8bb4338f24f001806571eff7a4b2ff3d8"
dependencies:
Expand Down Expand Up @@ -8099,7 +8116,13 @@ jest-validate@^22.0.3:
leven "^2.1.0"
pretty-format "^22.0.3"

jest-worker@^22.0.3:
[email protected]:
version "22.0.0"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.0.0.tgz#4a276938a2077e1d72b6a2acd1d43826a9fd07f8"
dependencies:
merge-stream "^1.0.1"

jest-worker@^22.0.0, jest-worker@^22.0.3:
version "22.0.3"
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.0.3.tgz#30433faca67814a8f80559f75ab2ceaa61332fd2"
dependencies:
Expand Down Expand Up @@ -9173,18 +9196,18 @@ markdown-it@^8.4.0:
mdurl "^1.0.1"
uc.micro "^1.0.3"

markdown-loader@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/markdown-loader/-/markdown-loader-2.0.1.tgz#eed8bead82978bacf17b76a11c5593a013e2d976"
markdown-loader@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/markdown-loader/-/markdown-loader-2.0.2.tgz#1cdcf11307658cd611046d7db34c2fe80542af7c"
dependencies:
loader-utils "^1.1.0"
marked "^0.3.6"
marked "^0.3.9"

markdown-table@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c"

marked@^0.3.6, marked@^0.3.9:
marked@^0.3.9:
version "0.3.9"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.9.tgz#54ce6a57e720c3ac6098374ec625fcbcc97ff290"

Expand Down Expand Up @@ -9302,14 +9325,24 @@ methods@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"

metro-bundler@^0.20.0:
version "0.20.3"
resolved "https://registry.yarnpkg.com/metro-bundler/-/metro-bundler-0.20.3.tgz#0ded01b64e8963117017b106f75b83cfc34f3656"
[email protected], metro-core@^0.24.1:
version "0.24.3"
resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.24.3.tgz#be3bea5555759d11c63e110f30f555bcf936b784"

[email protected]:
version "0.24.3"
resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.24.3.tgz#46c6dea295b6b394cad0208c48e9cadb2f25e09b"
dependencies:
source-map "^0.5.6"

metro@^0.24.1:
version "0.24.3"
resolved "https://registry.yarnpkg.com/metro/-/metro-0.24.3.tgz#fc3064a022ff08ad18e4df3c568da9b0622f556c"
dependencies:
absolute-path "^0.0.0"
async "^2.4.0"
babel-core "^6.24.1"
babel-generator "^6.24.1"
babel-generator "^6.26.0"
babel-plugin-external-helpers "^6.18.0"
babel-preset-es2015-node "^6.1.1"
babel-preset-fbjs "^2.1.4"
Expand All @@ -9318,30 +9351,36 @@ metro-bundler@^0.20.0:
babylon "^6.18.0"
chalk "^1.1.1"
concat-stream "^1.6.0"
connect "^2.8.3"
core-js "^2.2.2"
debug "^2.2.0"
denodeify "^1.2.1"
fbjs "^0.8.14"
fs-extra "^1.0.0"
graceful-fs "^4.1.3"
image-size "^0.6.0"
jest-docblock "^21"
jest-haste-map "^21"
jest-docblock "22.0.0"
jest-haste-map "22.0.0"
jest-worker "22.0.0"
json-stable-stringify "^1.0.1"
json5 "^0.4.0"
left-pad "^1.1.3"
lodash "^4.16.6"
merge-stream "^1.0.1"
metro-core "0.24.3"
metro-source-map "0.24.3"
mime-types "2.1.11"
mkdirp "^0.5.1"
request "^2.79.0"
rimraf "^2.5.4"
source-map "^0.5.6"
temp "0.8.3"
throat "^4.1.0"
uglify-es "^3.1.8"
uglify-es "^3.1.9"
wordwrap "^1.0.0"
write-file-atomic "^1.2.0"
xpipe "^1.0.5"
yargs "^9.0.0"

micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
version "2.3.11"
Expand Down Expand Up @@ -9820,9 +9859,9 @@ node-version@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.1.0.tgz#f437d7ba407e65e2c4eaef8887b1718ba523d4f0"

nodemon@^1.14.8:
version "1.14.8"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.14.8.tgz#0cc906035e2d4bf771d5f40fb5d8e37fb3e673e7"
nodemon@^1.14.9:
version "1.14.9"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.14.9.tgz#eec45a916db61503264037b4233c0f8a15d69802"
dependencies:
chokidar "^1.7.0"
debug "^2.6.8"
Expand Down Expand Up @@ -11518,9 +11557,9 @@ react-dev-utils@^4.2.1:
strip-ansi "3.0.1"
text-table "0.2.0"

react-devtools-core@^2.5.0:
version "2.5.2"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-2.5.2.tgz#f97bec5afae5d9318d16778065e0c214c4d5714c"
react-devtools-core@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.0.0.tgz#f683e19f0311108f97dbb5b29d948323a1bf7c03"
dependencies:
shell-quote "^1.6.1"
ws "^2.0.3"
Expand Down Expand Up @@ -11607,9 +11646,9 @@ react-native-iphone-x-helper@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.0.1.tgz#950dbdaca66f458689a7e9697c5beb9bd53f98f2"

react-native@^0.51.0:
version "0.51.0"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.51.0.tgz#fe25934b3030fd323f3ca1a70f034133465955ed"
react-native@^0.52.0:
version "0.52.0"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.52.0.tgz#9784663a2aa40b30c87d4c9c06ef26cf8d419d91"
dependencies:
absolute-path "^0.0.0"
art "^0.10.0"
Expand Down Expand Up @@ -11638,7 +11677,8 @@ react-native@^0.51.0:
graceful-fs "^4.1.3"
inquirer "^3.0.6"
lodash "^4.16.6"
metro-bundler "^0.20.0"
metro "^0.24.1"
metro-core "^0.24.1"
mime "^1.3.4"
minimist "^1.2.0"
mkdirp "^0.5.1"
Expand All @@ -11652,7 +11692,7 @@ react-native@^0.51.0:
promise "^7.1.1"
prop-types "^15.5.8"
react-clone-referenced-element "^1.0.1"
react-devtools-core "^2.5.0"
react-devtools-core "3.0.0"
react-timer-mixin "^0.13.2"
regenerator-runtime "^0.11.0"
rimraf "^2.5.4"
Expand Down Expand Up @@ -14239,7 +14279,14 @@ uc.micro@^1.0.1, uc.micro@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"

uglify-es@^3.1.8, uglify-es@^3.3.4:
uglify-es@^3.1.9:
version "3.3.5"
resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.5.tgz#cf7e695da81999f85196b15e2978862f13212f88"
dependencies:
commander "~2.12.1"
source-map "~0.6.1"

uglify-es@^3.3.4:
version "3.3.4"
resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.4.tgz#2d592678791e5310456bbc95e952139e3b13167a"
dependencies:
Expand Down

0 comments on commit acad559

Please sign in to comment.