Skip to content

Commit

Permalink
Merge 4c22c5d into 6e613db
Browse files Browse the repository at this point in the history
  • Loading branch information
mfellner committed Jul 6, 2017
2 parents 6e613db + 4c22c5d commit 06812bc
Show file tree
Hide file tree
Showing 3 changed files with 316 additions and 137 deletions.
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"peerDependencies": {
"debug": "^2.6.8",
"webpack": "^2.6.1"
"webpack": "^3.1.0"
},
"dependencies": {
"@types/memory-fs": "0.3.0",
Expand All @@ -36,26 +36,26 @@
"devDependencies": {
"@types/debug": "0.0.29",
"@types/extract-text-webpack-plugin": "2.1.0",
"@types/jest": "19.2.4",
"@types/jest": "20.0.2",
"@types/resolve": "0.0.4",
"@types/webpack": "2.2.15",
"babel-core": "6.24.1",
"babel-loader": "7.0.0",
"@types/webpack": "3.0.1",
"babel-core": "6.25.0",
"babel-loader": "7.1.1",
"babel-preset-es2015": "6.24.1",
"babel-preset-react": "6.24.1",
"css-loader": "0.28.4",
"debug": "2.6.8",
"extract-text-webpack-plugin": "2.1.0",
"extract-text-webpack-plugin": "2.1.2",
"jest": "20.0.4",
"material-ui": "0.18.1",
"material-ui": "0.18.6",
"rimraf": "2.6.1",
"style-loader": "0.18.1",
"ts-jest": "20.0.5",
"ts-node": "3.0.4",
"tslint": "5.4.2",
"style-loader": "0.18.2",
"ts-jest": "20.0.6",
"ts-node": "3.2.0",
"tslint": "5.5.0",
"typedoc": "0.7.1",
"typescript": "2.3.4",
"webpack": "2.6.1"
"typescript": "2.4.1",
"webpack": "3.1.0"
},
"jest": {
"testEnvironment": "node",
Expand Down
3 changes: 0 additions & 3 deletions test/__snapshots__/index.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ exports[`webpack-sandboxed should generate a JavaScript bundle 1`] = `
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // identity function for calling harmony imports with the correct context
/******/ __webpack_require__.i = function(value) { return value; };
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
Expand Down
Loading

0 comments on commit 06812bc

Please sign in to comment.