Skip to content

Updating to [email protected] #45

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

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

Updating to [email protected] #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7b1c5c5
Updating packages to Systemjs 0.20.9 jspm 0.17.0-beta.40
wongwill86 Mar 4, 2017
b9df422
fetch was added to ts lib, we can remove jspm dep too
wongwill86 Mar 4, 2017
5d39ffd
undoing returntypeof import
wongwill86 Mar 6, 2017
a03c76c
updating yarn lockfile to reflect jspm
wongwill86 Mar 6, 2017
10f8119
undoing returntypeof update
wongwill86 Mar 6, 2017
81986a0
For some reason "System" can be resolved by adding this value
wongwill86 Mar 6, 2017
01756e0
adding whatwg-fetch back in to jspm dependencies
wongwill86 Mar 6, 2017
c9f1661
systemjs-hot-reloader updated so we don't need to exlude it from dev …
wongwill86 Mar 14, 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 index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
<script src="jspm.config.js"></script>
<script src="temp/vendor.dev.js"></script>
<script>
SystemJS.trace = true;
// hot-reload config
SystemJS.import('systemjs-hot-reloader').then(function(HotReloader) {
SystemJS.import('systemjs-hot-reloader').then(function(connect) {
// if you're running server on custom port please remember to update below
new HotReloader.default('http://localhost:3000');
connect({host:'http://localhost:3000'});
// load main module of your app with SystemJS
SystemJS.import('src/app');
});
// load main module of your app with SystemJS
SystemJS.trace = true;
SystemJS.import('src/app');
</script>
<!-- loading-app:end -->
</body>
Expand Down
2 changes: 2 additions & 0 deletions jest.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"<rootDir>/node_modules/react-addons-test-utils",
"<rootDir>/node_modules/fbjs"
],
"moduleNameMapper": {
},
"transform": {
"^.+\\.(ts|tsx)$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
},
Expand Down
207 changes: 90 additions & 117 deletions jspm.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,26 @@ SystemJS.config({
},
devConfig: {
"map": {
"plugin-typescript": "github:frankwallis/[email protected]",
"css": "github:systemjs/[email protected]",
"systemjs-hot-reloader": "github:capaj/[email protected]"
"plugin-typescript": "github:frankwallis/[email protected]",
"css": "github:systemjs/[email protected]",
"systemjs-hot-reloader": "npm:[email protected]",
"typescript": "npm:[email protected]"
},
"packages": {
"github:frankwallis/[email protected]": {
"npm:[email protected]": {
"map": {
"typescript": "npm:typescript@2.1.4"
"systemjs-hmr": "npm:systemjs-hmr@2.0.9"
}
},
"npm:typescript@2.1.4": {
"npm:typescript@2.2.1": {
"map": {
"source-map-support": "npm:[email protected].8"
"source-map-support": "npm:[email protected].12"
}
},
"npm:[email protected].8": {
"npm:[email protected].12": {
"map": {
"source-map": "npm:[email protected]"
}
},
"github:capaj/[email protected]": {
"map": {
"debug": "npm:[email protected]",
"weakee": "npm:[email protected]",
"socket.io-client": "github:socketio/[email protected]"
}
},
"npm:[email protected]": {
"map": {
"ms": "npm:[email protected]"
}
}
}
},
Expand Down Expand Up @@ -90,7 +79,7 @@ SystemJS.config({
"classnames": "npm:[email protected]",
"constants": "npm:[email protected]",
"crypto": "npm:[email protected]",
"csjs": "npm:csjs@1.0.6",
"csjs": "npm:csjs@1.1.0",
"domain": "npm:[email protected]",
"events": "npm:[email protected]",
"fs": "npm:[email protected]",
Expand All @@ -102,23 +91,23 @@ SystemJS.config({
"os": "npm:[email protected]",
"path": "npm:[email protected]",
"process": "npm:[email protected]",
"react": "npm:[email protected].1",
"react-dom": "npm:[email protected].1",
"react-redux": "npm:[email protected].1",
"react-redux-typescript": "npm:react-redux-typescript@2.0.0",
"react": "npm:[email protected].2",
"react-dom": "npm:[email protected].2",
"react-redux": "npm:[email protected].3",
"react-redux-typescript": "npm:react-redux-typescript@2.1.0",
"react-router": "npm:[email protected]",
"react-router-redux": "npm:[email protected].7",
"react-router-redux": "npm:[email protected].8",
"redux": "npm:[email protected]",
"redux-observable": "npm:[email protected]",
"reselect": "npm:[email protected]",
"rxjs": "npm:[email protected]",
"stream": "npm:[email protected]",
"string_decoder": "npm:[email protected]",
"tslib": "npm:tslib@1.5.0",
"tslib": "npm:tslib@1.6.0",
"url": "npm:[email protected]",
"util": "npm:[email protected]",
"vm": "npm:[email protected]",
"whatwg-fetch": "npm:whatwg-fetch@1.1.1",
"whatwg-fetch": "npm:whatwg-fetch@2.0.3",
"zlib": "npm:[email protected]"
},
packages: {
Expand Down Expand Up @@ -146,7 +135,7 @@ SystemJS.config({
"map": {
"create-hash": "npm:[email protected]",
"browserify-rsa": "npm:[email protected]",
"parse-asn1": "npm:parse-asn1@5.0.0",
"parse-asn1": "npm:parse-asn1@5.1.0",
"bn.js": "npm:[email protected]",
"randombytes": "npm:[email protected]"
}
Expand Down Expand Up @@ -179,20 +168,11 @@ SystemJS.config({
"create-hmac": "npm:[email protected]",
"browserify-rsa": "npm:[email protected]",
"inherits": "npm:[email protected]",
"parse-asn1": "npm:parse-asn1@5.0.0",
"parse-asn1": "npm:parse-asn1@5.1.0",
"bn.js": "npm:[email protected]",
"elliptic": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"create-hash": "npm:[email protected]",
"evp_bytestokey": "npm:[email protected]",
"pbkdf2": "npm:[email protected]",
"browserify-aes": "npm:[email protected]",
"asn1.js": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"create-hash": "npm:[email protected]"
Expand Down Expand Up @@ -253,7 +233,7 @@ SystemJS.config({
"npm:[email protected]": {
"map": {
"inherits": "npm:[email protected]",
"readable-stream": "npm:[email protected].3"
"readable-stream": "npm:[email protected].5"
}
},
"npm:[email protected]": {
Expand All @@ -264,7 +244,7 @@ SystemJS.config({
},
"npm:[email protected]": {
"map": {
"readable-stream": "npm:[email protected].2",
"readable-stream": "npm:[email protected].5",
"pako": "npm:[email protected]"
}
},
Expand All @@ -278,12 +258,12 @@ SystemJS.config({
},
"npm:[email protected]": {
"map": {
"loose-envify": "npm:[email protected].0"
"loose-envify": "npm:[email protected].1"
}
},
"npm:[email protected]": {
"map": {
"loose-envify": "npm:[email protected].0"
"loose-envify": "npm:[email protected].1"
}
},
"npm:[email protected]": {
Expand All @@ -294,7 +274,7 @@ SystemJS.config({
"npm:[email protected]": {
"map": {
"invariant": "npm:[email protected]",
"loose-envify": "npm:[email protected].0",
"loose-envify": "npm:[email protected].1",
"warning": "npm:[email protected]",
"hoist-non-react-statics": "npm:[email protected]",
"history": "npm:[email protected]"
Expand Down Expand Up @@ -322,7 +302,7 @@ SystemJS.config({
},
"npm:[email protected]": {
"map": {
"http-browserify": "npm:stream-http@2.5.0"
"http-browserify": "npm:stream-http@2.6.3"
}
},
"npm:[email protected]": {
Expand All @@ -345,34 +325,9 @@ SystemJS.config({
"string_decoder-browserify": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"js-tokens": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"loose-envify": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"builtin-status-codes": "npm:[email protected]",
"inherits": "npm:[email protected]",
"to-arraybuffer": "npm:[email protected]",
"readable-stream": "npm:[email protected]",
"xtend": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"inherits": "npm:[email protected]",
"string_decoder": "npm:[email protected]",
"isarray": "npm:[email protected]",
"buffer-shims": "npm:[email protected]",
"core-util-is": "npm:[email protected]",
"process-nextick-args": "npm:[email protected]",
"util-deprecate": "npm:[email protected]"
"loose-envify": "npm:[email protected]"
}
},
"npm:[email protected]": {
Expand Down Expand Up @@ -405,40 +360,6 @@ SystemJS.config({
"lodash": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"lodash-es": "npm:[email protected]",
"loose-envify": "npm:[email protected]",
"lodash": "npm:[email protected]",
"invariant": "npm:[email protected]",
"hoist-non-react-statics": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"loose-envify": "npm:[email protected]",
"object-assign": "npm:[email protected]",
"fbjs": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"loose-envify": "npm:[email protected]",
"object-assign": "npm:[email protected]",
"fbjs": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"loose-envify": "npm:[email protected]",
"object-assign": "npm:[email protected]",
"promise": "npm:[email protected]",
"setimmediate": "npm:[email protected]",
"isomorphic-fetch": "npm:[email protected]",
"ua-parser-js": "npm:[email protected]",
"core-js": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"asap": "npm:[email protected]"
Expand All @@ -447,7 +368,7 @@ SystemJS.config({
"npm:[email protected]": {
"map": {
"node-fetch": "npm:[email protected]",
"whatwg-fetch": "npm:whatwg-fetch@1.1.1"
"whatwg-fetch": "npm:whatwg-fetch@2.0.3"
}
},
"npm:[email protected]": {
Expand All @@ -471,17 +392,6 @@ SystemJS.config({
"js-tokens": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"inherits": "npm:[email protected]",
"core-util-is": "npm:[email protected]",
"process-nextick-args": "npm:[email protected]",
"string_decoder": "npm:[email protected]",
"buffer-shims": "npm:[email protected]",
"isarray": "npm:[email protected]",
"util-deprecate": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"bn.js": "npm:[email protected]",
Expand All @@ -499,6 +409,69 @@ SystemJS.config({
"minimalistic-assert": "npm:[email protected]",
"minimalistic-crypto-utils": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"hoist-non-react-statics": "npm:[email protected]",
"invariant": "npm:[email protected]",
"lodash-es": "npm:[email protected]",
"loose-envify": "npm:[email protected]",
"lodash": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"loose-envify": "npm:[email protected]",
"object-assign": "npm:[email protected]",
"fbjs": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"loose-envify": "npm:[email protected]",
"object-assign": "npm:[email protected]",
"fbjs": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"object-assign": "npm:[email protected]",
"loose-envify": "npm:[email protected]",
"promise": "npm:[email protected]",
"setimmediate": "npm:[email protected]",
"isomorphic-fetch": "npm:[email protected]",
"ua-parser-js": "npm:[email protected]",
"core-js": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"builtin-status-codes": "npm:[email protected]",
"inherits": "npm:[email protected]",
"to-arraybuffer": "npm:[email protected]",
"readable-stream": "npm:[email protected]",
"xtend": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"isarray": "npm:[email protected]",
"string_decoder": "npm:[email protected]",
"inherits": "npm:[email protected]",
"util-deprecate": "npm:[email protected]",
"core-util-is": "npm:[email protected]",
"process-nextick-args": "npm:[email protected]",
"buffer-shims": "npm:[email protected]"
}
},
"npm:[email protected]": {
"map": {
"browserify-aes": "npm:[email protected]",
"pbkdf2": "npm:[email protected]",
"evp_bytestokey": "npm:[email protected]",
"create-hash": "npm:[email protected]",
"asn1.js": "npm:[email protected]"
}
}
}
});
Loading