From b538bb39716de18c90e920cb493be549a8f1a933 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Mon, 7 May 2018 16:33:32 -0400 Subject: [PATCH] Just a few tool tweaks --- Makefile | 12 ++++++++++-- package.json | 4 ++-- src/views/HomeView.js | 7 +++---- yarn.lock | 16 ---------------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 0eeb489..acc4f47 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,27 @@ all: node_modules +build: node_modules + yarn dist + clean: rm -rf ./.cache - rm -rf ./node_modules rm -rf ./dist rm -rf ./build +clean-all: clean + rm -rf ./node_modules + node_modules: yarn --ignore-engines electron-start: node_modules yarn electron-start +inferno-start: node_modules + yarn inferno-start + react-start: node_modules - yarn react-start + yarn inferno-start fix: node_modules yarn fix diff --git a/package.json b/package.json index d28bec9..26b5e8c 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "babel-core": "6.26.0", "babel-eslint": "^8.2.2", "babel-jest": "^22.4.3", - "babel-loader": "^7.1.4", "babel-plugin-module-resolver": "^3.1.1", "babel-preset-env": "^1.6.1", "babel-preset-inferno-app": "^7.1.0", @@ -55,11 +54,12 @@ "electron-start": "node src/electron/wait-inferno", "electron": "electron .", "fix": "eslint --fix src/**/*.js", + "inferno-start": "parcel index.html -p 3000", "lint": "eslint src/**/*.js", "pack": "build --dir", "postinstall": "electron-builder install-app-deps", "precommit": "yarn lint", - "react-start": "parcel index.html -p 3000", + "react-start": "npm run inferno-start", "test": "node scripts/test.js --env=jsdom" }, "homepage": "./", diff --git a/src/views/HomeView.js b/src/views/HomeView.js index 9fc201a..68381cf 100644 --- a/src/views/HomeView.js +++ b/src/views/HomeView.js @@ -1,6 +1,5 @@ import { Component } from 'inferno'; import { - Alert, Button, Col, Container, @@ -38,6 +37,9 @@ export class HomeView extends Component { draggedFiles.push(f.path); } + let newTransfer = { ...e.dataTransfer }; + console.info(newTransfer); + window.clientWS.send(JSONMessage('dropped-files', draggedFiles)); } @@ -65,9 +67,6 @@ export class HomeView extends Component { render () { return (
- - This is a work in progress - diff --git a/yarn.lock b/yarn.lock index 212137f..77c6731 100644 --- a/yarn.lock +++ b/yarn.lock @@ -635,14 +635,6 @@ babel-jest@^22.4.3: babel-plugin-istanbul "^4.1.5" babel-preset-jest "^22.4.3" -babel-loader@^7.1.4: - version "7.1.4" - resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015" - dependencies: - find-cache-dir "^1.0.0" - loader-utils "^1.0.2" - mkdirp "^0.5.1" - babel-messages@^6.23.0: version "6.23.0" resolved "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" @@ -2970,14 +2962,6 @@ find-cache-dir@^0.1.1: mkdirp "^0.5.1" pkg-dir "^1.0.0" -find-cache-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" - dependencies: - commondir "^1.0.1" - make-dir "^1.0.0" - pkg-dir "^2.0.0" - find-up@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"