diff --git a/.eslintrc.js b/.eslintrc.js index 307f9c448..6f513fe01 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -207,6 +207,7 @@ module.exports = { 'packages/@uppy/facebook/src/**/*.js', 'packages/@uppy/file-input/src/**/*.js', 'packages/@uppy/form/src/**/*.js', + 'packages/@uppy/golden-retriever/src/**/*.js', 'packages/@uppy/google-drive/src/**/*.js', 'packages/@uppy/image-editor/src/**/*.js', 'packages/@uppy/informer/src/**/*.js', diff --git a/packages/@uppy/golden-retriever/package.json b/packages/@uppy/golden-retriever/package.json index 08d7346ff..fab397003 100644 --- a/packages/@uppy/golden-retriever/package.json +++ b/packages/@uppy/golden-retriever/package.json @@ -5,6 +5,7 @@ "license": "MIT", "main": "lib/index.js", "types": "types/index.d.ts", + "type": "module", "keywords": [ "file uploader", "restore files", diff --git a/packages/@uppy/golden-retriever/src/IndexedDBStore.js b/packages/@uppy/golden-retriever/src/IndexedDBStore.js index 09aedfcea..c350df39b 100644 --- a/packages/@uppy/golden-retriever/src/IndexedDBStore.js +++ b/packages/@uppy/golden-retriever/src/IndexedDBStore.js @@ -224,4 +224,4 @@ class IndexedDBStore { IndexedDBStore.isSupported = isSupported -module.exports = IndexedDBStore +export default IndexedDBStore diff --git a/packages/@uppy/golden-retriever/src/MetaDataStore.js b/packages/@uppy/golden-retriever/src/MetaDataStore.js index 7f3cebe88..349afceb6 100644 --- a/packages/@uppy/golden-retriever/src/MetaDataStore.js +++ b/packages/@uppy/golden-retriever/src/MetaDataStore.js @@ -24,7 +24,7 @@ function maybeParse (str) { } let cleanedUp = false -module.exports = class MetaDataStore { +export default class MetaDataStore { constructor (opts) { this.opts = { expires: 24 * 60 * 60 * 1000, // 24 hours @@ -79,9 +79,9 @@ module.exports = class MetaDataStore { const now = Date.now() instanceIDs.forEach((id) => { const data = localStorage.getItem(`uppyState:${id}`) - if (!data) return null + if (!data) return const obj = maybeParse(data) - if (!obj) return null + if (!obj) return if (obj.expires && obj.expires < now) { localStorage.removeItem(`uppyState:${id}`) diff --git a/packages/@uppy/golden-retriever/src/ServiceWorker.js b/packages/@uppy/golden-retriever/src/ServiceWorker.js index 410b59bb0..9af39db59 100644 --- a/packages/@uppy/golden-retriever/src/ServiceWorker.js +++ b/packages/@uppy/golden-retriever/src/ServiceWorker.js @@ -1,5 +1,4 @@ /* globals clients */ -/* eslint-disable no-restricted-globals */ const fileCache = Object.create(null) diff --git a/packages/@uppy/golden-retriever/src/ServiceWorkerStore.js b/packages/@uppy/golden-retriever/src/ServiceWorkerStore.js index c56f0adcf..13644c4bf 100644 --- a/packages/@uppy/golden-retriever/src/ServiceWorkerStore.js +++ b/packages/@uppy/golden-retriever/src/ServiceWorkerStore.js @@ -1,5 +1,3 @@ -/*eslint-disable */ - const isSupported = typeof navigator !== 'undefined' && 'serviceWorker' in navigator function waitForServiceWorker () { @@ -30,8 +28,6 @@ class ServiceWorkerStore { defer.reject = reject }) - console.log('Loading stored blobs from Service Worker') - const onMessage = (event) => { if (event.data.store !== this.name) { return @@ -51,7 +47,7 @@ class ServiceWorkerStore { navigator.serviceWorker.controller.postMessage({ type: 'uppy/GET_FILES', - store: this.name + store: this.name, }) }) @@ -63,7 +59,7 @@ class ServiceWorkerStore { navigator.serviceWorker.controller.postMessage({ type: 'uppy/ADD_FILE', store: this.name, - file: file + file, }) }) } @@ -73,7 +69,7 @@ class ServiceWorkerStore { navigator.serviceWorker.controller.postMessage({ type: 'uppy/REMOVE_FILE', store: this.name, - fileID: fileID + fileID, }) }) } @@ -81,4 +77,4 @@ class ServiceWorkerStore { ServiceWorkerStore.isSupported = isSupported -module.exports = ServiceWorkerStore +export default ServiceWorkerStore diff --git a/packages/@uppy/golden-retriever/src/cleanup.js b/packages/@uppy/golden-retriever/src/cleanup.js index e54e7919c..28a862305 100644 --- a/packages/@uppy/golden-retriever/src/cleanup.js +++ b/packages/@uppy/golden-retriever/src/cleanup.js @@ -1,10 +1,10 @@ -const IndexedDBStore = require('./IndexedDBStore') -const MetaDataStore = require('./MetaDataStore') +import IndexedDBStore from './IndexedDBStore.js' +import MetaDataStore from './MetaDataStore.js' /** * Clean old blobs without needing to import all of Uppy. */ -module.exports = function cleanup () { +export default function cleanup () { MetaDataStore.cleanup() IndexedDBStore.cleanup() } diff --git a/packages/@uppy/golden-retriever/src/index.js b/packages/@uppy/golden-retriever/src/index.js index 8a1c71a78..785dd66ee 100644 --- a/packages/@uppy/golden-retriever/src/index.js +++ b/packages/@uppy/golden-retriever/src/index.js @@ -1,8 +1,10 @@ -const throttle = require('lodash.throttle') -const BasePlugin = require('@uppy/core/lib/BasePlugin') -const ServiceWorkerStore = require('./ServiceWorkerStore') -const IndexedDBStore = require('./IndexedDBStore') -const MetaDataStore = require('./MetaDataStore') +import throttle from 'lodash.throttle' +import BasePlugin from '@uppy/core/lib/BasePlugin' +import ServiceWorkerStore from './ServiceWorkerStore.js' +import IndexedDBStore from './IndexedDBStore.js' +import MetaDataStore from './MetaDataStore.js' + +import packageJson from '../package.json' /** * The GoldenRetriever plugin — restores selected files and resumes uploads @@ -11,8 +13,8 @@ const MetaDataStore = require('./MetaDataStore') * Uses localStorage, IndexedDB and ServiceWorker to do its magic, read more: * https://uppy.io/blog/2017/07/golden-retriever/ */ -module.exports = class GoldenRetriever extends BasePlugin { - static VERSION = require('../package.json').version +export default class GoldenRetriever extends BasePlugin { + static VERSION = packageJson.version constructor (uppy, opts) { super(uppy, opts)