Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update dependencies and make test case non-OS specific #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update dependencies and make test case non-OS specific #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a768918
update dependencies and make test case non-OS specific
Oct 19, 2017
3cd357d
update package.json
Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
},
"devDependencies": {
"ava": "^0.19.1",
"neutrino": "^5.6.0",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"typescript": "^2.2.2"
"neutrino": "^5.9.0",
"react": "^15.6.2",
"react-dom": "^15.6.2",
"typescript": "^2.5.3"
},
"dependencies": {
"neutrino-preset-ts": "^1.5.5",
"react-hot-loader": "3.0.0-beta.6"
"react-hot-loader": "^3.1.1"
}
}
5 changes: 2 additions & 3 deletions tests/ts-react.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ test('preset development has hmr enabled for react', t => {
const api = Neutrino();
api.use(require('..'));
const config = api.config.toConfig();
t.is(config.entry.index[0], join(api.options.root, 'node_modules\\react-hot-loader\\patch.js'));
const regexp = new RegExp(join(api.options.root, 'node_modules[\\/]react-hot-loader[\\/]patch.js'));
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please explain a bit more about this change?
Would like to know how it effects the non-OS-specificity.

t.is(regexp.test(config.entry.index[0]), true);
});

test('preset development has tsx extension', t => {
Expand All @@ -89,5 +90,3 @@ test('preset production has tsx extension', t => {
const config = api.config.toConfig();
t.true(config.resolve.extensions.indexOf('.tsx') > -1);
});


113 changes: 73 additions & 40 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ babel-runtime@^6.0.0, babel-runtime@^6.22.0:
core-js "^2.4.0"
regenerator-runtime "^0.10.0"

babel-template@^6.24.1, babel-template@^6.7.0:
babel-template@^6.24.1:
version "6.24.1"
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333"
dependencies:
Expand Down Expand Up @@ -1408,6 +1408,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
create-hash "^1.1.0"
inherits "^2.0.1"

create-react-class@^15.6.0:
version "15.6.2"
resolved "http://10.100.3.73/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
dependencies:
fbjs "^0.8.9"
loose-envify "^1.3.1"
object-assign "^4.1.1"

cross-spawn-async@^2.1.1:
version "2.2.5"
resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
Expand Down Expand Up @@ -1966,6 +1974,18 @@ faye-websocket@~0.11.0:
dependencies:
websocket-driver ">=0.5.1"

fbjs@^0.8.16:
version "0.8.16"
resolved "http://10.100.3.73/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
dependencies:
core-js "^1.0.0"
isomorphic-fetch "^2.1.1"
loose-envify "^1.0.0"
object-assign "^4.1.0"
promise "^7.1.1"
setimmediate "^1.0.5"
ua-parser-js "^0.7.9"

fbjs@^0.8.9:
version "0.8.12"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
Expand Down Expand Up @@ -3076,7 +3096,7 @@ longest@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"

loose-envify@^1.0.0, loose-envify@^1.1.0:
loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
dependencies:
Expand Down Expand Up @@ -3391,7 +3411,7 @@ neutrino-middleware-ts-loader@^2.3.1:

neutrino-preset-ts@^1.5.5:
version "1.5.5"
resolved "https://registry.yarnpkg.com/neutrino-preset-ts/-/neutrino-preset-ts-1.5.5.tgz#f28a178eaac6f2f85d067d9e9818641a30bcd15a"
resolved "http://10.100.3.73/neutrino-preset-ts/-/neutrino-preset-ts-1.5.5.tgz#f28a178eaac6f2f85d067d9e9818641a30bcd15a"
dependencies:
exports-loader "^0.6.4"
imports-loader "^0.7.1"
Expand All @@ -3414,9 +3434,9 @@ neutrino-preset-ts@^1.5.5:
webpack-dev-server "^2.4.3"
worker-loader "^0.8.0"

neutrino@^5.6.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/neutrino/-/neutrino-5.6.0.tgz#b12d49f877d11f5a0302086b745c9a4328399900"
neutrino@^5.9.0:
version "5.9.0"
resolved "http://10.100.3.73/neutrino/-/neutrino-5.9.0.tgz#06559f14c1bf2769199c86ffcd3e50562177124f"
dependencies:
deep-sort-object "^1.0.1"
deepmerge "^1.3.2"
Expand All @@ -3429,7 +3449,7 @@ neutrino@^5.6.0:
ora "^1.2.0"
ramda "^0.23.0"
ramda-fantasy "^0.7.0"
webpack "^2.3.1"
webpack "^2.4.1"
webpack-chain "^3.2.0"
webpack-dev-server "^2.4.2"
yargs "^7.0.2"
Expand Down Expand Up @@ -3569,7 +3589,7 @@ oauth-sign@~0.8.1:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"

object-assign@^4.0.1, object-assign@^4.1.0:
object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"

Expand Down Expand Up @@ -3627,7 +3647,7 @@ option-chain@^0.1.0:
object-assign "^4.0.1"

optional@^0.1.3:
version v0.1.3
version "0.1.3"
resolved "https://registry.yarnpkg.com/optional/-/optional-0.1.3.tgz#f87537517b59a5e732cfd8f18e4f7eea7ab4761e"

ora@^1.2.0:
Expand Down Expand Up @@ -4159,7 +4179,15 @@ promise@^7.1.1:
dependencies:
asap "~2.0.3"

prop-types@^15.5.4, prop-types@^15.5.7, prop-types@~15.5.7:
prop-types@^15.5.10:
version "15.6.0"
resolved "http://10.100.3.73/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.3.1"
object-assign "^4.1.1"

prop-types@^15.5.4:
version "15.5.8"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
dependencies:
Expand Down Expand Up @@ -4259,44 +4287,44 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"

react-deep-force-update@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz#4f7f6c12c3e7de42f345992a3c518236fa1ecad3"
react-deep-force-update@^2.1.1:
version "2.1.1"
resolved "http://10.100.3.73/react-deep-force-update/-/react-deep-force-update-2.1.1.tgz#8ea4263cd6455a050b37445b3f08fd839d86e909"

react-dom@^15.5.4:
version "15.5.4"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.5.4.tgz#ba0c28786fd52ed7e4f2135fe0288d462aef93da"
react-dom@^15.6.2:
version "15.6.2"
resolved "http://10.100.3.73/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
dependencies:
fbjs "^0.8.9"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "~15.5.7"
prop-types "^15.5.10"

react-hot-loader@3.0.0-beta.6:
version "3.0.0-beta.6"
resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-3.0.0-beta.6.tgz#463fac0bfc8b63a8385258af20c91636abce75f4"
react-hot-loader@^3.1.1:
version "3.1.1"
resolved "http://10.100.3.73/react-hot-loader/-/react-hot-loader-3.1.1.tgz#e06db8cd0841c41e3ab0b395b2b774126fc8914e"
dependencies:
babel-template "^6.7.0"
global "^4.3.0"
react-deep-force-update "^2.0.1"
react-deep-force-update "^2.1.1"
react-proxy "^3.0.0-alpha.0"
redbox-react "^1.2.5"
source-map "^0.4.4"
redbox-react "^1.3.6"
source-map "^0.6.1"

react-proxy@^3.0.0-alpha.0:
version "3.0.0-alpha.1"
resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz#4400426bcfa80caa6724c7755695315209fa4b07"
dependencies:
lodash "^4.6.1"

react@^15.5.4:
version "15.5.4"
resolved "https://registry.yarnpkg.com/react/-/react-15.5.4.tgz#fa83eb01506ab237cdc1c8c3b1cea8de012bf047"
react@^15.6.2:
version "15.6.2"
resolved "http://10.100.3.73/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
dependencies:
create-react-class "^15.6.0"
fbjs "^0.8.9"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.7"
prop-types "^15.5.10"

read-pkg-up@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -4358,13 +4386,14 @@ readdirp@^2.0.0:
readable-stream "^2.0.2"
set-immediate-shim "^1.0.1"

redbox-react@^1.2.5:
version "1.3.6"
resolved "https://registry.yarnpkg.com/redbox-react/-/redbox-react-1.3.6.tgz#70314c57c066257eb70b0a24dc794b5cef4f1c4e"
redbox-react@^1.3.6:
version "1.5.0"
resolved "http://10.100.3.73/redbox-react/-/redbox-react-1.5.0.tgz#04dab11557d26651bf3562a67c22ace56c5d3967"
dependencies:
error-stack-parser "^1.3.6"
object-assign "^4.0.1"
prop-types "^15.5.4"
sourcemapped-stacktrace "^1.1.6"

redent@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -4725,22 +4754,26 @@ source-map-support@^0.4.0, source-map-support@^0.4.2:
dependencies:
source-map "^0.5.6"

[email protected], source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
[email protected].6, [email protected].x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
version "0.5.6"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"

source-map@^0.4.4:
version "0.4.4"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
dependencies:
amdefine ">=0.0.4"
source-map@^0.6.1:
version "0.6.1"
resolved "http://10.100.3.73/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"

source-map@~0.1.33:
version "0.1.43"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
dependencies:
amdefine ">=0.0.4"

sourcemapped-stacktrace@^1.1.6:
version "1.1.7"
resolved "http://10.100.3.73/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.7.tgz#17e05374ff78b71a9d89ad3975a49f22725ba935"
dependencies:
source-map "0.5.6"

spdx-correct@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
Expand Down Expand Up @@ -5056,9 +5089,9 @@ type-is@~1.6.14:
media-typer "0.3.0"
mime-types "~2.1.15"

typescript@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.2.2.tgz#606022508479b55ffa368b58fee963a03dfd7b0c"
typescript@^2.5.3:
version "2.5.3"
resolved "http://10.100.3.73/typescript/-/typescript-2.5.3.tgz#df3dcdc38f3beb800d4bc322646b04a3f6ca7f0d"

ua-parser-js@^0.7.9:
version "0.7.12"
Expand Down