Browse Source

refactor: use single eslint command

Ifedapo Olarewaju 6 years ago
parent
commit
96388449f6

+ 1 - 2
.eslintignore

@@ -1,7 +1,7 @@
 node_modules
 lib
 dist
-coverage/**
+coverage
 test/lib/**
 website/private_modules/hexo-renderer-uppyexamples/node_modules/**
 website/public/**
@@ -10,4 +10,3 @@ website/themes/uppy/source/js/uppy.js
 website/themes/uppy/source/uppy/**
 test/endtoend/*/build
 bundle.js
-packages/@uppy/companion

+ 0 - 1
.travis.yml

@@ -21,7 +21,6 @@ script:
 - npm run web:install
 - npm run build
 - npm run test
-- npm run test:companion
 - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then npm run test:acceptance; fi
 - npm run uploadcdn
 env:

File diff suppressed because it is too large
+ 236 - 236
package-lock.json


+ 5 - 6
package.json

@@ -3,8 +3,7 @@
   "name": "uppy-build",
   "description": "Extensible JavaScript file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Instagram, Dropbox, Google Drive, S3 and more :dog:",
   "lint-staged": {
-    "*.js": "eslint",
-    "packages/@uppy/companion/**/*.js": "eslint --ignore-path packages/@uppy/companion/.eslintignore -c packages/@uppy/companion/.eslintrc.json"
+    "*.js": "eslint"
   },
   "pre-commit": "lint-staged",
   "license": "MIT",
@@ -81,14 +80,14 @@
   "scripts": {
     "build:bundle": "node ./bin/build-js.js",
     "build:css": "node ./bin/build-css.js",
+    "build:companion": "cd ./packages/@uppy/companion && npm run build",
     "build:gzip": "node ./bin/gzip.js",
     "size": "echo 'JS Bundle mingz:' && cat ./packages/uppy/dist/uppy.min.js | gzip | wc -c && echo 'CSS Bundle mingz:' && cat ./packages/uppy/dist/uppy.min.css | gzip | wc -c",
     "build:js": "npm-run-all build:lib build:bundle",
     "build:lib": "babel --version && node ./bin/build-lib.js",
-    "build": "npm-run-all --parallel build:js build:css --serial build:gzip size",
+    "build": "npm-run-all --parallel build:js build:css build:companion --serial build:gzip size",
     "clean": "rm -rf packages/*/lib packages/@uppy/*/lib && rm -rf packages/uppy/dist",
     "lint:fix": "npm run lint -- --fix",
-    "lint:companion": "eslint --ignore-path packages/@uppy/companion/.eslintignore -c packages/@uppy/companion/.eslintrc.json packages/@uppy/companion/.",
     "lint": "eslint . --cache",
     "lint-staged": "lint-staged",
     "release": "./bin/release",
@@ -101,9 +100,9 @@
     "test:acceptance": "npm run test:prepare-ci && wdio test/endtoend/wdio.remote.conf.js",
     "test:acceptance:local": "npm run test:build && wdio test/endtoend/wdio.local.conf.js",
     "test:unit": "jest --testPathPattern=./src --coverage",
+    "test:companion": "cd ./packages/@uppy/companion && npm run test",
     "test:type": "tsc -p .",
-    "test": "npm run lint && npm run test:unit && npm run test:type",
-    "test:companion": "npm run lint:companion && cd ./packages/@uppy/companion && npm run test",
+    "test": "npm run lint && npm run test:unit && npm run test:type && npm run test:companion",
     "test:watch": "jest --watch --testPathPattern=src",
     "travis:deletecache": "travis cache --delete",
     "watch:css": "onchange 'packages/**/*.scss' --initial --verbose -- npm run build:css",

+ 0 - 3
packages/@uppy/companion/.eslintignore

@@ -1,3 +0,0 @@
-packages/@uppy/companion/lib
-packages/@uppy/companion/node_modules
-packages/@uppy/companion/coverage

+ 2 - 1
packages/@uppy/companion/.eslintrc.json

@@ -3,5 +3,6 @@
   "env": {
     "browser": false,
     "node": true
-  }
+  },
+  "root": true
 }

+ 1 - 1
packages/@uppy/companion/package.json

@@ -76,7 +76,7 @@
     "redis": "^2.7.1",
     "request": "2.85.0",
     "serialize-error": "^2.1.0",
-    "tus-js-client": "1.4.5",
+    "tus-js-client": "^1.5.1",
     "uuid": "2.0.2",
     "validator": "^9.0.0",
     "ws": "1.1.5"

Some files were not shown because too many files changed in this diff