Updating to [email protected] #45
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -9,37 +9,26 @@ SystemJS.config({ | |
| }, | ||
| devConfig: { | ||
| "map": { | ||
| "plugin-typescript": "github:frankwallis/plugin-typescript@7.0.5", | ||
| "css": "github:systemjs/[email protected]", | ||
| "systemjs-hot-reloader": "npm:[email protected]", | ||
| "typescript": "npm:[email protected]" | ||
| }, | ||
| "packages": { | ||
| "npm:[email protected]": { | ||
| "map": { | ||
| "systemjs-hmr": "npm:systemjs-hmr@2.0.8" | ||
| } | ||
| }, | ||
| "npm:typescript@2.2.1": { | ||
| "map": { | ||
| "source-map-support": "npm:[email protected].11" | ||
| } | ||
| }, | ||
| "npm:[email protected].11": { | ||
| "map": { | ||
| "source-map": "npm:[email protected]" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
@@ -90,7 +79,7 @@ SystemJS.config({ | |
| "classnames": "npm:[email protected]", | ||
| "constants": "npm:[email protected]", | ||
| "crypto": "npm:[email protected]", | ||
| "csjs": "npm:csjs@1.1.0", | ||
| "domain": "npm:[email protected]", | ||
| "events": "npm:[email protected]", | ||
| "fs": "npm:[email protected]", | ||
|
|
@@ -102,19 +91,19 @@ SystemJS.config({ | |
| "os": "npm:[email protected]", | ||
| "path": "npm:[email protected]", | ||
| "process": "npm:[email protected]", | ||
| "react": "npm:[email protected].2", | ||
| "react-dom": "npm:[email protected].2", | ||
| "react-redux": "npm:[email protected].3", | ||
| "react-redux-typescript": "npm:[email protected]", | ||
| "react-router": "npm:[email protected]", | ||
| "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.6.0", | ||
| "url": "npm:[email protected]", | ||
| "util": "npm:[email protected]", | ||
| "vm": "npm:[email protected]", | ||
|
|
@@ -264,7 +253,7 @@ SystemJS.config({ | |
| }, | ||
| "npm:[email protected]": { | ||
| "map": { | ||
| "readable-stream": "npm:[email protected].3", | ||
| "pako": "npm:[email protected]" | ||
| } | ||
| }, | ||
|
|
@@ -278,12 +267,12 @@ SystemJS.config({ | |
| }, | ||
| "npm:[email protected]": { | ||
| "map": { | ||
| "loose-envify": "npm:[email protected].1" | ||
| } | ||
| }, | ||
| "npm:[email protected]": { | ||
| "map": { | ||
| "loose-envify": "npm:[email protected].1" | ||
| } | ||
| }, | ||
| "npm:[email protected]": { | ||
|
|
@@ -294,7 +283,7 @@ SystemJS.config({ | |
| "npm:[email protected]": { | ||
| "map": { | ||
| "invariant": "npm:[email protected]", | ||
| "loose-envify": "npm:[email protected].1", | ||
| "warning": "npm:[email protected]", | ||
| "hoist-non-react-statics": "npm:[email protected]", | ||
| "history": "npm:[email protected]" | ||
|
|
@@ -322,7 +311,7 @@ SystemJS.config({ | |
| }, | ||
| "npm:[email protected]": { | ||
| "map": { | ||
| "http-browserify": "npm:stream-http@2.6.3" | ||
| } | ||
| }, | ||
| "npm:[email protected]": { | ||
|
|
@@ -345,34 +334,9 @@ SystemJS.config({ | |
| "string_decoder-browserify": "npm:[email protected]" | ||
| } | ||
| }, | ||
| "npm:[email protected]": { | ||
| "map": { | ||
| "loose-envify": "npm:[email protected]" | ||
| } | ||
| }, | ||
| "npm:[email protected]": { | ||
|
|
@@ -405,40 +369,6 @@ SystemJS.config({ | |
| "lodash": "npm:[email protected]" | ||
| } | ||
| }, | ||
| "npm:[email protected]": { | ||
| "map": { | ||
| "asap": "npm:[email protected]" | ||
|
|
@@ -499,6 +429,49 @@ 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]" | ||
| } | ||
| } | ||
| } | ||
| }); | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ | |
| "main": "server.js", | ||
| "scripts": { | ||
| "clean": "shx rm -rf dist node_modules jspm_packages", | ||
| "init": "jspm install && npm run dev:bundle", | ||
| "dev": "jspm-hmr -FO", | ||
| "dev:bundle": "node scripts/build.js dev", | ||
| "dev:unbundle": "shx rm temp/vendor.dev.js", | ||
|
|
@@ -30,7 +30,9 @@ | |
| "precommit": "npm run lint && npm run tsc", | ||
| "prepush": "npm run precommit && npm test", | ||
| "deploy:init": "node scripts/deploy.js init", | ||
| "deploy": "cd dist && git checkout gh-pages && git add --all && git commit -m \"New Release\" && git push", | ||
| "jspm:version": "jspm --version", | ||
| "jspm:update": "jspm update" | ||
| }, | ||
| "dependencies": {}, | ||
| "devDependencies": { | ||
|
|
@@ -45,7 +47,7 @@ | |
| "@types/systemjs": "^0.19.33", | ||
| "husky": "^0.13.0", | ||
| "jest": "^19.0.2", | ||
| "jspm": "0.17.0-beta.40", | ||
| "jspm-hmr": "^1.0.0-rc4", | ||
| "react-redux-typescript": "^2.0.0", | ||
| "redux-observable": "^0.13.0", | ||
|
|
@@ -80,8 +82,9 @@ | |
| }, | ||
| "devDependencies": { | ||
| "css": "github:systemjs/plugin-css@^0.1.32", | ||
| "plugin-typescript": "github:frankwallis/plugin-typescript@^7.0.5", | ||
| "systemjs-hot-reloader": "npm:systemjs-hot-reloader@^1.1.0", | ||
| "typescript": "npm:typescript@^2.0.0" | ||
| }, | ||
| "peerDependencies": { | ||
| "assert": "npm:jspm-nodelibs-assert@^0.2.0", | ||
|
|
@@ -99,7 +102,7 @@ | |
| "os": "npm:jspm-nodelibs-os@^0.2.0", | ||
| "path": "npm:jspm-nodelibs-path@^0.2.0", | ||
| "process": "npm:jspm-nodelibs-process@^0.2.0", | ||
| "react": "npm:react@^15.4.2", | ||
| "redux": "npm:redux@^3.6.0", | ||
| "rxjs": "npm:rxjs@^5.2.0", | ||
| "stream": "npm:jspm-nodelibs-stream@^0.2.0", | ||
|
|
@@ -110,9 +113,6 @@ | |
| "zlib": "npm:jspm-nodelibs-zlib@^0.2.0" | ||
| }, | ||
| "overrides": { | ||
| "npm:[email protected]": { | ||
| "dependencies": { | ||
| "readable-stream": "^2.0.2", | ||
|
|
@@ -122,17 +122,6 @@ | |
| "_stream_transform": "readable-stream/transform" | ||
| } | ||
| }, | ||
| "npm:[email protected]": { | ||
| "ignore": [ | ||
| "test.js" | ||
|
|
@@ -144,11 +133,7 @@ | |
| "process": "@empty" | ||
| } | ||
| }, | ||
| "npm:[email protected]": { | ||
| "browser": {}, | ||
| "map": { | ||
| "buffer": "@empty", | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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 @@ | ||
| // lib imports | ||
| import React from 'react'; | ||
|
There was a problem hiding this comment. import statements should be changed back to namespace, as we want to import namespace and not default export There was a problem hiding this comment. Hrmm. I had a lot of problems with this. I updated systemjs/builder#775 to see if i can get some help to get the namespace import working again. There was a problem hiding this comment. @wongwill86 I think that if React is not supporting ES Module flag we should probably stick to default import, this is really annoying because we will not be able to use named import as well, but unfortunately I couldn't find any good workaround ;/ |
||
| import ReactDOM from 'react-dom'; | ||
| import { Provider } from 'react-redux'; | ||
| import { Router, Route } from 'react-router'; | ||
| import { syncHistoryWithStore } from 'react-router-redux'; | ||
|
|
||
This file contains hidden or 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,4 +1,4 @@ | ||
| import React from 'react'; | ||
| import classNames from 'classnames'; | ||
|
|
||
| // const inlineStyles = {}; | ||
|
|
||
This file contains hidden or 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,4 +1,4 @@ | ||
| import React from 'react'; | ||
| import classNames from 'classnames'; | ||
|
|
||
| // const inlineStyles = {}; | ||
|
|
||
This file contains hidden or 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,4 +1,4 @@ | ||
| import React from 'react'; | ||
| import classNames from 'classnames'; | ||
|
|
||
| // const inlineStyles = {}; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is unnecessary, as you need this in dev hot reloading
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this was a workaround for an issue i found with bundling systemjs-hot-reloader.
alexisvincent/systemjs-hot-reloader#138
I'll see if i can get a reply on what needs to be configured.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah I see, good to know, I gonna try as well if it works for me