From e05e7717eb479c12a94fb1d30c1f9ce387c4cc38 Mon Sep 17 00:00:00 2001 From: Benoit Schweblin Date: Thu, 7 Jun 2018 23:56:11 +0000 Subject: [PATCH] Added tests --- .babelrc | 2 +- .gitignore | 3 +- package-lock.json | 3415 +++++++++++++++++ package.json | 22 +- src/components/App.vue | 51 +- src/components/ButtonBar.vue | 12 +- src/components/ContextMenu.vue | 8 +- src/components/Explorer.vue | 10 +- src/components/ExplorerNode.vue | 4 +- src/components/Modal.vue | 36 +- src/components/NavigationBar.vue | 21 +- src/components/ProviderName.vue | 17 - src/components/common/globals.js | 46 + src/components/gutters/Comment.vue | 2 +- src/components/gutters/CurrentDiscussion.vue | 2 +- src/components/menus/MoreMenu.vue | 2 +- src/components/modals/PandocExportModal.vue | 2 +- src/components/modals/PdfExportModal.vue | 2 +- .../modals/WorkspaceManagementModal.vue | 2 +- src/components/modals/common/ModalInner.vue | 2 +- src/data/faq.md | 4 +- src/data/pagedownButtons.js | 9 +- src/data/simpleModals.js | 97 + src/index.js | 4 +- src/libs/clunderscore.js | 3 +- src/services/explorerSvc.js | 15 +- src/services/fileSvc.js | 35 +- src/services/localDbSvc.js | 2 +- src/services/networkSvc.js | 39 +- .../providers/couchdbWorkspaceProvider.js | 141 +- .../providers/githubWorkspaceProvider.js | 220 +- .../providers/googleDriveAppDataProvider.js | 115 +- .../providers/googleDriveWorkspaceProvider.js | 198 +- .../providers/helpers/githubHelper.js | 14 +- .../providers/helpers/googleHelper.js | 13 +- .../providers/helpers/wordpressHelper.js | 5 +- src/services/publishSvc.js | 14 +- src/services/syncSvc.js | 264 +- src/services/utils.js | 13 +- src/store/content.js | 2 +- src/store/contextMenu.js | 30 +- src/store/discussion.js | 2 +- src/store/explorer.js | 6 +- src/store/index.js | 35 + src/store/modal.js | 95 - src/store/notification.js | 12 +- static/landing/index.html | 29 +- test/unit/.eslintrc | 8 + test/unit/jest.conf.js | 35 + test/unit/mocks/cryptoMock.js | 7 + test/unit/mocks/localStorageMock.js | 9 + test/unit/mocks/mutationObserverMock.js | 6 + test/unit/mocks/templateWorkerMock.js | 1 + test/unit/setup.js | 5 + test/unit/specs/components/ButtonBar.spec.js | 41 + .../unit/specs/components/ContextMenu.spec.js | 32 + test/unit/specs/components/Explorer.spec.js | 186 + .../specs/components/ExplorerNode.spec.js | 273 ++ .../specs/components/NavigationBar.spec.js | 17 + .../specs/components/Notification.spec.js | 38 + test/unit/specs/specUtils.js | 51 + 61 files changed, 5068 insertions(+), 718 deletions(-) delete mode 100644 src/components/ProviderName.vue create mode 100644 src/components/common/globals.js create mode 100644 src/data/simpleModals.js create mode 100644 test/unit/.eslintrc create mode 100644 test/unit/jest.conf.js create mode 100644 test/unit/mocks/cryptoMock.js create mode 100644 test/unit/mocks/localStorageMock.js create mode 100644 test/unit/mocks/mutationObserverMock.js create mode 100644 test/unit/mocks/templateWorkerMock.js create mode 100644 test/unit/setup.js create mode 100644 test/unit/specs/components/ButtonBar.spec.js create mode 100644 test/unit/specs/components/ContextMenu.spec.js create mode 100644 test/unit/specs/components/Explorer.spec.js create mode 100644 test/unit/specs/components/ExplorerNode.spec.js create mode 100644 test/unit/specs/components/NavigationBar.spec.js create mode 100644 test/unit/specs/components/Notification.spec.js create mode 100644 test/unit/specs/specUtils.js diff --git a/.babelrc b/.babelrc index 13f0e471..1d93173e 100644 --- a/.babelrc +++ b/.babelrc @@ -8,7 +8,7 @@ "env": { "test": { "presets": ["env", "stage-2"], - "plugins": [ "istanbul" ] + "plugins": ["transform-es2015-modules-commonjs", "dynamic-import-node"] } } } diff --git a/.gitignore b/.gitignore index 93a1cf6a..23a42a30 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,7 @@ node_modules/ dist/ .history npm-debug.log* -yarn-debug.log* -yarn-error.log* .vscode stackedit_v4 chrome-app/*.zip +/test/unit/coverage/ diff --git a/package-lock.json b/package-lock.json index 61ae1dfa..0083ac26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -599,6 +599,18 @@ "glob-to-regexp": "0.3.0" } }, + "@types/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=", + "dev": true + }, + "@types/strip-json-comments": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz", + "integrity": "sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==", + "dev": true + }, "@vue/component-compiler-utils": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-1.2.1.tgz", @@ -708,6 +720,14 @@ } } }, + "@vue/test-utils": { + "version": "1.0.0-beta.16", + "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.16.tgz", + "integrity": "sha512-TF9ae3zhs8qBN98Bix2Bh3IrwkhscEV3HRthPgtzJPNG0YHUyNTlZNXH36vbP0nuSAs9Om8XjVd8/MDj8ehpEA==", + "requires": { + "lodash": "4.17.4" + } + }, "abab": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", @@ -813,6 +833,12 @@ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, + "ansi-escapes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", + "dev": true + }, "ansi-gray": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", @@ -856,6 +882,15 @@ "normalize-path": "2.1.1" } }, + "append-transform": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", + "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -1040,6 +1075,12 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true + }, "async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", @@ -1357,6 +1398,12 @@ "babel-types": "6.26.0" } }, + "babel-helper-vue-jsx-merge-props": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", + "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==", + "dev": true + }, "babel-helpers": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", @@ -1367,6 +1414,16 @@ "babel-template": "6.26.0" } }, + "babel-jest": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-21.2.0.tgz", + "integrity": "sha512-O0W2qLoWu1QOoOGgxiR2JID4O6WSpxPiQanrkyi9SSlM0PJ60Ptzlck47lhtnr9YZO3zYOsxHwnyeWJ6AffoBQ==", + "dev": true, + "requires": { + "babel-plugin-istanbul": "4.1.6", + "babel-preset-jest": "21.2.0" + } + }, "babel-loader": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.4.tgz", @@ -1438,6 +1495,67 @@ "babel-runtime": "6.26.0" } }, + "babel-plugin-dynamic-import-node": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-1.2.0.tgz", + "integrity": "sha512-yeDwKaLgGdTpXL7RgGt5r6T4LmnTza/hUn5Ul8uZSGGMtEjYo13Nxai7SQaGCTEzUtg9Zq9qJn0EjEr7SeSlTQ==", + "dev": true, + "requires": { + "babel-plugin-syntax-dynamic-import": "6.18.0" + } + }, + "babel-plugin-istanbul": { + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz", + "integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==", + "dev": true, + "requires": { + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "find-up": "2.1.0", + "istanbul-lib-instrument": "1.10.1", + "test-exclude": "4.2.1" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + } + } + }, + "babel-plugin-jest-hoist": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.2.0.tgz", + "integrity": "sha512-yi5QuiVyyvhBUDLP4ButAnhYzkdrUwWDtvUJv71hjH3fclhnZg4HkDeqaitcR2dZZx/E67kGkRcPVjtVu+SJfQ==", + "dev": true + }, + "babel-plugin-jsx-event-modifiers": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/babel-plugin-jsx-event-modifiers/-/babel-plugin-jsx-event-modifiers-2.0.5.tgz", + "integrity": "sha512-tWGnCk0whZ+nZcj9tYLw4+y08tPJXqaEjIxRJZS6DkUUae72Kz4BsoGpxt/Kow7mmgQJpvFCw8IPLSNh5rkZCg==", + "dev": true + }, + "babel-plugin-jsx-v-model": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jsx-v-model/-/babel-plugin-jsx-v-model-2.0.3.tgz", + "integrity": "sha512-SIx3Y3XxwGEz56Q1atwr5GaZsxJ2IRYmn5dl38LFkaTAvjnbNQxsZHO+ylJPsd+Hmv+ixJBYYFEekPBTHwiGfQ==", + "dev": true, + "requires": { + "babel-plugin-syntax-jsx": "6.18.0", + "html-tags": "2.0.0", + "svg-tags": "1.0.0" + } + }, + "babel-plugin-jsx-vue-functional": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jsx-vue-functional/-/babel-plugin-jsx-vue-functional-2.1.0.tgz", + "integrity": "sha1-VjCgyG/hkE0owwRl5r8c9xI1ojk=", + "dev": true + }, "babel-plugin-syntax-async-functions": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", @@ -1474,6 +1592,12 @@ "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", "dev": true }, + "babel-plugin-syntax-jsx": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", + "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=", + "dev": true + }, "babel-plugin-syntax-object-rest-spread": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", @@ -1816,6 +1940,15 @@ "babel-types": "6.26.0" } }, + "babel-plugin-transform-vue-jsx": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.7.0.tgz", + "integrity": "sha512-W39X07/n3oJMQd8tALBO+440NraGSF//Lo1ydd/9Nme3+QiRGFBb1Q39T9iixh0jZPPbfv3so18tNoIgLatymw==", + "dev": true, + "requires": { + "esutils": "2.0.2" + } + }, "babel-polyfill": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", @@ -1876,6 +2009,16 @@ } } }, + "babel-preset-jest": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-21.2.0.tgz", + "integrity": "sha512-hm9cBnr2h3J7yXoTtAVV0zg+3vg0Q/gT2GYuzlreTU0EPkJRtlNgKJJ3tBKEn0+VjAi3JykV6xCJkuUYttEEfA==", + "dev": true, + "requires": { + "babel-plugin-jest-hoist": "21.2.0", + "babel-plugin-syntax-object-rest-spread": "6.13.0" + } + }, "babel-preset-stage-2": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz", @@ -1901,6 +2044,34 @@ "babel-plugin-transform-object-rest-spread": "6.26.0" } }, + "babel-preset-vue": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/babel-preset-vue/-/babel-preset-vue-1.2.1.tgz", + "integrity": "sha512-a/Z+6SJ4GXyAoCMfYidDH6OzXnccPNJ5nEaPMjALqCkP9SJkqxz9V0uUS//sGuWszcD8kibdwJRzU+brl8DdFQ==", + "dev": true, + "requires": { + "babel-helper-vue-jsx-merge-props": "2.0.3", + "babel-plugin-jsx-event-modifiers": "2.0.5", + "babel-plugin-jsx-v-model": "2.0.3", + "babel-plugin-jsx-vue-functional": "2.1.0", + "babel-plugin-syntax-jsx": "6.18.0", + "babel-plugin-transform-vue-jsx": "3.7.0" + } + }, + "babel-preset-vue-app": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/babel-preset-vue-app/-/babel-preset-vue-app-1.3.2.tgz", + "integrity": "sha512-PLyyyVdrvgL4szMF7D5SuUhy85aBzy0+s5MO2QhpTwVqfW0qVaPFJi6K3d25CKz1nOV437JgpVvPj1W6tLGJ5g==", + "dev": true, + "requires": { + "babel-plugin-syntax-dynamic-import": "6.18.0", + "babel-plugin-transform-object-rest-spread": "6.26.0", + "babel-plugin-transform-runtime": "6.23.0", + "babel-preset-env": "1.6.1", + "babel-preset-vue": "1.2.1", + "babel-runtime": "6.26.0" + } + }, "babel-register": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", @@ -2153,6 +2324,23 @@ "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.2.tgz", "integrity": "sha1-Ql1opY00R/AqBKqJQYf86K+Le44=" }, + "browser-resolve": { + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz", + "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=", + "dev": true, + "requires": { + "resolve": "1.1.7" + }, + "dependencies": { + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + } + } + }, "browserify-aes": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", @@ -2233,6 +2421,15 @@ "electron-to-chromium": "1.3.30" } }, + "bser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz", + "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=", + "dev": true, + "requires": { + "node-int64": "0.4.0" + } + }, "buffer": { "version": "4.9.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", @@ -2271,6 +2468,12 @@ "integrity": "sha1-ypRw6NTRuXf9dUP04qtqfclRAag=", "dev": true }, + "buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==", + "dev": true + }, "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", @@ -2426,6 +2629,15 @@ "integrity": "sha1-jjV0Xv1IOj4ju301CZAybSMZ/BY=", "dev": true }, + "capture-exit": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz", + "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=", + "dev": true, + "requires": { + "rsvp": "3.6.2" + } + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -2622,6 +2834,12 @@ "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", "dev": true }, + "ci-info": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", + "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==", + "dev": true + }, "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", @@ -2947,6 +3165,12 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, + "compare-versions": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.2.1.tgz", + "integrity": "sha512-2y2nHcopMG/NAyk6vWXlLs86XeM9sik4jmx1tKIgzMi9/RQ2eo758RGpxQO3ErihHmg0RlQITPqgz73y6s7quA==", + "dev": true + }, "component-emitter": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", @@ -3009,6 +3233,27 @@ } } }, + "condense-newlines": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz", + "integrity": "sha1-PemFVTE5R10yUCyDsC9gaE0kxV8=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-whitespace": "0.3.0", + "kind-of": "3.2.2" + } + }, + "config-chain": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz", + "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=", + "dev": true, + "requires": { + "ini": "1.3.5", + "proto-list": "1.2.4" + } + }, "connect-history-api-fallback": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", @@ -3590,6 +3835,26 @@ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, + "default-require-extensions": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", + "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", + "dev": true, + "requires": { + "strip-bom": "2.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + } + } + }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -3718,6 +3983,18 @@ "repeating": "2.0.1" } }, + "detect-newline": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", + "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", + "dev": true + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, "diff-match-patch": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.0.tgz", @@ -3904,6 +4181,30 @@ "jsbn": "0.1.1" } }, + "editorconfig": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz", + "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==", + "dev": true, + "requires": { + "bluebird": "3.5.1", + "commander": "2.12.2", + "lru-cache": "3.2.0", + "semver": "5.5.0", + "sigmund": "1.0.1" + }, + "dependencies": { + "lru-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz", + "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=", + "dev": true, + "requires": { + "pseudomap": "1.0.2" + } + } + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -4648,6 +4949,49 @@ "safe-buffer": "5.1.1" } }, + "exec-sh": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.1.tgz", + "integrity": "sha512-aLt95pexaugVtQerpmE51+4QfWrNc304uez7jvj6fWnN8GeEHpttB8F36n8N7uVhUMbH/1enbxQ9HImZ4w/9qg==", + "dev": true, + "requires": { + "merge": "1.2.0" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + } + } + }, "execall": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz", @@ -4663,6 +5007,12 @@ "integrity": "sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=", "dev": true }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true + }, "expand-brackets": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", @@ -4690,6 +5040,31 @@ "homedir-polyfill": "1.0.1" } }, + "expect": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/expect/-/expect-23.0.1.tgz", + "integrity": "sha1-mRMfL9kRVZX4zDaXQB5/BzTUX+8=", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "jest-diff": "23.0.1", + "jest-get-type": "22.4.3", + "jest-matcher-utils": "23.0.1", + "jest-message-util": "23.0.0", + "jest-regex-util": "23.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + } + } + }, "express": { "version": "4.16.3", "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", @@ -5387,6 +5762,15 @@ "lodash": "4.17.4" } }, + "fb-watchman": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz", + "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=", + "dev": true, + "requires": { + "bser": "2.0.0" + } + }, "fd-slicer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", @@ -5474,6 +5858,16 @@ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", "dev": true }, + "fileset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", + "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", + "dev": true, + "requires": { + "glob": "7.1.2", + "minimatch": "3.0.4" + } + }, "filesize": { "version": "3.5.11", "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", @@ -5493,6 +5887,24 @@ "repeat-string": "1.6.1" } }, + "find-babel-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.1.0.tgz", + "integrity": "sha1-rMAQQ6Z0n+w0Qpvmtk9ULrtdY1U=", + "dev": true, + "requires": { + "json5": "0.5.1", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, "find-cache-dir": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", @@ -7307,6 +7719,12 @@ "lodash": "4.17.4" } }, + "growly": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", + "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", + "dev": true + }, "gulp": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz", @@ -8266,6 +8684,15 @@ } } }, + "identity-obj-proxy": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz", + "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=", + "dev": true, + "requires": { + "harmony-reflect": "1.5.1" + } + }, "ieee754": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", @@ -8306,6 +8733,36 @@ "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==", "dev": true }, + "import-local": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz", + "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==", + "dev": true, + "requires": { + "pkg-dir": "2.0.0", + "resolve-cwd": "2.0.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "2.1.0" + } + } + } + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -8533,6 +8990,15 @@ "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", "dev": true }, + "is-ci": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", + "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", + "dev": true, + "requires": { + "ci-info": "1.1.3" + } + }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", @@ -8638,6 +9104,12 @@ "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=", "dev": true }, + "is-generator-fn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-1.0.0.tgz", + "integrity": "sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=", + "dev": true + }, "is-glob": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", @@ -8848,6 +9320,12 @@ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, + "is-whitespace": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", + "integrity": "sha1-Fjnssb4DauxppUy7QBz77XEUq38=", + "dev": true + }, "is-whitespace-character": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz", @@ -8891,6 +9369,1191 @@ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, + "istanbul-api": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.1.tgz", + "integrity": "sha512-duj6AlLcsWNwUpfyfHt0nWIeRiZpuShnP40YTxOGQgtaN8fd6JYSxsvxUphTDy8V5MfDXo4s/xVCIIvVCO808g==", + "dev": true, + "requires": { + "async": "2.6.1", + "compare-versions": "3.2.1", + "fileset": "2.0.3", + "istanbul-lib-coverage": "1.2.0", + "istanbul-lib-hook": "1.2.0", + "istanbul-lib-instrument": "1.10.1", + "istanbul-lib-report": "1.1.4", + "istanbul-lib-source-maps": "1.2.4", + "istanbul-reports": "1.3.0", + "js-yaml": "3.11.0", + "mkdirp": "0.5.1", + "once": "1.4.0" + }, + "dependencies": { + "async": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "dev": true, + "requires": { + "lodash": "4.17.10" + } + }, + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "dev": true + } + } + }, + "istanbul-lib-coverage": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz", + "integrity": "sha512-GvgM/uXRwm+gLlvkWHTjDAvwynZkL9ns15calTrmhGgowlwJBbWMYzWbKqE2DT6JDP1AFXKa+Zi0EkqNCUqY0A==", + "dev": true + }, + "istanbul-lib-hook": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.0.tgz", + "integrity": "sha512-p3En6/oGkFQV55Up8ZPC2oLxvgSxD8CzA0yBrhRZSh3pfv3OFj9aSGVC0yoerAi/O4u7jUVnOGVX1eVFM+0tmQ==", + "dev": true, + "requires": { + "append-transform": "0.4.0" + } + }, + "istanbul-lib-instrument": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz", + "integrity": "sha512-1dYuzkOCbuR5GRJqySuZdsmsNKPL3PTuyPevQfoCXJePT9C8y1ga75neU+Tuy9+yS3G/dgx8wgOmp2KLpgdoeQ==", + "dev": true, + "requires": { + "babel-generator": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "istanbul-lib-coverage": "1.2.0", + "semver": "5.5.0" + } + }, + "istanbul-lib-report": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz", + "integrity": "sha512-Azqvq5tT0U09nrncK3q82e/Zjkxa4tkFZv7E6VcqP0QCPn6oNljDPfrZEC/umNXds2t7b8sRJfs6Kmpzt8m2kA==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" + } + }, + "istanbul-lib-source-maps": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz", + "integrity": "sha512-UzuK0g1wyQijiaYQxj/CdNycFhAd2TLtO2obKQMTZrZ1jzEMRY3rvpASEKkaxbRR6brvdovfA03znPa/pXcejg==", + "dev": true, + "requires": { + "debug": "3.1.0", + "istanbul-lib-coverage": "1.2.0", + "mkdirp": "0.5.1", + "rimraf": "2.6.2", + "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "istanbul-reports": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.3.0.tgz", + "integrity": "sha512-y2Z2IMqE1gefWUaVjrBm0mSKvUkaBy9Vqz8iwr/r40Y9hBbIteH5wqHG/9DLTfJ9xUnUT2j7A3+VVJ6EaYBllA==", + "dev": true, + "requires": { + "handlebars": "4.0.11" + } + }, + "jest": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest/-/jest-23.0.1.tgz", + "integrity": "sha1-DQgykO5BEs7Pt4Dfb/gTMu03MgE=", + "dev": true, + "requires": { + "import-local": "1.0.0", + "jest-cli": "23.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "jest-cli": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-23.0.1.tgz", + "integrity": "sha1-NRpbpRzyjs8gM22XowuXDR9TClY=", + "dev": true, + "requires": { + "ansi-escapes": "3.1.0", + "chalk": "2.4.1", + "exit": "0.1.2", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "import-local": "1.0.0", + "is-ci": "1.1.0", + "istanbul-api": "1.3.1", + "istanbul-lib-coverage": "1.2.0", + "istanbul-lib-instrument": "1.10.1", + "istanbul-lib-source-maps": "1.2.4", + "jest-changed-files": "23.0.1", + "jest-config": "23.0.1", + "jest-environment-jsdom": "23.0.1", + "jest-get-type": "22.4.3", + "jest-haste-map": "23.0.1", + "jest-message-util": "23.0.0", + "jest-regex-util": "23.0.0", + "jest-resolve-dependencies": "23.0.1", + "jest-runner": "23.0.1", + "jest-runtime": "23.0.1", + "jest-snapshot": "23.0.1", + "jest-util": "23.0.1", + "jest-validate": "23.0.1", + "jest-worker": "23.0.1", + "micromatch": "2.3.11", + "node-notifier": "5.2.1", + "realpath-native": "1.0.0", + "rimraf": "2.6.2", + "slash": "1.0.0", + "string-length": "2.0.0", + "strip-ansi": "4.0.0", + "which": "1.3.0", + "yargs": "11.0.0" + } + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "yargs": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", + "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "dev": true, + "requires": { + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" + } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + } + } + } + }, + "jest-changed-files": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.0.1.tgz", + "integrity": "sha1-95Vy0HIIROpd+EwqRI6GLCJU9gw=", + "dev": true, + "requires": { + "throat": "4.1.0" + } + }, + "jest-config": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.0.1.tgz", + "integrity": "sha1-Z5i/8SR8ejkLEycZMwUAFYL8WPo=", + "dev": true, + "requires": { + "babel-core": "6.26.3", + "babel-jest": "23.0.1", + "chalk": "2.4.1", + "glob": "7.1.2", + "jest-environment-jsdom": "23.0.1", + "jest-environment-node": "23.0.1", + "jest-get-type": "22.4.3", + "jest-jasmine2": "23.0.1", + "jest-regex-util": "23.0.0", + "jest-resolve": "23.0.1", + "jest-util": "23.0.1", + "jest-validate": "23.0.1", + "pretty-format": "23.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "babel-jest": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.0.1.tgz", + "integrity": "sha1-u6079SP7IC2gXtCmVAtIyE7tE6Y=", + "dev": true, + "requires": { + "babel-plugin-istanbul": "4.1.6", + "babel-preset-jest": "23.0.1" + } + }, + "babel-plugin-jest-hoist": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.1.tgz", + "integrity": "sha1-6qEclkVjrqnCG+zvK994U/fzwUg=", + "dev": true + }, + "babel-preset-jest": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.0.1.tgz", + "integrity": "sha1-YxzFRcbPAhlDATvK8i9F2H/mIZg=", + "dev": true, + "requires": { + "babel-plugin-jest-hoist": "23.0.1", + "babel-plugin-syntax-object-rest-spread": "6.13.0" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-diff": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.0.1.tgz", + "integrity": "sha1-PUkTfO4SwyCktNK0pvpugtSRoWo=", + "dev": true, + "requires": { + "chalk": "2.4.1", + "diff": "3.5.0", + "jest-get-type": "22.4.3", + "pretty-format": "23.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-docblock": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.0.1.tgz", + "integrity": "sha1-3t3RgzO+XcJBUmCgTvP86SdrVyU=", + "dev": true, + "requires": { + "detect-newline": "2.1.0" + } + }, + "jest-each": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-23.0.1.tgz", + "integrity": "sha1-puXb9TCvxr+ddHkt3mnY23D4RwY=", + "dev": true, + "requires": { + "chalk": "2.4.1", + "pretty-format": "23.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-environment-jsdom": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.0.1.tgz", + "integrity": "sha1-2mieuTWNwW5XCKuyCPTrJqQ5V1w=", + "dev": true, + "requires": { + "jest-mock": "23.0.1", + "jest-util": "23.0.1", + "jsdom": "11.11.0" + } + }, + "jest-environment-node": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.0.1.tgz", + "integrity": "sha1-Z2t0DiBfHyvnckGWnngSvoJO55U=", + "dev": true, + "requires": { + "jest-mock": "23.0.1", + "jest-util": "23.0.1" + } + }, + "jest-get-type": { + "version": "22.4.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", + "dev": true + }, + "jest-haste-map": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.0.1.tgz", + "integrity": "sha1-zYkFKr/Iy6AfVgu+wJ1PNq7CXU8=", + "dev": true, + "requires": { + "fb-watchman": "2.0.0", + "graceful-fs": "4.1.11", + "jest-docblock": "23.0.1", + "jest-serializer": "23.0.1", + "jest-worker": "23.0.1", + "micromatch": "2.3.11", + "sane": "2.5.2" + } + }, + "jest-jasmine2": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.0.1.tgz", + "integrity": "sha1-Fth1NW5jYIcrukhCb30x/cGwvOo=", + "dev": true, + "requires": { + "chalk": "2.4.1", + "co": "4.6.0", + "expect": "23.0.1", + "is-generator-fn": "1.0.0", + "jest-diff": "23.0.1", + "jest-each": "23.0.1", + "jest-matcher-utils": "23.0.1", + "jest-message-util": "23.0.0", + "jest-snapshot": "23.0.1", + "jest-util": "23.0.1", + "pretty-format": "23.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-leak-detector": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-23.0.1.tgz", + "integrity": "sha1-nboHUFrDSVw50+wJrB5WRZnoYaA=", + "dev": true, + "requires": { + "pretty-format": "23.0.1" + } + }, + "jest-matcher-utils": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz", + "integrity": "sha1-DGwNrt+YM8Kn82I2Bp7+y0w/bl8=", + "dev": true, + "requires": { + "chalk": "2.4.1", + "jest-get-type": "22.4.3", + "pretty-format": "23.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-message-util": { + "version": "23.0.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.0.0.tgz", + "integrity": "sha1-Bz89dscB98cYpLmvHrfxOHksR5Y=", + "dev": true, + "requires": { + "@babel/code-frame": "7.0.0-beta.44", + "chalk": "2.4.1", + "micromatch": "2.3.11", + "slash": "1.0.0", + "stack-utils": "1.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-mock": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.0.1.tgz", + "integrity": "sha1-FWn0d5aMZo/HKCc6F8N2d3O0Y1c=", + "dev": true + }, + "jest-raw-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz", + "integrity": "sha1-zp9W1UZQ8VfEp9FtIkul1hO81iY=", + "dev": true + }, + "jest-regex-util": { + "version": "23.0.0", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-23.0.0.tgz", + "integrity": "sha1-3Vwf3gxG9DcTFM8Q96dRoj9Oj3Y=", + "dev": true + }, + "jest-resolve": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.0.1.tgz", + "integrity": "sha1-P4QDRisQo0wt8dR6q1V0xJNbzSQ=", + "dev": true, + "requires": { + "browser-resolve": "1.11.2", + "chalk": "2.4.1", + "realpath-native": "1.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-resolve-dependencies": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-23.0.1.tgz", + "integrity": "sha1-0BoQ3a2RUsTOzfXqwriFccS2pk0=", + "dev": true, + "requires": { + "jest-regex-util": "23.0.0", + "jest-snapshot": "23.0.1" + } + }, + "jest-runner": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-23.0.1.tgz", + "integrity": "sha1-sXauPs+eGUqkuEp/z3DRuNsjGqc=", + "dev": true, + "requires": { + "exit": "0.1.2", + "graceful-fs": "4.1.11", + "jest-config": "23.0.1", + "jest-docblock": "23.0.1", + "jest-haste-map": "23.0.1", + "jest-jasmine2": "23.0.1", + "jest-leak-detector": "23.0.1", + "jest-message-util": "23.0.0", + "jest-runtime": "23.0.1", + "jest-util": "23.0.1", + "jest-worker": "23.0.1", + "source-map-support": "0.5.6", + "throat": "4.1.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz", + "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", + "dev": true, + "requires": { + "buffer-from": "1.0.0", + "source-map": "0.6.1" + } + } + } + }, + "jest-runtime": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-23.0.1.tgz", + "integrity": "sha1-sddl+wP7bUBDgFrycGdqaT9QTVc=", + "dev": true, + "requires": { + "babel-core": "6.26.3", + "babel-plugin-istanbul": "4.1.6", + "chalk": "2.4.1", + "convert-source-map": "1.5.1", + "exit": "0.1.2", + "fast-json-stable-stringify": "2.0.0", + "graceful-fs": "4.1.11", + "jest-config": "23.0.1", + "jest-haste-map": "23.0.1", + "jest-message-util": "23.0.0", + "jest-regex-util": "23.0.0", + "jest-resolve": "23.0.1", + "jest-snapshot": "23.0.1", + "jest-util": "23.0.1", + "jest-validate": "23.0.1", + "micromatch": "2.3.11", + "realpath-native": "1.0.0", + "slash": "1.0.0", + "strip-bom": "3.0.0", + "write-file-atomic": "2.3.0", + "yargs": "11.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "yargs": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", + "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "dev": true, + "requires": { + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" + } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + } + } + } + }, + "jest-serializer": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-23.0.1.tgz", + "integrity": "sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=", + "dev": true + }, + "jest-serializer-vue": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/jest-serializer-vue/-/jest-serializer-vue-0.3.0.tgz", + "integrity": "sha512-Id1x3XabYu2r6BnmTfGk2tY172BEqR+vAzSvPk4VF8HyVqwebxZQbqiZ/giAtCnRSqi6lzxuyvzQbwQ6bo6Hbg==", + "dev": true, + "requires": { + "pretty": "2.0.0" + } + }, + "jest-snapshot": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.0.1.tgz", + "integrity": "sha1-ZnT6Gbnraamcq+zUFb3cQtavPn4=", + "dev": true, + "requires": { + "chalk": "2.4.1", + "jest-diff": "23.0.1", + "jest-matcher-utils": "23.0.1", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "pretty-format": "23.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-util": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.0.1.tgz", + "integrity": "sha1-aOpb1+2xd9MFn5eXJZ+ODazOL5k=", + "dev": true, + "requires": { + "callsites": "2.0.0", + "chalk": "2.4.1", + "graceful-fs": "4.1.11", + "is-ci": "1.1.0", + "jest-message-util": "23.0.0", + "mkdirp": "0.5.1", + "source-map": "0.6.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "callsites": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", + "dev": true + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-validate": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.0.1.tgz", + "integrity": "sha1-zZ8BqJ0mu4hfEqhmdxXpyGWldU8=", + "dev": true, + "requires": { + "chalk": "2.4.1", + "jest-get-type": "22.4.3", + "leven": "2.1.0", + "pretty-format": "23.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "jest-worker": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-23.0.1.tgz", + "integrity": "sha1-nmSd2WP/QEYCb5HEAX8Dmmqkp7w=", + "dev": true, + "requires": { + "merge-stream": "1.0.1" + } + }, "jimp": { "version": "0.2.28", "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.2.28.tgz", @@ -8932,6 +10595,18 @@ "integrity": "sha512-Wehd+7Pf9tFvGb+ydPm9TjYjV8X1YHOVyG8QyELZxEMqOhemVwGRmoG8iQ/soqI3n8v4xn59zaLxiCJiaaRzKA==", "dev": true }, + "js-beautify": { + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz", + "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==", + "dev": true, + "requires": { + "config-chain": "1.1.11", + "editorconfig": "0.13.3", + "mkdirp": "0.5.1", + "nopt": "3.0.6" + } + }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", @@ -8953,6 +10628,68 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "optional": true }, + "jsdom": { + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.11.0.tgz", + "integrity": "sha512-ou1VyfjwsSuWkudGxb03FotDajxAto6USAlmMZjE2lc0jCznt7sBWkhfRBRaWwbnmDqdMSTKTLT5d9sBFkkM7A==", + "dev": true, + "requires": { + "abab": "1.0.4", + "acorn": "5.3.0", + "acorn-globals": "4.1.0", + "array-equal": "1.0.0", + "cssom": "0.3.2", + "cssstyle": "0.3.1", + "data-urls": "1.0.0", + "domexception": "1.0.1", + "escodegen": "1.9.0", + "html-encoding-sniffer": "1.0.2", + "left-pad": "1.2.0", + "nwsapi": "2.0.1", + "parse5": "4.0.0", + "pn": "1.1.0", + "request": "2.85.0", + "request-promise-native": "1.0.5", + "sax": "1.2.4", + "symbol-tree": "3.2.2", + "tough-cookie": "2.3.3", + "w3c-hr-time": "1.0.1", + "webidl-conversions": "4.0.2", + "whatwg-encoding": "1.0.3", + "whatwg-mimetype": "2.1.0", + "whatwg-url": "6.4.1", + "ws": "4.0.0", + "xml-name-validator": "3.0.0" + }, + "dependencies": { + "cssstyle": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.3.1.tgz", + "integrity": "sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==", + "dev": true, + "requires": { + "cssom": "0.3.2" + } + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "dev": true + }, + "whatwg-url": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.4.1.tgz", + "integrity": "sha512-FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw==", + "dev": true, + "requires": { + "lodash.sortby": "4.7.0", + "tr46": "1.0.1", + "webidl-conversions": "4.0.2" + } + } + } + }, "jsesc": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", @@ -9095,6 +10832,12 @@ "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.2.0.tgz", "integrity": "sha1-0wpzxrggHY99jnlWupYWCHpo4O4=" }, + "leven": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", + "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=", + "dev": true + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -9459,6 +11202,15 @@ "kind-of": "3.2.2" } }, + "makeerror": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", + "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=", + "dev": true, + "requires": { + "tmpl": "1.0.4" + } + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -9615,6 +11367,15 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "dev": true, + "requires": { + "mimic-fn": "1.1.0" + } + }, "memory-fs": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz", @@ -9707,6 +11468,12 @@ } } }, + "merge": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz", + "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=", + "dev": true + }, "merge-defaults": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/merge-defaults/-/merge-defaults-0.2.1.tgz", @@ -9747,6 +11514,15 @@ } } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, "merge2": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz", @@ -10086,6 +11862,24 @@ "lower-case": "1.1.4" } }, + "node-cache": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/node-cache/-/node-cache-4.2.0.tgz", + "integrity": "sha512-obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw==", + "dev": true, + "requires": { + "clone": "2.1.1", + "lodash": "4.17.4" + }, + "dependencies": { + "clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "dev": true + } + } + }, "node-gyp": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", @@ -10115,6 +11909,12 @@ } } }, + "node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=", + "dev": true + }, "node-libs-browser": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", @@ -10158,6 +11958,18 @@ } } }, + "node-notifier": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz", + "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==", + "dev": true, + "requires": { + "growly": "1.3.0", + "semver": "5.5.0", + "shellwords": "0.1.1", + "which": "1.3.0" + } + }, "node-rest-client": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/node-rest-client/-/node-rest-client-1.8.0.tgz", @@ -10606,6 +12418,15 @@ } } }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "2.0.1" + } + }, "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", @@ -10644,6 +12465,12 @@ "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz", "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==" }, + "nwsapi": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.1.tgz", + "integrity": "sha512-xOJJb7kAAGy6UOklbaIPA0iu/27VMHfAbMUgYJlXz4qRXytIkPGM2vwfbxa+tbaqcqHNsP6RN4eDZlePelWKpQ==", + "dev": true + }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", @@ -11060,6 +12887,12 @@ "os-tmpdir": "1.0.2" } }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true + }, "p-limit": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz", @@ -11318,6 +13151,12 @@ "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", "dev": true }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, "path-parse": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", @@ -12177,6 +14016,17 @@ "integrity": "sha1-wa0g6APndJ+vkFpAnSNn4Gu+cyU=", "dev": true }, + "pretty": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz", + "integrity": "sha1-rbx5YLe7/iiaVX3F9zdhmiINBqU=", + "dev": true, + "requires": { + "condense-newlines": "0.2.1", + "extend-shallow": "2.0.1", + "js-beautify": "1.7.5" + } + }, "pretty-error": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", @@ -12187,6 +14037,33 @@ "utila": "0.4.0" } }, + "pretty-format": { + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-23.0.1.tgz", + "integrity": "sha1-1h0GUmjkx1kIO8y8onoBrXx2AfQ=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0", + "ansi-styles": "3.2.1" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + } + } + }, "pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", @@ -12231,6 +14108,12 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, + "proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "dev": true + }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -12484,6 +14367,15 @@ "set-immediate-shim": "1.0.1" } }, + "realpath-native": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.0.0.tgz", + "integrity": "sha512-XJtlRJ9jf0E1H1SLeJyQ9PGzQD7S65h1pRXEcAeK48doKOnKxcgPeNohJvD5u/2sI9J1oke6E8bZHS/fmW1UiQ==", + "dev": true, + "requires": { + "util.promisify": "1.0.0" + } + }, "rechoir": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", @@ -12939,6 +14831,23 @@ "path-parse": "1.0.5" } }, + "resolve-cwd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", + "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "dev": true, + "requires": { + "resolve-from": "3.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true + } + } + }, "resolve-dir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", @@ -12998,6 +14907,12 @@ "resolved": "https://registry.npmjs.org/rsa-pem-from-mod-exp/-/rsa-pem-from-mod-exp-0.8.4.tgz", "integrity": "sha1-NipCxtMEBW1JOz8SvOq7LGV2ptQ=" }, + "rsvp": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz", + "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==", + "dev": true + }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -13036,6 +14951,920 @@ "ret": "0.1.15" } }, + "sane": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/sane/-/sane-2.5.2.tgz", + "integrity": "sha1-tNwYYcIbQn6SlQej51HiosuKs/o=", + "dev": true, + "requires": { + "anymatch": "2.0.0", + "capture-exit": "1.2.0", + "exec-sh": "0.2.1", + "fb-watchman": "2.0.0", + "fsevents": "1.2.4", + "micromatch": "3.1.10", + "minimist": "1.2.0", + "walker": "1.0.7", + "watch": "0.18.0" + }, + "dependencies": { + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "3.1.10", + "normalize-path": "2.1.1" + } + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.1", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, + "requires": { + "is-descriptor": "1.0.2", + "isobject": "3.0.1" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.0", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.0", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fsevents": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", + "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", + "dev": true, + "optional": true, + "requires": { + "nan": "2.10.0", + "node-pre-gyp": "0.10.0" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.6" + } + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "chownr": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "debug": { + "version": "2.6.9", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "optional": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "fs-minipass": { + "version": "1.2.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "2.2.4" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "iconv-lite": { + "version": "0.4.21", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safer-buffer": "2.1.2" + } + }, + "ignore-walk": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "brace-expansion": "1.1.11" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "minipass": { + "version": "2.2.4", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.1.1", + "yallist": "3.0.2" + } + }, + "minizlib": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "2.2.4" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "needle": { + "version": "2.2.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "2.6.9", + "iconv-lite": "0.4.21", + "sax": "1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.10.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "detect-libc": "1.0.3", + "mkdirp": "0.5.1", + "needle": "2.2.0", + "nopt": "4.0.1", + "npm-packlist": "1.1.10", + "npmlog": "4.1.2", + "rc": "1.2.7", + "rimraf": "2.6.2", + "semver": "5.5.0", + "tar": "4.4.1" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "abbrev": "1.1.1", + "osenv": "0.1.5" + } + }, + "npm-bundled": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.1.10", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.3" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "deep-extend": "0.5.1", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "rimraf": { + "version": "2.6.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.1.1", + "bundled": true, + "dev": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true + }, + "semver": { + "version": "5.5.0", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "4.4.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "chownr": "1.0.1", + "fs-minipass": "1.2.5", + "minipass": "2.2.4", + "minizlib": "1.1.0", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.1", + "yallist": "3.0.2" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "yallist": { + "version": "3.0.2", + "bundled": true, + "dev": true + } + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-odd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", + "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", + "dev": true, + "requires": { + "is-number": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "dev": true + } + } + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.0", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "nan": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", + "dev": true, + "optional": true + }, + "nanomatch": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.0", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + } + }, + "to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, + "requires": { + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" + }, + "dependencies": { + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dev": true, + "requires": { + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" + } + } + } + } + } + }, "sass-graph": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", @@ -13396,6 +16225,12 @@ "rechoir": "0.6.2" } }, + "shellwords": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", + "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", + "dev": true + }, "sigmund": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", @@ -14403,6 +17238,12 @@ "safe-buffer": "5.1.1" } }, + "stack-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.1.tgz", + "integrity": "sha1-1PM6tU6OOHeLDKXP07OvsS22hiA=", + "dev": true + }, "stackframe": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz", @@ -14578,6 +17419,33 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string-length": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz", + "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=", + "dev": true, + "requires": { + "astral-regex": "1.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -14630,6 +17498,12 @@ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", "dev": true }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, "strip-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", @@ -15670,12 +18544,436 @@ "inherits": "2.0.3" } }, + "test-exclude": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.1.tgz", + "integrity": "sha512-qpqlP/8Zl+sosLxBcVKl9vYy26T9NPalxSzzCP/OY6K7j938ui2oKgo+kRZYfxAeIpLqpbVnsHq1tyV70E4lWQ==", + "dev": true, + "requires": { + "arrify": "1.0.1", + "micromatch": "3.1.10", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "require-main-filename": "1.0.1" + }, + "dependencies": { + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.2", + "snapdragon": "0.8.1", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, + "requires": { + "is-descriptor": "1.0.2", + "isobject": "3.0.1" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.0", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "0.1.6" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" + } + }, + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } + } + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "2.0.4" + } + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.0", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "1.0.2" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-odd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-odd/-/is-odd-2.0.0.tgz", + "integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==", + "dev": true, + "requires": { + "is-number": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", + "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", + "dev": true + } + } + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true + }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.2", + "nanomatch": "1.2.9", + "object.pick": "1.3.0", + "regex-not": "1.0.0", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + } + }, + "nanomatch": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.9.tgz", + "integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-odd": "2.0.0", + "is-windows": "1.0.2", + "kind-of": "6.0.2", + "object.pick": "1.3.0", + "regex-not": "1.0.0", + "snapdragon": "0.8.1", + "to-regex": "3.0.2" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, + "requires": { + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" + }, + "dependencies": { + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dev": true, + "requires": { + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" + } + } + } + } + } + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "throat": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz", + "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=", + "dev": true + }, "throttleit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", @@ -15746,6 +19044,12 @@ "os-tmpdir": "1.0.2" } }, + "tmpl": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", + "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=", + "dev": true + }, "to-arraybuffer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", @@ -15978,6 +19282,18 @@ } } }, + "tsconfig": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz", + "integrity": "sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==", + "dev": true, + "requires": { + "@types/strip-bom": "3.0.0", + "@types/strip-json-comments": "0.0.30", + "strip-bom": "3.0.0", + "strip-json-comments": "2.0.1" + } + }, "tty-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", @@ -16756,6 +20072,67 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz", "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ==" }, + "vue-jest": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-1.4.0.tgz", + "integrity": "sha512-X5YXTXcpklijK3wXG/CiW8Frkz+YPBjR+//FD5rcmlnmEelz+8AQpKA8vhbAHJx3gOhA2tkWt8XEjvxq1S0heg==", + "dev": true, + "requires": { + "babel-core": "6.26.3", + "babel-preset-vue-app": "1.3.2", + "chalk": "2.4.1", + "find-babel-config": "1.1.0", + "js-beautify": "1.7.5", + "node-cache": "4.2.0", + "object-assign": "4.1.1", + "source-map": "0.5.7", + "tsconfig": "7.0.0", + "vue-template-es2015-compiler": "1.6.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, "vue-loader": { "version": "15.0.9", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.0.9.tgz", @@ -16840,6 +20217,33 @@ "browser-process-hrtime": "0.1.2" } }, + "walker": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", + "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", + "dev": true, + "requires": { + "makeerror": "1.0.11" + } + }, + "watch": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/watch/-/watch-0.18.0.tgz", + "integrity": "sha1-KAlUdsbffJDJYxOJkMClQj60uYY=", + "dev": true, + "requires": { + "exec-sh": "0.2.1", + "minimist": "1.2.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, "webidl-conversions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", @@ -17289,6 +20693,17 @@ "mkdirp": "0.5.1" } }, + "write-file-atomic": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", + "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.2" + } + }, "ws": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/ws/-/ws-4.0.0.tgz", diff --git a/package.json b/package.json index 005e076b..4087ee1d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,9 @@ "build": "node build/build.js && npm run build-style", "build-style": "webpack --config build/webpack.style.conf.js", "lint": "eslint --ext .js,.vue src server", - "test": "npm run lint", + "unit": "jest --config test/unit/jest.conf.js --runInBand", + "unit-with-coverage": "jest --config test/unit/jest.conf.js --runInBand --coverage", + "test": "npm run lint && npm run unit", "preversion": "npm run test", "postversion": "git push origin master --tags && npm publish", "patch": "npm version patch -m \"Tag v%s\"", @@ -22,7 +24,9 @@ "major": "npm version major -m \"Tag v%s\"" }, "dependencies": { + "@vue/test-utils": "^1.0.0-beta.16", "aws-sdk": "^2.133.0", + "babel-runtime": "^6.26.0", "bezier-easing": "^1.1.0", "body-parser": "^1.18.2", "clipboard": "^1.7.1", @@ -59,8 +63,11 @@ "autoprefixer": "^6.7.2", "babel-core": "^6.26.3", "babel-eslint": "^8.2.3", + "babel-jest": "^21.0.2", "babel-loader": "^7.1.4", - "babel-plugin-transform-runtime": "^6.22.0", + "babel-plugin-dynamic-import-node": "^1.2.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0", + "babel-plugin-transform-runtime": "^6.23.0", "babel-polyfill": "^6.23.0", "babel-preset-env": "^1.3.2", "babel-preset-stage-2": "^6.22.0", @@ -86,7 +93,11 @@ "gulp-concat": "^2.6.1", "html-webpack-plugin": "^3.2.0", "http-proxy-middleware": "^0.18.0", + "identity-obj-proxy": "^3.0.0", "ignore-loader": "^0.1.2", + "jest": "^23.0.0", + "jest-raw-loader": "^1.0.1", + "jest-serializer-vue": "^0.3.0", "node-sass": "^4.9.0", "npm-bump": "^0.0.23", "offline-plugin": "^5.0.3", @@ -103,6 +114,7 @@ "stylelint-processor-html": "^1.0.0", "stylelint-webpack-plugin": "^0.10.4", "url-loader": "^1.0.1", + "vue-jest": "^1.0.2", "vue-loader": "^15.0.9", "vue-style-loader": "^4.1.0", "vue-template-compiler": "^2.5.16", @@ -114,12 +126,12 @@ "worker-loader": "^1.1.1" }, "engines": { - "node": ">= 4.0.0", - "npm": ">= 3.0.0" + "node": ">= 8.0.0", + "npm": ">= 5.0.0" }, "browserslist": [ "> 1%", "last 2 versions", - "not ie <= 8" + "not ie <= 10" ] } diff --git a/src/components/App.vue b/src/components/App.vue index fbd456a2..de12c39a 100644 --- a/src/components/App.vue +++ b/src/components/App.vue @@ -2,14 +2,13 @@
- +
diff --git a/src/components/NavigationBar.vue b/src/components/NavigationBar.vue index 9ed152b9..2c1cfaf6 100644 --- a/src/components/NavigationBar.vue +++ b/src/components/NavigationBar.vue @@ -3,7 +3,7 @@
- +
@@ -64,17 +64,16 @@ const mod = /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'Meta' : 'Ctrl'; const getShortcut = (method) => { let result = ''; Object.entries(store.getters['data/computedSettings'].shortcuts).some(([keys, shortcut]) => { - if (`${shortcut.method || shortcut}` !== method) { - return false; + if (`${shortcut.method || shortcut}` === method) { + result = keys.split('+').map(key => key.toLowerCase()).map((key) => { + if (key === 'mod') { + return mod; + } + // Capitalize + return key && `${key[0].toUpperCase()}${key.slice(1)}`; + }).join('+'); } - result = keys.split('+').map(key => key.toLowerCase()).map((key) => { - if (key === 'mod') { - return mod; - } - // Capitalize - return key && `${key[0].toUpperCase()}${key.slice(1)}`; - }).join('+'); - return true; + return result; }); return result && ` – ${result}`; }; diff --git a/src/components/ProviderName.vue b/src/components/ProviderName.vue deleted file mode 100644 index 79e7c2d1..00000000 --- a/src/components/ProviderName.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/components/common/globals.js b/src/components/common/globals.js new file mode 100644 index 00000000..0ede56ad --- /dev/null +++ b/src/components/common/globals.js @@ -0,0 +1,46 @@ +import Vue from 'vue'; +import timeSvc from '../../services/timeSvc'; +import store from '../../store'; + +// Global directives +Vue.directive('focus', { + inserted(el) { + el.focus(); + const { value } = el; + if (value && el.setSelectionRange) { + el.setSelectionRange(0, value.length); + } + }, +}); + +const setVisible = (el, value) => { + el.style.display = value ? '' : 'none'; + if (value) { + el.removeAttribute('aria-hidden'); + } else { + el.setAttribute('aria-hidden', 'true'); + } +}; +Vue.directive('show', { + bind(el, { value }) { + setVisible(el, value); + }, + update(el, { value, oldValue }) { + if (value !== oldValue) { + setVisible(el, value); + } + }, +}); + +Vue.directive('title', { + bind(el, { value }) { + el.title = value; + el.setAttribute('aria-label', value); + }, +}); + +// Global filters +Vue.filter('formatTime', time => + // Access the minute counter for reactive refresh + timeSvc.format(time, store.state.minuteCounter)); + diff --git a/src/components/gutters/Comment.vue b/src/components/gutters/Comment.vue index b3e063ea..1651ac10 100644 --- a/src/components/gutters/Comment.vue +++ b/src/components/gutters/Comment.vue @@ -49,7 +49,7 @@ export default { ]), async removeComment() { try { - await this.$store.dispatch('modal/commentDeletion'); + await this.$store.dispatch('modal/open', 'commentDeletion'); this.$store.dispatch('discussion/cleanCurrentFile', { filterComment: this.comment }); } catch (e) { // Cancel diff --git a/src/components/gutters/CurrentDiscussion.vue b/src/components/gutters/CurrentDiscussion.vue index f14b68be..d2c0b783 100644 --- a/src/components/gutters/CurrentDiscussion.vue +++ b/src/components/gutters/CurrentDiscussion.vue @@ -95,7 +95,7 @@ export default { }, async removeDiscussion() { try { - await this.$store.dispatch('modal/discussionDeletion'); + await this.$store.dispatch('modal/open', 'discussionDeletion'); this.$store.dispatch('discussion/cleanCurrentFile', { filterDiscussion: this.currentDiscussion, }); diff --git a/src/components/menus/MoreMenu.vue b/src/components/menus/MoreMenu.vue index 38735eb1..21f4ff2f 100644 --- a/src/components/menus/MoreMenu.vue +++ b/src/components/menus/MoreMenu.vue @@ -96,7 +96,7 @@ export default { }, async reset() { try { - await this.$store.dispatch('modal/reset'); + await this.$store.dispatch('modal/open', 'reset'); window.location.href = '#reset=true'; window.location.reload(); } catch (e) { diff --git a/src/components/modals/PandocExportModal.vue b/src/components/modals/PandocExportModal.vue index 7c787c36..cf59d2cc 100644 --- a/src/components/modals/PandocExportModal.vue +++ b/src/components/modals/PandocExportModal.vue @@ -68,7 +68,7 @@ export default modalTemplate({ FileSaver.saveAs(body, `${currentFile.name}.${selectedFormat}`); } catch (err) { if (err.status === 401) { - this.$store.dispatch('modal/sponsorOnly'); + this.$store.dispatch('modal/open', 'sponsorOnly'); } else { console.error(err); // eslint-disable-line no-console this.$store.dispatch('notification/error', err); diff --git a/src/components/modals/PdfExportModal.vue b/src/components/modals/PdfExportModal.vue index 619373c4..2980d86d 100644 --- a/src/components/modals/PdfExportModal.vue +++ b/src/components/modals/PdfExportModal.vue @@ -65,7 +65,7 @@ export default modalTemplate({ FileSaver.saveAs(body, `${currentFile.name}.pdf`); } catch (err) { if (err.status === 401) { - this.$store.dispatch('modal/sponsorOnly'); + this.$store.dispatch('modal/open', 'sponsorOnly'); } else { console.error(err); // eslint-disable-line no-console this.$store.dispatch('notification/error', err); diff --git a/src/components/modals/WorkspaceManagementModal.vue b/src/components/modals/WorkspaceManagementModal.vue index 626777d3..69f07c36 100644 --- a/src/components/modals/WorkspaceManagementModal.vue +++ b/src/components/modals/WorkspaceManagementModal.vue @@ -77,7 +77,7 @@ export default { }, async remove(id) { try { - await this.$store.dispatch('modal/removeWorkspace'); + await this.$store.dispatch('modal/open', 'removeWorkspace'); localDbSvc.removeWorkspace(id); } catch (e) { // Cancel diff --git a/src/components/modals/common/ModalInner.vue b/src/components/modals/common/ModalInner.vue index 14516990..cc43d310 100644 --- a/src/components/modals/common/ModalInner.vue +++ b/src/components/modals/common/ModalInner.vue @@ -33,7 +33,7 @@ export default { try { if (!this.$store.getters['workspace/sponsorToken']) { // User has to sign in - await this.$store.dispatch('modal/signInForSponsorship'); + await this.$store.dispatch('modal/open', 'signInForSponsorship'); await googleHelper.signin(); syncSvc.requestSync(); } diff --git a/src/data/faq.md b/src/data/faq.md index ad6add70..d27614dd 100644 --- a/src/data/faq.md +++ b/src/data/faq.md @@ -1,12 +1,12 @@ **Where is my data stored?** -If your workspace is not synced, your files are only stored inside your browser (using the [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API)) and are not stored anywhere else. +If your workspace is not synced, your files are only stored inside your browser using the [IndexedDB API](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API) and are not stored anywhere else. We recommend syncing your workspace to make sure files won't be lost in case your browser data is cleared. **Where is my data stored once I sync my workspace?** -If you sign in with Google, your main workspace will be stored in Google Drive (in your [app data folder](https://developers.google.com/drive/v3/web/appdata)). +If you sign in with Google, your main workspace will be stored in Google Drive, in your [app data folder](https://developers.google.com/drive/v3/web/appdata). If you open a Google Drive workspace, the files in the workspace will be stored inside a Google Drive folder which you can share with other users. diff --git a/src/data/pagedownButtons.js b/src/data/pagedownButtons.js index 367827b4..cf5dc89e 100644 --- a/src/data/pagedownButtons.js +++ b/src/data/pagedownButtons.js @@ -1,4 +1,5 @@ -export default [{}, { +export default [{ +}, { method: 'bold', title: 'Bold', icon: 'format-bold', @@ -14,7 +15,8 @@ export default [{}, { method: 'strikethrough', title: 'Strikethrough', icon: 'format-strikethrough', -}, {}, { +}, { +}, { method: 'ulist', title: 'Unordered list', icon: 'format-list-bulleted', @@ -26,7 +28,8 @@ export default [{}, { method: 'clist', title: 'Check list', icon: 'format-list-checks', -}, {}, { +}, { +}, { method: 'quote', title: 'Blockquote', icon: 'format-quote-close', diff --git a/src/data/simpleModals.js b/src/data/simpleModals.js new file mode 100644 index 00000000..aa1dfb9c --- /dev/null +++ b/src/data/simpleModals.js @@ -0,0 +1,97 @@ +const simpleModal = (contentHtml, rejectText, resolveText) => ({ + contentHtml: typeof contentHtml === 'function' ? contentHtml : () => contentHtml, + rejectText, + resolveText, +}); + +/* eslint sort-keys: "error" */ +export default { + commentDeletion: simpleModal( + '

You are about to delete a comment. Are you sure?

', + 'No', + 'Yes, delete', + ), + discussionDeletion: simpleModal( + '

You are about to delete a discussion. Are you sure?

', + 'No', + 'Yes, delete', + ), + fileRestoration: simpleModal( + '

You are about to revert some changes. Are you sure?

', + 'No', + 'Yes, revert', + ), + folderDeletion: simpleModal( + config => `

You are about to delete the folder ${config.item.name}. Its files will be moved to Trash. Are you sure?

`, + 'No', + 'Yes, delete', + ), + pathConflict: simpleModal( + config => `

${config.item.name} already exists. Do you want to add a suffix?

`, + 'No', + 'Yes, add suffix', + ), + paymentSuccess: simpleModal( + '

Thank you for your payment! Your sponsorship will be active in a minute.

', + 'Ok', + ), + providerRedirection: simpleModal( + config => `

You are about to navigate to the ${config.name} authorization page.

`, + 'Cancel', + 'Ok, go on', + ), + removeWorkspace: simpleModal( + '

You are about to remove a workspace locally. Are you sure?

', + 'No', + 'Yes, remove', + ), + reset: simpleModal( + '

This will clean all your workspaces locally. Are you sure?

', + 'No', + 'Yes, clean', + ), + signInForComment: simpleModal( + `

You have to sign in with Google to start commenting.

+
Note: This will sync your main workspace.
`, + 'Cancel', + 'Ok, sign in', + ), + signInForSponsorship: simpleModal( + `

You have to sign in with Google to sponsor.

+
Note: This will sync your main workspace.
`, + 'Cancel', + 'Ok, sign in', + ), + sponsorOnly: simpleModal( + '

This feature is restricted to sponsors as it relies on server resources.

', + 'Ok, I understand', + ), + stripName: simpleModal( + config => `

${config.item.name} contains illegal characters. Do you want to strip them?

`, + 'No', + 'Yes, strip', + ), + tempFileDeletion: simpleModal( + config => `

You are about to permanently delete the temporary file ${config.item.name}. Are you sure?

`, + 'No', + 'Yes, delete', + ), + tempFolderDeletion: simpleModal( + '

You are about to permanently delete all the temporary files. Are you sure?

', + 'No', + 'Yes, delete all', + ), + trashDeletion: simpleModal( + '

Files in the trash are automatically deleted after 7 days of inactivity.

', + 'Ok', + ), + unauthorizedName: simpleModal( + config => `

${config.item.name} is an unauthorized name.

`, + 'Ok', + ), + workspaceGoogleRedirection: simpleModal( + '

StackEdit needs full Google Drive access to open this workspace.

', + 'Cancel', + 'Ok, grant', + ), +}; diff --git a/src/index.js b/src/index.js index 418a5d0c..8b9c79cb 100644 --- a/src/index.js +++ b/src/index.js @@ -2,9 +2,9 @@ import Vue from 'vue'; import 'babel-polyfill'; import 'indexeddbshim/dist/indexeddbshim'; import * as OfflinePluginRuntime from 'offline-plugin/runtime'; -import './extensions/'; +import './extensions'; import './services/optional'; -import './icons/'; +import './icons'; import App from './components/App'; import store from './store'; import localDbSvc from './services/localDbSvc'; diff --git a/src/libs/clunderscore.js b/src/libs/clunderscore.js index 0271f6b3..de2f2390 100644 --- a/src/libs/clunderscore.js +++ b/src/libs/clunderscore.js @@ -140,7 +140,8 @@ objectProperties.cl_extend = function (obj) { function build(properties) { return objectProperties.cl_reduce.call(properties, function (memo, value, key) { memo[key] = { - value: value + value: value, + configurable: true } return memo }, {}) diff --git a/src/services/explorerSvc.js b/src/services/explorerSvc.js index eb143d99..6827cca8 100644 --- a/src/services/explorerSvc.js +++ b/src/services/explorerSvc.js @@ -20,9 +20,10 @@ export default { if (selectedNode.isNil) { return; } + if (selectedNode.isTrash || selectedNode.item.parentId === 'trash') { try { - await store.dispatch('modal/trashDeletion'); + await store.dispatch('modal/open', 'trashDeletion'); } catch (e) { // Cancel } @@ -33,13 +34,19 @@ export default { let moveToTrash = true; try { if (selectedNode.isTemp) { - await store.dispatch('modal/tempFolderDeletion', selectedNode.item); + await store.dispatch('modal/open', 'tempFolderDeletion'); moveToTrash = false; } else if (selectedNode.item.parentId === 'temp') { - await store.dispatch('modal/tempFileDeletion', selectedNode.item); + await store.dispatch('modal/open', { + type: 'tempFileDeletion', + item: selectedNode.item, + }); moveToTrash = false; } else if (selectedNode.isFolder) { - await store.dispatch('modal/folderDeletion', selectedNode.item); + await store.dispatch('modal/open', { + type: 'folderDeletion', + item: selectedNode.item, + }); } } catch (e) { return; // cancel diff --git a/src/services/fileSvc.js b/src/services/fileSvc.js index 69830fbe..3194b796 100644 --- a/src/services/fileSvc.js +++ b/src/services/fileSvc.js @@ -16,7 +16,7 @@ export default { comments, } = {}, background = false) { const id = utils.uid(); - const file = { + const item = { id, name: utils.sanitizeName(name), parentId: parentId || null, @@ -34,23 +34,29 @@ export default { // Show warning dialogs if (!background) { // If name is being stripped - if (file.name !== utils.defaultName && file.name !== name) { - await store.dispatch('modal/stripName', name); + if (item.name !== utils.defaultName && item.name !== name) { + await store.dispatch('modal/open', { + type: 'stripName', + item, + }); } // Check if there is already a file with that path if (workspaceUniquePaths) { - const parentPath = store.getters.itemPaths[file.parentId] || ''; - const path = parentPath + file.name; + const parentPath = store.getters.itemPaths[item.parentId] || ''; + const path = parentPath + item.name; if (store.getters.pathItems[path]) { - await store.dispatch('modal/pathConflict', name); + await store.dispatch('modal/open', { + type: 'pathConflict', + item, + }); } } } // Save file and content in the store store.commit('content/setItem', content); - store.commit('file/setItem', file); + store.commit('file/setItem', item); if (workspaceUniquePaths) { this.makePathUnique(id); } @@ -67,14 +73,20 @@ export default { const sanitizedName = utils.sanitizeName(item.name); if (item.type === 'folder' && forbiddenFolderNameMatcher.exec(sanitizedName)) { - await store.dispatch('modal/unauthorizedName', item.name); + await store.dispatch('modal/open', { + type: 'unauthorizedName', + item, + }); throw new Error('Unauthorized name.'); } // Show warning dialogs // If name has been stripped if (sanitizedName !== utils.defaultName && sanitizedName !== item.name) { - await store.dispatch('modal/stripName', item.name); + await store.dispatch('modal/open', { + type: 'stripName', + item, + }); } // Check if there is a path conflict if (store.getters['workspace/hasUniquePaths']) { @@ -82,7 +94,10 @@ export default { const path = parentPath + sanitizedName; const pathItems = store.getters.pathItems[path] || []; if (pathItems.some(itemWithSamePath => itemWithSamePath.id !== id)) { - await store.dispatch('modal/pathConflict', item.name); + await store.dispatch('modal/open', { + type: 'pathConflict', + item, + }); } } diff --git a/src/services/localDbSvc.js b/src/services/localDbSvc.js index cdb8f194..0e9123cd 100644 --- a/src/services/localDbSvc.js +++ b/src/services/localDbSvc.js @@ -399,7 +399,7 @@ const localDbSvc = { // Enable sponsorship if (utils.queryParams.paymentSuccess) { window.location.hash = ''; // PaymentSuccess param is always on its own - store.dispatch('modal/paymentSuccess') + store.dispatch('modal/open', 'paymentSuccess') .catch(() => { /* Cancel */ }); const sponsorToken = store.getters['workspace/sponsorToken']; // Force check sponsorship after a few seconds diff --git a/src/services/networkSvc.js b/src/services/networkSvc.js index 394dc684..8bbb2358 100644 --- a/src/services/networkSvc.js +++ b/src/services/networkSvc.js @@ -215,13 +215,24 @@ export default { const attempt = async () => { try { - await new Promise((resolve, reject) => { + return await new Promise((resolve, reject) => { if (offlineCheck) { store.commit('updateLastOfflineCheck'); } + const xhr = new window.XMLHttpRequest(); xhr.withCredentials = config.withCredentials || false; - let timeoutId; + + const timeoutId = setTimeout(() => { + xhr.abort(); + if (offlineCheck) { + isConnectionDown = true; + store.commit('setOffline', true); + reject(new Error('You are offline.')); + } else { + reject(new Error('Network request timeout.')); + } + }, config.timeout); xhr.onload = () => { if (offlineCheck) { @@ -242,9 +253,9 @@ export default { } if (result.status >= 200 && result.status < 300) { resolve(result); - return; + } else { + reject(result); } - reject(result); }; xhr.onerror = () => { @@ -258,21 +269,13 @@ export default { } }; - timeoutId = setTimeout(() => { - xhr.abort(); - if (offlineCheck) { - isConnectionDown = true; - store.commit('setOffline', true); - reject(new Error('You are offline.')); - } else { - reject(new Error('Network request timeout.')); - } - }, config.timeout); - const url = utils.addQueryParams(config.url, config.params); xhr.open(config.method || 'GET', url); - Object.entries(config.headers).forEach(([key, value]) => - value && xhr.setRequestHeader(key, `${value}`)); + Object.entries(config.headers).forEach(([key, value]) => { + if (value) { + xhr.setRequestHeader(key, `${value}`); + } + }); if (config.blob) { xhr.responseType = 'blob'; } @@ -286,7 +289,7 @@ export default { // Exponential backoff retryAfter *= 2; }); - attempt(); + return attempt(); } throw err; } diff --git a/src/services/providers/couchdbWorkspaceProvider.js b/src/services/providers/couchdbWorkspaceProvider.js index 20c3400b..99e1ebcf 100644 --- a/src/services/providers/couchdbWorkspaceProvider.js +++ b/src/services/providers/couchdbWorkspaceProvider.js @@ -91,7 +91,7 @@ export default new Provider({ syncLastSeq, }); }, - async saveSimpleItem(item, syncData) { + async saveWorkspaceItem(item, syncData) { const syncToken = store.getters['workspace/syncToken']; const { id, rev } = couchdbHelper.uploadDocument({ token: syncToken, @@ -108,78 +108,85 @@ export default new Provider({ rev, }; }, - removeItem(syncData) { + removeWorkspaceItem(syncData) { const syncToken = store.getters['workspace/syncToken']; return couchdbHelper.removeDocument(syncToken, syncData.id, syncData.rev); }, - downloadContent(token, syncLocation) { - return this.downloadData(`${syncLocation.fileId}/content`); - }, - async downloadData(dataId) { - const syncData = store.getters['data/syncDataByItemId'][dataId]; - if (!syncData) { - return Promise.resolve(); - } - const syncToken = store.getters['workspace/syncToken']; - const body = await couchdbHelper.retrieveDocumentWithAttachments(syncToken, syncData.id); - let item; - if (body.item.type === 'content') { - item = Provider.parseContent(body.attachments.data, body.item.id); - } else { - item = utils.addItemHash(JSON.parse(body.attachments.data)); - } + async downloadWorkspaceContent(token, syncData) { + const body = await couchdbHelper.retrieveDocumentWithAttachments(token, syncData.id); const rev = body._rev; // eslint-disable-line no-underscore-dangle - if (item.hash !== syncData.hash || rev !== syncData.rev) { - store.dispatch('data/patchSyncData', { - [syncData.id]: { - ...syncData, - hash: item.hash, - rev, - }, - }); - } - return item; + const item = Provider.parseContent(body.attachments.data, body.item.id); + return { + item, + syncData: { + ...syncData, + hash: item.hash, + rev, + }, + }; }, - async uploadContent(token, content, syncLocation) { - await this.uploadData(content); - return syncLocation; - }, - async uploadData(item) { - const syncData = store.getters['data/syncDataByItemId'][item.id]; - if (!syncData || syncData.hash !== item.hash) { - let data; - let dataType; - if (item.type === 'content') { - data = Provider.serializeContent(item); - dataType = 'text/plain'; - } else { - data = JSON.stringify(item); - dataType = 'application/json'; - } - const syncToken = store.getters['workspace/syncToken']; - const res = await couchdbHelper.uploadDocument({ - token: syncToken, - item: { - id: item.id, - type: item.type, - hash: item.hash, - }, - data, - dataType, - documentId: syncData && syncData.id, - rev: syncData && syncData.rev, - }); - store.dispatch('data/patchSyncData', { - [res.id]: { - // Build sync data - id: res.id, - itemId: item.id, - type: item.type, - hash: item.hash, - rev: res.rev, - }, - }); + async downloadWorkspaceData(token, dataId, syncData) { + if (!syncData) { + return {}; } + + const body = await couchdbHelper.retrieveDocumentWithAttachments(token, syncData.id); + const item = utils.addItemHash(JSON.parse(body.attachments.data)); + const rev = body._rev; // eslint-disable-line no-underscore-dangle + return { + item, + syncData: { + ...syncData, + hash: item.hash, + rev, + }, + }; + }, + async uploadWorkspaceContent(token, item, syncData) { + const res = await couchdbHelper.uploadDocument({ + token, + item: { + id: item.id, + type: item.type, + hash: item.hash, + }, + data: Provider.serializeContent(item), + dataType: 'text/plain', + documentId: syncData && syncData.id, + rev: syncData && syncData.rev, + }); + + // Return new sync data + return { + id: res.id, + itemId: item.id, + type: item.type, + hash: item.hash, + rev: res.rev, + }; + }, + async uploadWorkspaceData(token, item, syncData) { + const res = await couchdbHelper.uploadDocument({ + token, + item: { + id: item.id, + type: item.type, + hash: item.hash, + }, + data: JSON.stringify(item), + dataType: 'application/json', + documentId: syncData && syncData.id, + rev: syncData && syncData.rev, + }); + + // Return new sync data + return { + id: res.id, + itemId: item.id, + type: item.type, + hash: item.hash, + rev: res.rev, + }; }, async listRevisions(token, fileId) { const syncData = Provider.getContentSyncData(fileId); diff --git a/src/services/providers/githubWorkspaceProvider.js b/src/services/providers/githubWorkspaceProvider.js index b57ed3c1..375acffb 100644 --- a/src/services/providers/githubWorkspaceProvider.js +++ b/src/services/providers/githubWorkspaceProvider.js @@ -28,6 +28,7 @@ const endsWith = (str, suffix) => str.slice(-suffix.length) === suffix; export default new Provider({ id: 'githubWorkspace', + isGit: true, getToken() { return store.getters['workspace/syncToken']; }, @@ -110,29 +111,31 @@ export default new Provider({ const path = blobEntry.path.slice(workspacePath.length); // Collect blob sha treeShaMap[path] = blobEntry.sha; - // Collect parents path - let parentPath = ''; - path.split('/').slice(0, -1).forEach((folderName) => { - const folderPath = `${parentPath}${folderName}/`; - treeFolderMap[folderPath] = parentPath; - parentPath = folderPath; - }); - // Collect file path if (path.indexOf('.stackedit-data/') === 0) { treeDataMap[path] = true; - } else if (endsWith(path, '.md')) { - treeFileMap[path] = parentPath; - } else if (endsWith(path, '.sync')) { - treeSyncLocationMap[path] = true; - } else if (endsWith(path, '.publish')) { - treePublishLocationMap[path] = true; + } else { + // Collect parents path + let parentPath = ''; + path.split('/').slice(0, -1).forEach((folderName) => { + const folderPath = `${parentPath}${folderName}/`; + treeFolderMap[folderPath] = parentPath; + parentPath = folderPath; + }); + // Collect file path + if (endsWith(path, '.md')) { + treeFileMap[path] = parentPath; + } else if (endsWith(path, '.sync')) { + treeSyncLocationMap[path] = true; + } else if (endsWith(path, '.publish')) { + treePublishLocationMap[path] = true; + } } }); // Collect changes const changes = []; const pathIds = {}; - const syncDataToIgnore = Object.create(null); + const syncDataToKeep = Object.create(null); const getId = (path) => { const syncData = syncDataByPath[path]; const id = syncData ? syncData.itemId : utils.uid(); @@ -185,7 +188,7 @@ export default new Provider({ // Content creations/updates const contentSyncData = syncDataByItemId[`${id}/content`]; if (contentSyncData) { - syncDataToIgnore[contentSyncData.id] = true; + syncDataToKeep[contentSyncData.id] = true; } if (!contentSyncData || contentSyncData.sha !== treeShaMap[path]) { // Use `/` as a prefix to get a unique syncData id @@ -211,11 +214,12 @@ export default new Provider({ // Data creations/updates Object.keys(treeDataMap).forEach((path) => { try { - const [, id] = path.match(/^\.stackedit-data\/([\s\S]+)\.json$/); + // Only template data are stored + const [, id] = path.match(/^\.stackedit-data\/(templates)\.json$/) || []; pathIds[path] = id; const syncData = syncDataByItemId[id]; if (syncData) { - syncDataToIgnore[syncData.id] = true; + syncDataToKeep[syncData.id] = true; } if (!syncData || syncData.sha !== treeShaMap[path]) { changes.push({ @@ -281,40 +285,28 @@ export default new Provider({ // Deletions Object.keys(syncDataByPath).forEach((path) => { - if (!pathIds[path] && !syncDataToIgnore[path]) { + if (!pathIds[path] && !syncDataToKeep[path]) { changes.push({ syncDataId: path }); } }); return changes; }, - async saveSimpleItem(item) { - const path = store.getters.itemPaths[item.fileId || item.id]; - const syncToken = store.getters['workspace/syncToken']; + async saveWorkspaceItem(item) { const syncData = { + id: store.getters.itemGitPaths[item.id], itemId: item.id, type: item.type, hash: item.hash, }; - if (item.type === 'file') { - syncData.id = `${path}.md`; - return syncData; - } - if (item.type === 'folder') { - syncData.id = path; + // Files and folders are not in git, only contents + if (item.type === 'file' || item.type === 'folder') { return syncData; } // locations are stored as paths, so we upload an empty file - const data = utils.encodeBase64(utils.serializeObject({ - ...item, - id: undefined, - type: undefined, - fileId: undefined, - }), true); - const extension = item.type === 'syncLocation' ? 'sync' : 'publish'; - syncData.id = `${path}.${data}.${extension}`; + const syncToken = store.getters['workspace/syncToken']; await githubHelper.uploadFile({ ...getWorkspaceWithOwner(), token: syncToken, @@ -324,9 +316,8 @@ export default new Provider({ }); return syncData; }, - async removeItem(syncData) { - // Ignore content deletion - if (syncData.type !== 'content') { + async removeWorkspaceItem(syncData) { + if (treeShaMap[syncData.id]) { const syncToken = store.getters['workspace/syncToken']; await githubHelper.removeFile({ ...getWorkspaceWithOwner(), @@ -336,102 +327,91 @@ export default new Provider({ }); } }, - async downloadContent(token, syncLocation) { - const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId]; - const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`]; - if (!syncData || !contentSyncData) { - return null; + async downloadWorkspaceContent(token, contentSyncData) { + const [fileId] = contentSyncData.itemId.split('/'); + const path = store.getters.itemGitPaths[fileId]; + const syncData = store.getters['data/syncData'][path]; + if (!syncData) { + return {}; } const { sha, content } = await githubHelper.downloadFile({ ...getWorkspaceWithOwner(), token, path: getAbsolutePath(syncData), }); - const item = Provider.parseContent(content, `${syncLocation.fileId}/content`); - if (item.hash !== contentSyncData.hash) { - store.dispatch('data/patchSyncData', { - [contentSyncData.id]: { - ...contentSyncData, - hash: item.hash, - sha, - }, - }); - } - return item; + treeShaMap[path] = sha; + const item = Provider.parseContent(content, `${fileId}/content`); + return { + item, + syncData: { + ...contentSyncData, + hash: item.hash, + sha, + }, + }; }, - async downloadData(dataId) { - const syncData = store.getters['data/syncDataByItemId'][dataId]; + async downloadWorkspaceData(token, dataId, syncData) { if (!syncData) { - return null; + return {}; } - const syncToken = store.getters['workspace/syncToken']; + const { sha, content } = await githubHelper.downloadFile({ ...getWorkspaceWithOwner(), - token: syncToken, + token, path: getAbsolutePath(syncData), }); + treeShaMap[syncData.id] = sha; const item = JSON.parse(content); - if (item.hash !== syncData.hash) { - store.dispatch('data/patchSyncData', { - [syncData.id]: { - ...syncData, - hash: item.hash, - sha, - }, - }); - } - return item; - }, - async uploadContent(token, content, syncLocation) { - const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`]; - if (!contentSyncData || contentSyncData.hash !== content.hash) { - const path = `${store.getters.itemPaths[syncLocation.fileId]}.md`; - const absolutePath = `${store.getters['workspace/currentWorkspace'].path || ''}${path}`; - const id = `/${path}`; - const res = await githubHelper.uploadFile({ - ...getWorkspaceWithOwner(), - token, - path: absolutePath, - content: Provider.serializeContent(content), - sha: treeShaMap[id], - }); - store.dispatch('data/patchSyncData', { - [id]: { - // Build sync data - id, - itemId: content.id, - type: content.type, - hash: content.hash, - sha: res.content.sha, - }, - }); - } - return syncLocation; - }, - async uploadData(item) { - const oldSyncData = store.getters['data/syncDataByItemId'][item.id]; - if (!oldSyncData || oldSyncData.hash !== item.hash) { - const syncData = { - id: `.stackedit-data/${item.id}.json`, - itemId: item.id, - type: item.type, + return { + item, + syncData: { + ...syncData, hash: item.hash, - }; - const syncToken = store.getters['workspace/syncToken']; - const res = await githubHelper.uploadFile({ - ...getWorkspaceWithOwner(), - token: syncToken, - path: getAbsolutePath(syncData), - content: JSON.stringify(item), - sha: oldSyncData && oldSyncData.sha, - }); - store.dispatch('data/patchSyncData', { - [syncData.id]: { - ...syncData, - sha: res.content.sha, - }, - }); - } + sha, + }, + }; + }, + async uploadWorkspaceContent(token, item) { + const [fileId] = item.id.split('/'); + const path = store.getters.itemGitPaths[fileId]; + const absolutePath = `${store.getters['workspace/currentWorkspace'].path || ''}${path}`; + const res = await githubHelper.uploadFile({ + ...getWorkspaceWithOwner(), + token, + path: absolutePath, + content: Provider.serializeContent(item), + sha: treeShaMap[path], + }); + + // Return new sync data + return { + id: store.getters.itemGitPaths[item.id], + itemId: item.id, + type: item.type, + hash: item.hash, + sha: res.content.sha, + }; + }, + async uploadWorkspaceData(token, item) { + const path = store.getters.itemGitPaths[item.id]; + const syncData = { + id: path, + itemId: item.id, + type: item.type, + hash: item.hash, + }; + const res = await githubHelper.uploadFile({ + ...getWorkspaceWithOwner(), + token, + path: getAbsolutePath(syncData), + content: JSON.stringify(item), + sha: treeShaMap[path], + }); + + return { + ...syncData, + sha: res.content.sha, + }; }, onSyncEnd() { // Clean up diff --git a/src/services/providers/googleDriveAppDataProvider.js b/src/services/providers/googleDriveAppDataProvider.js index d83a63b0..1f990c49 100644 --- a/src/services/providers/googleDriveAppDataProvider.js +++ b/src/services/providers/googleDriveAppDataProvider.js @@ -48,7 +48,7 @@ export default new Provider({ syncStartPageToken, }); }, - async saveSimpleItem(item, syncData, ifNotTooLate) { + async saveWorkspaceItem(item, syncData, ifNotTooLate) { const syncToken = store.getters['workspace/syncToken']; const file = await googleHelper.uploadAppDataFile({ token: syncToken, @@ -64,60 +64,77 @@ export default new Provider({ hash: item.hash, }; }, - removeItem(syncData, ifNotTooLate) { + removeWorkspaceItem(syncData, ifNotTooLate) { const syncToken = store.getters['workspace/syncToken']; return googleHelper.removeAppDataFile(syncToken, syncData.id, ifNotTooLate); }, - downloadContent(token, syncLocation) { - return this.downloadData(`${syncLocation.fileId}/content`); - }, - async downloadData(dataId) { - const syncData = store.getters['data/syncDataByItemId'][dataId]; - if (!syncData) { - return null; - } - const syncToken = store.getters['workspace/syncToken']; - const data = await googleHelper.downloadAppDataFile(syncToken, syncData.id); + async downloadWorkspaceContent(token, syncData) { + const data = await googleHelper.downloadAppDataFile(token, syncData.id); const item = utils.addItemHash(JSON.parse(data)); - if (item.hash !== syncData.hash) { - store.dispatch('data/patchSyncData', { - [syncData.id]: { - ...syncData, - hash: item.hash, - }, - }); - } - return item; + return { + item, + syncData: { + ...syncData, + hash: item.hash, + }, + }; }, - async uploadContent(token, content, syncLocation, ifNotTooLate) { - await this.uploadData(content, ifNotTooLate); - return syncLocation; - }, - async uploadData(item, ifNotTooLate) { - const syncData = store.getters['data/syncDataByItemId'][item.id]; - if (!syncData || syncData.hash !== item.hash) { - const syncToken = store.getters['workspace/syncToken']; - const file = await googleHelper.uploadAppDataFile({ - token: syncToken, - name: JSON.stringify({ - id: item.id, - type: item.type, - hash: item.hash, - }), - media: JSON.stringify(item), - fileId: syncData && syncData.id, - ifNotTooLate, - }); - store.dispatch('data/patchSyncData', { - [file.id]: { - // Build sync data - id: file.id, - itemId: item.id, - type: item.type, - hash: item.hash, - }, - }); + async downloadWorkspaceData(token, dataId, syncData) { + if (!syncData) { + return {}; } + + const data = await googleHelper.downloadAppDataFile(token, syncData.id); + const item = utils.addItemHash(JSON.parse(data)); + return { + item, + syncData: { + ...syncData, + hash: item.hash, + }, + }; + }, + async uploadWorkspaceContent(token, item, syncData, ifNotTooLate) { + const file = await googleHelper.uploadAppDataFile({ + token, + name: JSON.stringify({ + id: item.id, + type: item.type, + hash: item.hash, + }), + media: JSON.stringify(item), + fileId: syncData && syncData.id, + ifNotTooLate, + }); + + // Return new sync data + return { + id: file.id, + itemId: item.id, + type: item.type, + hash: item.hash, + }; + }, + async uploadWorkspaceData(token, item, syncData, ifNotTooLate) { + const file = await googleHelper.uploadAppDataFile({ + token, + name: JSON.stringify({ + id: item.id, + type: item.type, + hash: item.hash, + }), + media: JSON.stringify(item), + fileId: syncData && syncData.id, + ifNotTooLate, + }); + + // Return new sync data + return { + id: file.id, + itemId: item.id, + type: item.type, + hash: item.hash, + }; }, async listRevisions(token, fileId) { const syncData = Provider.getContentSyncData(fileId); diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js index 37552336..ee1f4f91 100644 --- a/src/services/providers/googleDriveWorkspaceProvider.js +++ b/src/services/providers/googleDriveWorkspaceProvider.js @@ -89,7 +89,7 @@ export default new Provider({ let token = store.getters['data/googleTokens'][sub]; // If no token has been found, popup an authorize window and get one if (!token || !token.isDrive || !token.driveFullAccess) { - await store.dispatch('modal/workspaceGoogleRedirection'); + await store.dispatch('modal/open', 'workspaceGoogleRedirection'); token = await googleHelper.addDriveAccount(true, utils.queryParams.sub); } @@ -312,7 +312,7 @@ export default new Provider({ syncStartPageToken, }); }, - async saveSimpleItem(item, syncData, ifNotTooLate) { + async saveWorkspaceItem(item, syncData, ifNotTooLate) { const workspace = store.getters['workspace/currentWorkspace']; const syncToken = store.getters['workspace/syncToken']; let file; @@ -363,133 +363,88 @@ export default new Provider({ hash: item.hash, }; }, - async removeItem(syncData, ifNotTooLate) { + async removeWorkspaceItem(syncData, ifNotTooLate) { // Ignore content deletion if (syncData.type !== 'content') { const syncToken = store.getters['workspace/syncToken']; await googleHelper.removeFile(syncToken, syncData.id, ifNotTooLate); } }, - async downloadContent(token, syncLocation) { - const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId]; - const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`]; - if (!syncData || !contentSyncData) { - return null; + async downloadWorkspaceContent(token, contentSyncData) { + const [fileId] = contentSyncData.itemId.split('/'); + const syncData = store.getters['data/syncDataByItemId'][fileId]; + if (!syncData) { + return {}; } const content = await googleHelper.downloadFile(token, syncData.id); - const item = Provider.parseContent(content, `${syncLocation.fileId}/content`); - if (item.hash !== contentSyncData.hash) { - store.dispatch('data/patchSyncData', { - [contentSyncData.id]: { - ...contentSyncData, - hash: item.hash, - }, - }); - } + const item = Provider.parseContent(content, contentSyncData.itemId); // Open the file requested by action if it wasn't synced yet if (fileIdToOpen && fileIdToOpen === syncData.id) { fileIdToOpen = null; // Open the file once downloaded content has been stored setTimeout(() => { - store.commit('file/setCurrentId', syncData.itemId); + store.commit('file/setCurrentId', fileId); }, 10); } - return item; + + return { + item, + syncData: { + ...contentSyncData, + hash: item.hash, + }, + }; }, - async downloadData(dataId) { - const syncData = store.getters['data/syncDataByItemId'][dataId]; + async downloadWorkspaceData(token, dataId, syncData) { if (!syncData) { - return null; + return {}; } - const syncToken = store.getters['workspace/syncToken']; - const content = await googleHelper.downloadFile(syncToken, syncData.id); + + const content = await googleHelper.downloadFile(token, syncData.id); const item = JSON.parse(content); - if (item.hash !== syncData.hash) { - store.dispatch('data/patchSyncData', { - [syncData.id]: { - ...syncData, - hash: item.hash, - }, - }); - } - return item; + return { + item, + syncData: { + ...syncData, + hash: item.hash, + }, + }; }, - async uploadContent(token, content, syncLocation, ifNotTooLate) { - const contentSyncData = store.getters['data/syncDataByItemId'][`${syncLocation.fileId}/content`]; - if (!contentSyncData || contentSyncData.hash !== content.hash) { - const syncData = store.getters['data/syncDataByItemId'][syncLocation.fileId]; - let file; - if (syncData) { - // Only update file media - file = await googleHelper.uploadFile({ - token, - media: Provider.serializeContent(content), - fileId: syncData.id, - ifNotTooLate, - }); - } else { - // Create file with media - const workspace = store.getters['workspace/currentWorkspace']; - // Use deepCopy to freeze objects - const item = utils.deepCopy(store.state.file.itemMap[syncLocation.fileId]); - const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId]; - file = await googleHelper.uploadFile({ - token, - name: item.name, - parents: [parentSyncData ? parentSyncData.id : workspace.folderId], - appProperties: { - id: item.id, - folderId: workspace.folderId, - }, - media: Provider.serializeContent(content), - ifNotTooLate, - }); - store.dispatch('data/patchSyncData', { - [file.id]: { - id: file.id, - itemId: item.id, - type: item.type, - hash: item.hash, - }, - }); - } - store.dispatch('data/patchSyncData', { - [`${file.id}/content`]: { - // Build sync data - id: `${file.id}/content`, - itemId: content.id, - type: content.type, - hash: content.hash, - }, - }); - } - return syncLocation; - }, - async uploadData(item, ifNotTooLate) { - const syncData = store.getters['data/syncDataByItemId'][item.id]; - if (!syncData || syncData.hash !== item.hash) { - const workspace = store.getters['workspace/currentWorkspace']; - const syncToken = store.getters['workspace/syncToken']; - const file = await googleHelper.uploadFile({ - token: syncToken, - name: JSON.stringify({ - id: item.id, - type: item.type, - hash: item.hash, - }), - parents: [workspace.dataFolderId], - appProperties: { - folderId: workspace.folderId, - }, - media: JSON.stringify(item), - fileId: syncData && syncData.id, - oldParents: syncData && syncData.parentIds, + async uploadWorkspaceContent(token, content, contentSyncData, ifNotTooLate) { + const [fileId] = content.id.split('/'); + const syncData = store.getters['data/syncDataByItemId'][fileId]; + let file; + + if (syncData) { + // Only update file media + file = await googleHelper.uploadFile({ + token, + media: Provider.serializeContent(content), + fileId: syncData.id, ifNotTooLate, }); + } else { + // Create file with media + const workspace = store.getters['workspace/currentWorkspace']; + // Use deepCopy to freeze objects + const item = utils.deepCopy(store.state.file.itemMap[fileId]); + const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId]; + file = await googleHelper.uploadFile({ + token, + name: item.name, + parents: [parentSyncData ? parentSyncData.id : workspace.folderId], + appProperties: { + id: item.id, + folderId: workspace.folderId, + }, + media: Provider.serializeContent(content), + ifNotTooLate, + }); + + // Create file syncData store.dispatch('data/patchSyncData', { [file.id]: { - // Build sync data id: file.id, itemId: item.id, type: item.type, @@ -497,6 +452,41 @@ export default new Provider({ }, }); } + + // Return new sync data + return { + id: `${file.id}/content`, + itemId: content.id, + type: content.type, + hash: content.hash, + }; + }, + async uploadWorkspaceData(token, item, syncData, ifNotTooLate) { + const workspace = store.getters['workspace/currentWorkspace']; + const file = await googleHelper.uploadFile({ + token, + name: JSON.stringify({ + id: item.id, + type: item.type, + hash: item.hash, + }), + parents: [workspace.dataFolderId], + appProperties: { + folderId: workspace.folderId, + }, + media: JSON.stringify(item), + fileId: syncData && syncData.id, + oldParents: syncData && syncData.parentIds, + ifNotTooLate, + }); + + // Return new sync data + return { + id: file.id, + itemId: item.id, + type: item.type, + hash: item.hash, + }; }, async listRevisions(token, fileId) { const syncData = Provider.getContentSyncData(fileId); diff --git a/src/services/providers/helpers/githubHelper.js b/src/services/providers/helpers/githubHelper.js index 7668e9d3..41ac1e32 100644 --- a/src/services/providers/helpers/githubHelper.js +++ b/src/services/providers/helpers/githubHelper.js @@ -113,12 +113,12 @@ export default { repo, branch, }) { - const { commit } = (await repoRequest(token, owner, repo, { + const { commit } = await repoRequest(token, owner, repo, { url: `commits/${encodeURIComponent(branch)}`, - })).body; - const { tree, truncated } = (await repoRequest(token, owner, repo, { + }); + const { tree, truncated } = await repoRequest(token, owner, repo, { url: `git/trees/${encodeURIComponent(commit.tree.sha)}?recursive=1`, - })).body; + }); if (truncated) { throw new Error('Git tree too big. Please remove some files in the repository.'); } @@ -198,13 +198,13 @@ export default { branch, path, }) { - const body = await repoRequest(token, owner, repo, { + const { sha, content } = await repoRequest(token, owner, repo, { url: `contents/${encodeURIComponent(path)}`, params: { ref: branch }, }); return { - sha: body.sha, - content: utils.decodeBase64(body.content), + sha, + content: utils.decodeBase64(content), }; }, diff --git a/src/services/providers/helpers/googleHelper.js b/src/services/providers/helpers/googleHelper.js index 9a19ab6f..2fbaa337 100644 --- a/src/services/providers/helpers/googleHelper.js +++ b/src/services/providers/helpers/googleHelper.js @@ -190,7 +190,10 @@ export default { if (store.state.offline) { throw err; } - await store.dispatch('modal/providerRedirection', { providerName: 'Google' }); + await store.dispatch('modal/open', { + type: 'providerRedirection', + name: 'Google', + }); return this.startOauth2(mergedScopes, sub); } }, @@ -231,7 +234,7 @@ export default { mediaType = null, fileId = null, oldParents = null, - ifNotTooLate = cb => res => cb(res), + ifNotTooLate = cb => cb(), }) { // Refreshing a token can take a while if an oauth window pops up, make sure it's not too late return ifNotTooLate(() => { @@ -374,7 +377,7 @@ export default { /** * https://developers.google.com/drive/v3/reference/files/delete */ - async $removeFile(refreshedToken, id, ifNotTooLate = cb => res => cb(res)) { + async $removeFile(refreshedToken, id, ifNotTooLate = cb => cb()) { // Refreshing a token can take a while if an oauth window pops up, so check if it's too late return ifNotTooLate(() => this.$request(refreshedToken, { method: 'DELETE', @@ -388,7 +391,7 @@ export default { const refreshedToken = await this.refreshToken(token, getDriveScopes(token)); return this.$removeFile(refreshedToken, id, ifNotTooLate); }, - async removeAppDataFile(token, id, ifNotTooLate = cb => res => cb(res)) { + async removeAppDataFile(token, id, ifNotTooLate = cb => cb()) { const refreshedToken = await this.refreshToken(token, driveAppDataScopes); return this.$removeFile(refreshedToken, id, ifNotTooLate); }, @@ -599,7 +602,7 @@ export default { } const refreshedToken = await this.refreshToken(token, scopes); const { google } = window; - return Promise((resolve) => { + return new Promise((resolve) => { let picker; const pickerBuilder = new google.picker.PickerBuilder() .setOAuthToken(refreshedToken.accessToken) diff --git a/src/services/providers/helpers/wordpressHelper.js b/src/services/providers/helpers/wordpressHelper.js index ad4c9a78..69cbd143 100644 --- a/src/services/providers/helpers/wordpressHelper.js +++ b/src/services/providers/helpers/wordpressHelper.js @@ -57,7 +57,10 @@ export default { } // Existing token is going to expire. // Try to get a new token in background - await store.dispatch('modal/providerRedirection', { providerName: 'WordPress' }); + await store.dispatch('modal/open', { + type: 'providerRedirection', + name: 'WordPress', + }); return this.startOauth2(sub); }, addAccount(fullAccess = false) { diff --git a/src/services/publishSvc.js b/src/services/publishSvc.js index bbcbb1aa..8557135f 100644 --- a/src/services/publishSvc.js +++ b/src/services/publishSvc.js @@ -103,24 +103,22 @@ const requestPublish = () => { return; } - store.dispatch('queue/enqueuePublishRequest', () => new Promise((resolve, reject) => { + store.dispatch('queue/enqueuePublishRequest', async () => { let intervalId; - const attempt = () => { + const attempt = async () => { // Only start publishing when these conditions are met if (networkSvc.isUserActive()) { clearInterval(intervalId); if (!hasCurrentFilePublishLocations()) { // Cancel sync - reject(new Error('Publish not possible.')); - return; + throw new Error('Publish not possible.'); } - publishFile(store.getters['file/current'].id) - .then(resolve, reject); + await publishFile(store.getters['file/current'].id); } }; intervalId = utils.setInterval(() => attempt(), 1000); - attempt(); - })); + return attempt(); + }); }; const createPublishLocation = (publishLocation) => { diff --git a/src/services/syncSvc.js b/src/services/syncSvc.js index 709cc266..84d98eeb 100644 --- a/src/services/syncSvc.js +++ b/src/services/syncSvc.js @@ -206,24 +206,30 @@ const createSyncLocation = (syncLocation) => { ); }; -// Prevent from sending new data too long after old data has been fetched +/** + * Prevent from sending new data too long after old data has been fetched. + */ const tooLateChecker = (timeout) => { const tooLateAfter = Date.now() + timeout; - return cb => (res) => { + return (cb) => { if (tooLateAfter < Date.now()) { throw new Error('TOO_LATE'); } - return cb(res); + return cb(); }; }; +/** + * Return true if file is in the temp folder or it's a welcome file. + */ const isTempFile = (fileId) => { - if (store.getters['data/syncDataByItemId'][`${fileId}/content`]) { + const contentId = `${fileId}/content`; + if (store.getters['data/syncDataByItemId'][contentId]) { // If file has already been synced, it's not a temp file return false; } const file = store.state.file.itemMap[fileId]; - const content = store.state.content.itemMap[`${fileId}/content`]; + const content = store.state.content.itemMap[contentId]; if (!file || !content) { return false; } @@ -254,15 +260,17 @@ class SyncContext { * Sync one file with all its locations. */ const syncFile = async (fileId, syncContext = new SyncContext()) => { - syncContext.attempted[`${fileId}/content`] = true; + const contentId = `${fileId}/content`; + syncContext.attempted[contentId] = true; await localDbSvc.loadSyncedContent(fileId); try { - await localDbSvc.loadItem(`${fileId}/content`); + await localDbSvc.loadItem(contentId); } catch (e) { // Item may not exist if content has not been downloaded yet } - const getContent = () => store.state.content.itemMap[`${fileId}/content`]; + + const getContent = () => store.state.content.itemMap[contentId]; const getSyncedContent = () => upgradeSyncedContent(store.state.syncedContent.itemMap[`${fileId}/syncedContent`]); const getSyncHistoryItem = syncLocationId => getSyncedContent().syncHistory[syncLocationId]; @@ -288,28 +296,88 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => { return; } + const downloadContent = async () => { + // On simple provider, call simply downloadContent + if (syncLocation.id !== 'main') { + return provider.downloadContent(token, syncLocation); + } + + // On workspace provider, call downloadWorkspaceContent + const oldSyncData = provider.isGit + ? store.getters['data/syncData'][store.getters.itemGitPaths[contentId]] + : store.getters['data/syncDataByItemId'][contentId]; + if (!oldSyncData) { + return null; + } + const { item, syncData } = await provider.downloadWorkspaceContent(token, oldSyncData); + if (!item) { + return null; + } + + // Update sync data if changed + if (syncData + && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData) + ) { + store.dispatch('data/patchSyncData', { + [syncData.id]: syncData, + }); + } + return item; + }; + + const uploadContent = async (item, ifNotTooLate) => { + // On simple provider, call simply uploadContent + if (syncLocation.id !== 'main') { + return provider.uploadContent(token, item, syncLocation, ifNotTooLate); + } + + // On workspace provider, call uploadWorkspaceContent + const oldSyncData = provider.isGit + ? store.getters['data/syncData'][store.getters.itemGitPaths[contentId]] + : store.getters['data/syncDataByItemId'][contentId]; + if (oldSyncData && oldSyncData.hash === item.hash) { + return syncLocation; + } + + const syncData = await provider.uploadWorkspaceContent( + token, + item, + oldSyncData, + ifNotTooLate, + ); + + // Update sync data if changed + if (syncData + && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData) + ) { + store.dispatch('data/patchSyncData', { + [syncData.id]: syncData, + }); + } + + // Return syncLocation + return syncLocation; + }; + const doSyncLocation = async () => { - const serverContent = await provider.downloadContent(token, syncLocation); + const serverContent = await downloadContent(token, syncLocation); const syncedContent = getSyncedContent(); const syncHistoryItem = getSyncHistoryItem(syncLocation.id); - let mergedContent = (() => { - const clientContent = utils.deepCopy(getContent()); - if (!clientContent) { - return utils.deepCopy(serverContent || null); - } - if (!serverContent) { - // Sync location has not been created yet - return clientContent; - } - if (serverContent.hash === clientContent.hash) { - // Server and client contents are synced - return clientContent; - } - if (syncedContent.historyData[serverContent.hash]) { - // Server content has not changed or has already been merged - return clientContent; - } - // Perform a merge with last merged content if any, or a simple fusion otherwise + + // Merge content + let mergedContent; + const clientContent = utils.deepCopy(getContent()); + if (!clientContent) { + mergedContent = utils.deepCopy(serverContent || null); + } else if (!serverContent // If sync location has not been created yet + // Or server and client contents are synced + || serverContent.hash === clientContent.hash + // Or server content has not changed or has already been merged + || syncedContent.historyData[serverContent.hash] + ) { + mergedContent = clientContent; + } else { + // Perform a merge with last merged content if any, or perform a simple fusion otherwise let lastMergedContent = utils.someResult( serverContent.history, hash => syncedContent.historyData[hash], @@ -317,16 +385,15 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => { if (!lastMergedContent && syncHistoryItem) { lastMergedContent = syncedContent.historyData[syncHistoryItem[LAST_MERGED]]; } - return diffUtils.mergeContent(serverContent, clientContent, lastMergedContent); - })(); - + mergedContent = diffUtils.mergeContent(serverContent, clientContent, lastMergedContent); + } if (!mergedContent) { return; } // Update or set content in store store.commit('content/setItem', { - id: `${fileId}/content`, + id: contentId, text: utils.sanitizeText(mergedContent.text), properties: utils.sanitizeText(mergedContent.properties), discussions: mergedContent.discussions, @@ -356,8 +423,7 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => { } } - // Store last sent if it's in the server history, - // and merged content which will be sent if different + // Update synced content const newSyncedContent = utils.deepCopy(syncedContent); const newSyncHistoryItem = newSyncedContent.syncHistory[syncLocation.id] || []; newSyncedContent.syncHistory[syncLocation.id] = newSyncHistoryItem; @@ -384,10 +450,14 @@ const syncFile = async (fileId, syncContext = new SyncContext()) => { } // Upload merged content - const syncLocationToStore = await provider.uploadContent(token, { + const item = { ...mergedContent, history: mergedContentHistory.slice(0, maxContentHistory), - }, syncLocation, tooLateChecker(restartContentSyncAfter)); + }; + const syncLocationToStore = await uploadContent( + item, + tooLateChecker(restartContentSyncAfter), + ); // Replace sync location if modified if (utils.serializeObject(syncLocation) !== @@ -437,14 +507,30 @@ const syncDataItem = async (dataId) => { const getItem = () => store.state.data.itemMap[dataId] || store.state.data.lsItemMap[dataId]; - const item = getItem(); - const syncData = store.getters['data/syncDataByItemId'][dataId]; + const oldItem = getItem(); + const oldSyncData = store.getters['data/syncDataByItemId'][dataId]; // Sync if item hash and syncData hash are out of sync - if (syncData && item && item.hash === syncData.hash) { + if (oldSyncData && oldItem && oldItem.hash === oldSyncData.hash) { return; } - const serverItem = await workspaceProvider.downloadData(dataId); + const token = workspaceProvider.getToken(); + const { item, syncData } = await workspaceProvider.downloadWorkspaceData( + token, + dataId, + oldSyncData, + ); + + // Update sync data if changed + if (syncData + && utils.serializeObject(oldSyncData) !== utils.serializeObject(syncData) + ) { + store.dispatch('data/patchSyncData', { + [syncData.id]: syncData, + }); + } + + const serverItem = item; const dataSyncData = store.getters['data/dataSyncData'][dataId]; let mergedItem = (() => { const clientItem = utils.deepCopy(getItem()); @@ -487,7 +573,25 @@ const syncDataItem = async (dataId) => { if (serverItem && serverItem.hash === mergedItem.hash) { return; } - await workspaceProvider.uploadData(mergedItem, tooLateChecker(restartContentSyncAfter)); + + // Upload merged data item + const newSyncData = await workspaceProvider.uploadWorkspaceData( + token, + mergedItem, + syncData, + tooLateChecker(restartContentSyncAfter), + ); + + // Update sync data if changed + if (newSyncData + && utils.serializeObject(syncData) !== utils.serializeObject(newSyncData) + ) { + store.dispatch('data/patchSyncData', { + [newSyncData.id]: newSyncData, + }); + } + + // Update data sync data store.dispatch('data/patchDataSyncData', { [dataId]: utils.deepCopy(store.getters['data/syncDataByItemId'][dataId]), }); @@ -523,7 +627,7 @@ const syncWorkspace = async () => { const ifNotTooLate = tooLateChecker(restartSyncAfter); // Called until no item to save - const saveNextItem = ifNotTooLate(async () => { + const saveNextItem = () => ifNotTooLate(async () => { const storeItemMap = { ...store.state.file.itemMap, ...store.state.folder.itemMap, @@ -531,16 +635,25 @@ const syncWorkspace = async () => { ...store.state.publishLocation.itemMap, // Deal with contents and data later }; - const syncDataByItemId = store.getters['data/syncDataByItemId']; + + let getSyncData; + if (workspaceProvider.isGit) { + const syncData = store.getters['data/syncData']; + getSyncData = id => syncData[store.getters.itemGitPaths[id]]; + } else { + const syncDataByItemId = store.getters['data/syncDataByItemId']; + getSyncData = id => syncDataByItemId[id]; + } + const [changedItem, syncDataToUpdate] = utils.someResult( Object.entries(storeItemMap), ([id, item]) => { - const existingSyncData = syncDataByItemId[id]; + const existingSyncData = getSyncData(id); if ((!existingSyncData || existingSyncData.hash !== item.hash) // Add file/folder if parent has been added - && (!storeItemMap[item.parentId] || syncDataByItemId[item.parentId]) + && (!storeItemMap[item.parentId] || getSyncData(item.parentId)) // Add file if content has been added - && (item.type !== 'file' || syncDataByItemId[`${id}/content`]) + && (item.type !== 'file' || getSyncData(`${id}/content`)) ) { return [item, existingSyncData]; } @@ -550,7 +663,7 @@ const syncWorkspace = async () => { if (changedItem) { const resultSyncData = await workspaceProvider - .saveSimpleItem( + .saveWorkspaceItem( // Use deepCopy to freeze objects utils.deepCopy(changedItem), utils.deepCopy(syncDataToUpdate), @@ -565,29 +678,39 @@ const syncWorkspace = async () => { await saveNextItem(); // Called until no item to remove - const removeNextItem = ifNotTooLate(async () => { - const storeItemMap = { - ...store.state.file.itemMap, - ...store.state.folder.itemMap, - ...store.state.syncLocation.itemMap, - ...store.state.publishLocation.itemMap, - ...store.state.content.itemMap, - }; + const removeNextItem = () => ifNotTooLate(async () => { + let getItem; + let getFileItem; + if (workspaceProvider.isGit) { + const { gitPathItems } = store.getters; + getItem = syncData => gitPathItems[syncData.id]; + getFileItem = syncData => gitPathItems[syncData.id.slice(1)]; // Remove leading / + } else { + const { allItemMap } = store.getters; + getItem = syncData => allItemMap[syncData.itemId]; + getFileItem = syncData => allItemMap[syncData.itemId.split('/')[0]]; + } + const syncData = store.getters['data/syncData']; const syncDataToRemove = utils.deepCopy(utils.someResult( Object.values(syncData), - existingSyncData => !storeItemMap[existingSyncData.itemId] - // We don't want to delete data items, especially on first sync - && existingSyncData.type !== 'data' - // Remove content only if file has been removed - && (existingSyncData.type !== 'content' - || !storeItemMap[existingSyncData.itemId.split('/')[0]]) - && existingSyncData, + (existingSyncData) => { + if (!getItem(existingSyncData) + // We don't want to delete data items, especially on first sync + && existingSyncData.type !== 'data' + // Remove content only if file has been removed + && (existingSyncData.type !== 'content' + || !getFileItem(existingSyncData)) + ) { + return existingSyncData; + } + return null; + }, )); if (syncDataToRemove) { // Use deepCopy to freeze objects - await workspaceProvider.removeItem(syncDataToRemove, ifNotTooLate); + await workspaceProvider.removeWorkspaceItem(syncDataToRemove, ifNotTooLate); const syncDataCopy = { ...store.getters['data/syncData'] }; delete syncDataCopy[syncDataToRemove.id]; store.dispatch('data/setSyncData', syncDataCopy); @@ -608,11 +731,22 @@ const syncWorkspace = async () => { ...Object.keys(localDbSvc.hashMap.content), ...store.getters['file/items'].map(file => `${file.id}/content`), ])]; + const contentMap = store.state.content.itemMap; + const syncDataById = store.getters['data/syncData']; + let getSyncData; + if (workspaceProvider.isGit) { + const { itemGitPaths } = store.getters; + getSyncData = contentId => syncDataById[itemGitPaths[contentId]]; + } else { + const syncDataByItemId = store.getters['data/syncDataByItemId']; + getSyncData = contentId => syncDataByItemId[contentId]; + } + return utils.someResult(contentIds, (contentId) => { // Get content hash from itemMap or from localDbSvc if not loaded - const loadedContent = store.state.content.itemMap[contentId]; + const loadedContent = contentMap[contentId]; const hash = loadedContent ? loadedContent.hash : localDbSvc.hashMap.content[contentId]; - const syncData = store.getters['data/syncDataByItemId'][contentId]; + const syncData = getSyncData(contentId); if ( // Sync if content syncing was not attempted yet !syncContext.attempted[contentId] && @@ -721,7 +855,7 @@ const requestSync = () => { }; intervalId = utils.setInterval(() => attempt(), 1000); - attempt(); + return attempt(); }); }; diff --git a/src/services/utils.js b/src/services/utils.js index 6430c0e4..46c08e99 100644 --- a/src/services/utils.js +++ b/src/services/utils.js @@ -23,7 +23,6 @@ const parseQueryParams = (params) => { return result; }; - // For utils.computeProperties() const deepOverride = (obj, opt) => { if (obj === undefined) { @@ -172,10 +171,12 @@ export default { return Math.abs(this.hash(this.serializeObject(params))).toString(36); }, encodeBase64(str, urlSafe = false) { - const result = btoa(encodeURIComponent(str).replace( + const uriEncodedStr = encodeURIComponent(str); + const utf8Str = uriEncodedStr.replace( /%([0-9A-F]{2})/g, (match, p1) => String.fromCharCode(`0x${p1}`), - )); + ); + const result = btoa(utf8Str); if (!urlSafe) { return result; } @@ -187,10 +188,12 @@ export default { decodeBase64(str) { // In case of URL safe base64 const sanitizedStr = str.replace(/_/g, '/').replace(/-/g, '+'); - return decodeURIComponent(atob(sanitizedStr) + const utf8Str = atob(sanitizedStr); + const uriEncodedStr = utf8Str .split('') .map(c => `%${`00${c.charCodeAt(0).toString(16)}`.slice(-2)}`) - .join('')); + .join(''); + return decodeURIComponent(uriEncodedStr); }, computeProperties(yamlProperties) { let properties = {}; diff --git a/src/store/content.js b/src/store/content.js index 57f901a8..89421b2b 100644 --- a/src/store/content.js +++ b/src/store/content.js @@ -82,7 +82,7 @@ module.actions = { }) { const { revisionContent } = state; if (revisionContent) { - await dispatch('modal/fileRestoration', null, { root: true }); + await dispatch('modal/open', 'fileRestoration', { root: true }); // Close revision commit('setRevisionContent'); const currentContent = utils.deepCopy(getters.current); diff --git a/src/store/contextMenu.js b/src/store/contextMenu.js index ce1fbe7a..6b4180e4 100644 --- a/src/store/contextMenu.js +++ b/src/store/contextMenu.js @@ -26,21 +26,23 @@ export default { setTimeout(() => { // Take the size of the context menu and place it const elt = document.querySelector('.context-menu__inner'); - const height = elt.offsetHeight; - if (coordinates.top + height > rootState.layout.bodyHeight) { - coordinates.top -= height; + if (elt) { + const height = elt.offsetHeight; + if (coordinates.top + height > rootState.layout.bodyHeight) { + coordinates.top -= height; + } + if (coordinates.top < 0) { + coordinates.top = 0; + } + const width = elt.offsetWidth; + if (coordinates.left + width > rootState.layout.bodyWidth) { + coordinates.left -= width; + } + if (coordinates.left < 0) { + coordinates.left = 0; + } + commit('setCoordinates', coordinates); } - if (coordinates.top < 0) { - coordinates.top = 0; - } - const width = elt.offsetWidth; - if (coordinates.left + width > rootState.layout.bodyWidth) { - coordinates.left -= width; - } - if (coordinates.left < 0) { - coordinates.left = 0; - } - commit('setCoordinates', coordinates); }, 1); return new Promise(resolve => commit('setResolve', resolve)); diff --git a/src/store/discussion.js b/src/store/discussion.js index 1c1d1ab5..2171c148 100644 --- a/src/store/discussion.js +++ b/src/store/discussion.js @@ -135,7 +135,7 @@ export default { const loginToken = rootGetters['workspace/loginToken']; if (!loginToken) { try { - await dispatch('modal/signInForComment', null, { root: true }); + await dispatch('modal/open', 'signInForComment', { root: true }); await googleHelper.signin(); syncSvc.requestSync(); await dispatch('createNewDiscussion', selection); diff --git a/src/store/explorer.js b/src/store/explorer.js index c1ca2152..f9fdfc29 100644 --- a/src/store/explorer.js +++ b/src/store/explorer.js @@ -18,11 +18,10 @@ const collator = new Intl.Collator(undefined, { sensitivity: 'base' }); const compare = (node1, node2) => collator.compare(node1.item.name, node2.item.name); class Node { - constructor(item, locations = [], isFolder = false, isRoot = false) { + constructor(item, locations = [], isFolder = false) { this.item = item; this.locations = locations; this.isFolder = isFolder; - this.isRoot = isRoot; if (isFolder) { this.folders = []; this.files = []; @@ -84,7 +83,8 @@ export default { }, getters: { nodeStructure: (state, getters, rootState, rootGetters) => { - const rootNode = new Node(emptyFolder(), [], true, true); + const rootNode = new Node(emptyFolder(), [], true); + rootNode.isRoot = true; // Create Trash node const trashFolderNode = new Node(emptyFolder(), [], true); diff --git a/src/store/index.js b/src/store/index.js index f811c287..bdc0d071 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -119,6 +119,41 @@ const store = new Vuex.Store({ }); return result; }, + itemGitPaths: (state, { allItemMap, itemPaths }) => { + const result = {}; + Object.entries(allItemMap).forEach(([id, item]) => { + if (item.type === 'data') { + result[id] = `.stackedit-data/${id}.json`; + } else if (item.type === 'file') { + result[id] = `${itemPaths[id]}.md`; + } else if (item.type === 'content') { + const [fileId] = id.split('/'); + result[id] = `/${itemPaths[fileId]}.md`; + } else if (item.type === 'folder') { + result[id] = itemPaths[id]; + } else if (item.type === 'syncLocation' || item.type === 'publishLocation') { + // locations are stored as paths + const encodedItem = utils.encodeBase64(utils.serializeObject({ + ...item, + id: undefined, + type: undefined, + fileId: undefined, + }), true); + const extension = item.type === 'syncLocation' ? 'sync' : 'publish'; + result[id] = `${itemPaths[item.fileId]}.${encodedItem}.${extension}`; + } + }); + return result; + }, + gitPathItems: (state, { allItemMap, itemGitPaths }) => { + const result = {}; + Object.entries(itemGitPaths).forEach(([id, path]) => { + const items = result[path] || []; + items.push(allItemMap[id]); + result[path] = items; + }); + return result; + }, isSponsor: ({ light, monetizeSponsor }, getters) => { const sponsorToken = getters['workspace/sponsorToken']; return light || monetizeSponsor || (sponsorToken && sponsorToken.isSponsor); diff --git a/src/store/modal.js b/src/store/modal.js index 5ec3ba32..632717d0 100644 --- a/src/store/modal.js +++ b/src/store/modal.js @@ -36,100 +36,5 @@ export default { commit('setHidden', false); } }, - folderDeletion: ({ dispatch }, item) => dispatch('open', { - content: `

You are about to delete the folder ${item.name}. Its files will be moved to Trash. Are you sure?

`, - resolveText: 'Yes, delete', - rejectText: 'No', - }), - tempFileDeletion: ({ dispatch }, item) => dispatch('open', { - content: `

You are about to permanently delete the temporary file ${item.name}. Are you sure?

`, - resolveText: 'Yes, delete', - rejectText: 'No', - }), - tempFolderDeletion: ({ dispatch }) => dispatch('open', { - content: '

You are about to permanently delete all the temporary files. Are you sure?

', - resolveText: 'Yes, delete all', - rejectText: 'No', - }), - discussionDeletion: ({ dispatch }) => dispatch('open', { - content: '

You are about to delete a discussion. Are you sure?

', - resolveText: 'Yes, delete', - rejectText: 'No', - }), - commentDeletion: ({ dispatch }) => dispatch('open', { - content: '

You are about to delete a comment. Are you sure?

', - resolveText: 'Yes, delete', - rejectText: 'No', - }), - trashDeletion: ({ dispatch }) => dispatch('open', { - content: '

Files in the trash are automatically deleted after 7 days of inactivity.

', - rejectText: 'Ok', - }), - fileRestoration: ({ dispatch }) => dispatch('open', { - content: '

You are about to revert some changes. Are you sure?

', - resolveText: 'Yes, revert', - rejectText: 'No', - }), - unauthorizedName: ({ dispatch }, name) => dispatch('open', { - content: `

${name} is not an authorized name.

`, - rejectText: 'Ok', - }), - stripName: ({ dispatch }, name) => dispatch('open', { - content: `

${name} contains illegal characters. Do you want to strip them?

`, - resolveText: 'Yes, strip', - rejectText: 'No', - }), - pathConflict: ({ dispatch }, name) => dispatch('open', { - content: `

${name} already exists. Do you want to add a suffix?

`, - resolveText: 'Yes, add suffix', - rejectText: 'No', - }), - removeWorkspace: ({ dispatch }) => dispatch('open', { - content: '

You are about to remove a workspace locally. Are you sure?

', - resolveText: 'Yes, remove', - rejectText: 'No', - }), - reset: ({ dispatch }) => dispatch('open', { - content: '

This will clean all your workspaces locally. Are you sure?

', - resolveText: 'Yes, clean', - rejectText: 'No', - }), - providerRedirection: ({ dispatch }, { providerName }) => dispatch('open', { - content: `

You are about to navigate to the ${providerName} authorization page.

`, - resolveText: 'Ok, go on', - rejectText: 'Cancel', - }), - workspaceGoogleRedirection: ({ dispatch }) => dispatch('open', { - content: '

StackEdit needs full Google Drive access to open this workspace.

', - resolveText: 'Ok, grant', - rejectText: 'Cancel', - }), - signInForSponsorship: ({ dispatch }) => dispatch('open', { - type: 'signInForSponsorship', - content: `

You have to sign in with Google to sponsor.

-
Note: This will sync your main workspace.
`, - resolveText: 'Ok, sign in', - rejectText: 'Cancel', - }), - signInForComment: ({ dispatch }) => dispatch('open', { - content: `

You have to sign in with Google to start commenting.

-
Note: This will sync your main workspace.
`, - resolveText: 'Ok, sign in', - rejectText: 'Cancel', - }), - signInForHistory: ({ dispatch }) => dispatch('open', { - content: `

You have to sign in with Google to enable revision history.

-
Note: This will sync your main workspace.
`, - resolveText: 'Ok, sign in', - rejectText: 'Cancel', - }), - sponsorOnly: ({ dispatch }) => dispatch('open', { - content: '

This feature is restricted to sponsors as it relies on server resources.

', - rejectText: 'Ok, I understand', - }), - paymentSuccess: ({ dispatch }) => dispatch('open', { - content: '

Thank you for your payment! Your sponsorship will be active in a minute.

', - rejectText: 'Ok', - }), }, }; diff --git a/src/store/notification.js b/src/store/notification.js index e2fa1537..b69e3999 100644 --- a/src/store/notification.js +++ b/src/store/notification.js @@ -1,4 +1,4 @@ -const itemTimeout = 5000; +const defaultTimeout = 5000; export default { namespaced: true, @@ -14,8 +14,10 @@ export default { showItem({ state, commit }, item) { if (state.items.every(other => other.type !== item.type || other.content !== item.content)) { commit('setItems', [...state.items, item]); - setTimeout(() => - commit('setItems', state.items.filter(otherItem => otherItem !== item)), itemTimeout); + setTimeout( + () => commit('setItems', state.items.filter(otherItem => otherItem !== item)), + item.timeout || defaultTimeout, + ); } }, info({ dispatch }, info) { @@ -25,9 +27,7 @@ export default { }); }, error({ dispatch, rootState }, error) { - const item = { - type: 'error', - }; + const item = { type: 'error' }; if (error) { if (error.message) { item.content = error.message; diff --git a/static/landing/index.html b/static/landing/index.html index 6b0fa372..8eda4c35 100644 --- a/static/landing/index.html +++ b/static/landing/index.html @@ -15,6 +15,10 @@