diff --git a/bower.json b/bower.json index 440d1c156..28f963e3a 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,6 @@ "tests" ], "dependencies": { - "localforage": "^1.5.2", "html2canvas": "^0.4.1", "croppie": "^2.5.0", "sortablejs": "^1.6.0", diff --git a/package-lock.json b/package-lock.json index 9ae56fa71..250576ab0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "json.sortify": "~2.1.0", "less": "3.7.1", "lesshint": "6.3.7", + "localforage": "^1.5.2", "marked": "^1.1.0", "open-sans-fontface": "^1.4.0", "rangy": "~1.3.0", @@ -2891,6 +2892,24 @@ "immediate": "~3.0.5" } }, + "node_modules/localforage": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", + "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==", + "dev": true, + "dependencies": { + "lie": "3.1.1" + } + }, + "node_modules/localforage/node_modules/lie": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", + "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", + "dev": true, + "dependencies": { + "immediate": "~3.0.5" + } + }, "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -7433,6 +7452,26 @@ "immediate": "~3.0.5" } }, + "localforage": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", + "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==", + "dev": true, + "requires": { + "lie": "3.1.1" + }, + "dependencies": { + "lie": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", + "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", + "dev": true, + "requires": { + "immediate": "~3.0.5" + } + } + } + }, "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", diff --git a/package.json b/package.json index b41194ad6..5c28a44ad 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "json.sortify": "~2.1.0", "less": "3.7.1", "lesshint": "6.3.7", + "localforage": "^1.5.2", "marked": "^1.1.0", "open-sans-fontface": "^1.4.0", "rangy": "~1.3.0", diff --git a/scripts/copy-components.js b/scripts/copy-components.js index 0c68d3aeb..2d330e35e 100644 --- a/scripts/copy-components.js +++ b/scripts/copy-components.js @@ -29,6 +29,7 @@ Fse.mkdirpSync(componentsPath); "nthen", "open-sans-fontface", "bootstrap-tokenfield", + "localforage", ].forEach(l => { const source = Path.join("node_modules", l); const destination = Path.join(componentsPath, l); diff --git a/www/common/outer/cache-store.js b/www/common/outer/cache-store.js index 17fea6b16..a2af0a515 100644 --- a/www/common/outer/cache-store.js +++ b/www/common/outer/cache-store.js @@ -1,6 +1,6 @@ define([ '/common/common-util.js', - '/bower_components/localforage/dist/localforage.min.js', + '/components/localforage/dist/localforage.min.js', ], function (Util, localForage) { var S = window.CryptPad_Cache = {}; var onReady = Util.mkEvent(true); diff --git a/www/common/outer/local-store.js b/www/common/outer/local-store.js index 6f5f128ba..9a2cc997a 100644 --- a/www/common/outer/local-store.js +++ b/www/common/outer/local-store.js @@ -2,7 +2,7 @@ define([ '/common/common-constants.js', '/common/common-hash.js', '/common/outer/cache-store.js', - '/bower_components/localforage/dist/localforage.min.js', + '/components/localforage/dist/localforage.min.js', '/customize/application_config.js', '/common/common-util.js', ], function (Constants, Hash, Cache, localForage, AppConfig, Util) { diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js index 0fa708d73..3300aeb48 100644 --- a/www/common/sframe-common.js +++ b/www/common/sframe-common.js @@ -26,7 +26,7 @@ define([ '/common/common-feedback.js', '/common/common-language.js', '/common/common-constants.js', - '/bower_components/localforage/dist/localforage.min.js', + '/components/localforage/dist/localforage.min.js', '/common/hyperscript.js', ], function ( $, diff --git a/www/logout/main.js b/www/logout/main.js index 8fdef30b0..e239451a3 100644 --- a/www/logout/main.js +++ b/www/logout/main.js @@ -1,5 +1,5 @@ define([ - '/bower_components/localforage/dist/localforage.min.js', + '/components/localforage/dist/localforage.min.js', '/common/outer/cache-store.js', '/components/nthen/index.js', ], function (localForage, Cache, nThen) {