diff --git a/admin/client/dist/js/vendor.js b/admin/client/dist/js/vendor.js index c4b5e47dd..c7b689bfd 100644 --- a/admin/client/dist/js/vendor.js +++ b/admin/client/dist/js/vendor.js @@ -5923,8 +5923,9 @@ i.setDragImage(u,p.x,p.y)}try{i.setData("application/json",{})}catch(v){}this.se var g=this.getCurrentSourcePreviewNodeOptions(),y=g.captureDraggingState y?this.actions.publishDragSource():setTimeout(function(){return e.actions.publishDragSource()})}else if(o)this.beginDragNativeItem(o) else{if(!(i.types||t.target.hasAttribute&&t.target.hasAttribute("draggable")))return -t.preventDefault()}}},{key:"handleTopDragEndCapture",value:function D(){var t=this.clearCurrentDragSourceNode() -t&&this.actions.endDrag()}},{key:"handleTopDragEnterCapture",value:function A(t){this.dragEnterTargetIds=[] +t.preventDefault()}}},{key:"handleTopDragEndCapture",value:function D(){this.clearCurrentDragSourceNode()&&this.actions.endDrag()}},{key:"handleTopDragEnterCapture",value:function A(t){this.dragEnterTargetIds=[] + + var e=this.enterLeaveCounter.enter(t.target) if(e&&!this.monitor.isDragging()){var n=t.dataTransfer,r=(0,m.matchNativeItemType)(n) r&&this.beginDragNativeItem(r)}}},{key:"handleDragEnter",value:function I(t,e){this.dragEnterTargetIds.unshift(e)}},{key:"handleTopDragEnter",value:function M(t){var e=this,n=this.dragEnterTargetIds diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index e68b8a8d7..0d8e8a216 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -2,7 +2,7 @@ "name": "silverstripe-framework", "version": "4.0.0", "npm-shrinkwrap-version": "6.0.1", - "node-version": "v4.7.0", + "node-version": "v4.5.0", "dependencies": { "apollo-client": { "version": "0.5.24", @@ -8474,6 +8474,84 @@ } } }, + "react-dnd": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-2.2.3.tgz", + "dependencies": { + "disposables": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/disposables/-/disposables-1.0.1.tgz" + }, + "dnd-core": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-2.2.3.tgz", + "dependencies": { + "asap": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz" + }, + "redux": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/redux/-/redux-3.6.0.tgz", + "dependencies": { + "lodash-es": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz" + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "dependencies": { + "js-tokens": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz" + } + } + }, + "symbol-observable": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz" + } + } + } + } + }, + "hoist-non-react-statics": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz" + }, + "invariant": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", + "dependencies": { + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "dependencies": { + "js-tokens": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz" + } + } + } + } + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + } + } + }, + "react-dnd-html5-backend": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.2.3.tgz", + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" + } + } + }, "react-dom": { "version": "15.3.1", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.3.1.tgz" diff --git a/package.json b/package.json index 0921e64bd..74efc49aa 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "node": "^4.2.0" }, "scripts": { - "build": "webpack --bail", - "watch": "webpack --config ./webpack-dev.config.js --watch", + "build": "webpack --bail --progress", + "watch": "webpack --progress --config ./webpack-dev.config.js --watch", "css": "WEBPACK_CHILD=css webpack", "lock": "npm-shrinkwrap --dev", "test": "NODE_PATH=\"./client/src:./admin/client/src\" jest",