From c0ee4f06d4c143c3f4f019195fbb24c4c46886b1 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Wed, 4 Apr 2018 11:21:38 -0400 Subject: [PATCH] A little housecleaning --- package.json | 11 ++++------- public/js/customElements.js | 5 ----- src/components/FormBlock.js | 7 +++---- yarn.lock | 35 ++++++++--------------------------- 4 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 public/js/customElements.js diff --git a/package.json b/package.json index bcab99b..bd90542 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,10 @@ "inferno-bootstrap": "^5.0.0", "inferno-router": "^5.0.1", "inferno-scripts": "6.3.0", - "lodash": "^4.17.5", - "node-exiftool": "^2.3.0", - "query-string": "^6.0.0" + "node-exiftool": "^2.3.0" }, "devDependencies": { "babel-eslint": "^8.2.2", - "bootstrap": "4", "electron": "^1.8.4", "electron-builder": "^20.8.1", "eslint": "^4.19.1", @@ -25,8 +22,7 @@ "eslint-plugin-promise": "^3.7.0", "eslint-plugin-standard": "^3.0.1", "foreman": "^2.0.0", - "husky": "^0.14.3", - "jquery": "^3.3.1" + "husky": "^0.14.3" }, "scripts": { "build": "inferno-scripts build", @@ -37,7 +33,8 @@ "fix": "eslint --fix src/**/*.js", "lint": "eslint src/**/*.js", "pack": "build --dir", - "postinstall": "electron-builder install-app-deps", + "postinstall": "electron-builder install-app-deps", + "precommit": "yarn lint", "react-start": "inferno-scripts start", "start": "nf start -p 3000", "test": "inferno-scripts test --env=jsdom" diff --git a/public/js/customElements.js b/public/js/customElements.js deleted file mode 100644 index 68a9ec8..0000000 --- a/public/js/customElements.js +++ /dev/null @@ -1,5 +0,0 @@ -/* class BSContainer extends HTMLElement {} -class FilmExifElement extends HTMLElement {} - -customElements.define('bs-container', BSContainer); -customElements.define('film-exif', FilmExifElement); */ diff --git a/src/components/FormBlock.js b/src/components/FormBlock.js index ad3c377..584ee27 100644 --- a/src/components/FormBlock.js +++ b/src/components/FormBlock.js @@ -8,18 +8,17 @@ import { export const FormBlock = ({ children, label, - name, - type='text', + type = 'text', ...props }) => { const formElement = (children !== undefined) ? children - : + : ; return ( - + {formElement} diff --git a/yarn.lock b/yarn.lock index 8c14f1c..7bdf8f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1240,10 +1240,6 @@ boom@5.x.x: dependencies: hoek "4.x.x" -bootstrap@4: - version "4.0.0" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a" - boxen@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" @@ -1785,7 +1781,7 @@ commander@2.15.x, commander@^2.11.0, commander@~2.15.0: commander@~2.9.0: version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + resolved "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" dependencies: graceful-readlink ">= 1.0.0" @@ -3385,7 +3381,7 @@ foreach@^2.0.5: foreman@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/foreman/-/foreman-2.0.0.tgz#00acd20f9dbbe2f79d04697bcca2a77ee00ee031" + resolved "https://registry.npmjs.org/foreman/-/foreman-2.0.0.tgz#00acd20f9dbbe2f79d04697bcca2a77ee00ee031" dependencies: commander "~2.9.0" http-proxy "~1.11.1" @@ -3636,7 +3632,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: "graceful-readlink@>= 1.0.0": version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + resolved "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" growly@^1.3.0: version "1.3.0" @@ -3934,7 +3930,7 @@ http-proxy@^1.16.2: http-proxy@~1.11.1: version "1.11.3" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.11.3.tgz#1915dc888751e2a6bf3c2abfcb1808fa86c72353" + resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.11.3.tgz#1915dc888751e2a6bf3c2abfcb1808fa86c72353" dependencies: eventemitter3 "1.x.x" requires-port "0.x.x" @@ -4895,10 +4891,6 @@ jest@22.4.2: import-local "^1.0.0" jest-cli "^22.4.2" -jquery@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" - js-base64@^2.1.9: version "2.4.3" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" @@ -5201,7 +5193,7 @@ lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -"lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0: +"lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" @@ -5467,7 +5459,7 @@ multicast-dns@^6.0.1: mustache@^2.2.1: version "2.3.0" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0" + resolved "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0" mute-stream@0.0.7: version "0.0.7" @@ -6524,13 +6516,6 @@ query-string@^4.1.0: object-assign "^4.1.0" strict-uri-encode "^1.0.0" -query-string@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.0.0.tgz#8b8f39447b73e8290d6f5e3581779218e9171142" - dependencies: - decode-uri-component "^0.2.0" - strict-uri-encode "^2.0.0" - querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -6908,7 +6893,7 @@ require-uncached@^1.0.3: requires-port@0.x.x: version "0.0.1" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-0.0.1.tgz#4b4414411d9df7c855995dd899a8c78a2951c16d" + resolved "https://registry.npmjs.org/requires-port/-/requires-port-0.0.1.tgz#4b4414411d9df7c855995dd899a8c78a2951c16d" requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0: version "1.0.0" @@ -7189,7 +7174,7 @@ shell-quote@1.6.1: shell-quote@~1.4.2: version "1.4.3" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.4.3.tgz#952c44e0b1ed9013ef53958179cc643e8777466b" + resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.4.3.tgz#952c44e0b1ed9013ef53958179cc643e8777466b" dependencies: array-filter "~0.0.0" array-map "~0.0.0" @@ -7448,10 +7433,6 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" -strict-uri-encode@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" - string-length@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"