diff --git a/CHANGELOG.md b/CHANGELOG.md index a0d8c4b0..258af0d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ way to update this template, but currently, we follow a pattern: --- ## Upcoming version 2018-08-XX +* [change] Update the Sharetribe Flex SDK to the 1.0.0 version in NPM. + All the `sharetribe-sdk` imports are now using the new package name + `sharetribe-flex-sdk`. + [#884](https://github.com/sharetribe/flex-template-web/pull/884) * [change] Reusable SearchMap. Fixed the original reverted version. (Includes audit exception 678) [#882](https://github.com/sharetribe/flex-template-web/pull/882) diff --git a/package.json b/package.json index d6dcbdfd..ac4f1377 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "redux-thunk": "^2.2.0", "sanitize.css": "^5.0.0", "seedrandom": "^2.4.3", + "sharetribe-flex-sdk": "^1.0.0", "sharetribe-scripts": "1.1.2", - "sharetribe-sdk": "https://github.com/sharetribe/sharetribe-sdk-js.git#b7ffe0fe0a5bdb0a1471e2ff36cdd25b997fb39b", "smoothscroll-polyfill": "^0.4.0", "source-map-support": "^0.5.4", "url": "^0.11.0" diff --git a/server/index.js b/server/index.js index 903c3426..ae4992e0 100644 --- a/server/index.js +++ b/server/index.js @@ -28,7 +28,7 @@ const cookieParser = require('cookie-parser'); const bodyParser = require('body-parser'); const enforceSsl = require('express-enforces-ssl'); const path = require('path'); -const sharetribeSdk = require('sharetribe-sdk'); +const sharetribeSdk = require('sharetribe-flex-sdk'); const Decimal = require('decimal.js'); const sitemap = require('express-sitemap'); const auth = require('./auth'); diff --git a/server/renderer.js b/server/renderer.js index 50f68e21..cfe2f5c5 100644 --- a/server/renderer.js +++ b/server/renderer.js @@ -1,7 +1,7 @@ const path = require('path'); const fs = require('fs'); const _ = require('lodash'); -const { types } = require('sharetribe-sdk'); +const { types } = require('sharetribe-flex-sdk'); const { renderApp } = require('./importer'); const buildPath = path.resolve(__dirname, '..', 'build'); diff --git a/src/util/sdkLoader.js b/src/util/sdkLoader.js index 369f6686..273e4a43 100644 --- a/src/util/sdkLoader.js +++ b/src/util/sdkLoader.js @@ -1,4 +1,4 @@ -import * as importedSdk from 'sharetribe-sdk'; +import * as importedSdk from 'sharetribe-flex-sdk'; let exportSdk; @@ -7,7 +7,7 @@ const isServer = () => typeof window === 'undefined'; if (isServer()) { // Use eval to skip webpack from bundling SDK in Node // eslint-disable-next-line no-eval - exportSdk = eval('require')('sharetribe-sdk'); + exportSdk = eval('require')('sharetribe-flex-sdk'); } else { exportSdk = importedSdk; } diff --git a/yarn.lock b/yarn.lock index 70ed68cb..f7895008 100644 --- a/yarn.lock +++ b/yarn.lock @@ -430,11 +430,12 @@ aws4@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" -axios@^0.15.3: - version "0.15.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053" +axios@^0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102" dependencies: - follow-redirects "1.0.0" + follow-redirects "^1.3.0" + is-buffer "^1.1.5" axobject-query@^0.1.0: version "0.1.0" @@ -3199,11 +3200,11 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -follow-redirects@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37" +follow-redirects@^1.3.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.2.tgz#5a9d80e0165957e5ef0c1210678fc5c4acb9fb03" dependencies: - debug "^2.2.0" + debug "^3.1.0" for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -4639,8 +4640,8 @@ js-base64@^2.1.9: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" js-cookie@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.3.tgz#48071625217ac9ecfab8c343a13d42ec09ff0526" + version "2.2.0" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb" js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" @@ -4953,7 +4954,7 @@ lodash@^3.10.1: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.1.1, lodash@^4.17.5: +lodash@^4.1.1, lodash@^4.17.10, lodash@^4.17.5: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -7532,6 +7533,15 @@ shallowequal@^0.2.2: dependencies: lodash.keys "^3.1.2" +sharetribe-flex-sdk@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/sharetribe-flex-sdk/-/sharetribe-flex-sdk-1.0.0.tgz#ed3a6199e4755917fcd97355e5d7633a490f4ba6" + dependencies: + axios "^0.18.0" + js-cookie "^2.1.3" + lodash "^4.17.10" + transit-js "^0.8.846" + sharetribe-scripts@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/sharetribe-scripts/-/sharetribe-scripts-1.1.2.tgz#3facfa723cb05f3d0d977e7e870f9f00f1d7e163" @@ -7578,15 +7588,6 @@ sharetribe-scripts@1.1.2: optionalDependencies: fsevents "^1.1.3" -"sharetribe-sdk@https://github.com/sharetribe/sharetribe-sdk-js.git#b7ffe0fe0a5bdb0a1471e2ff36cdd25b997fb39b": - version "0.0.1" - resolved "https://github.com/sharetribe/sharetribe-sdk-js.git#b7ffe0fe0a5bdb0a1471e2ff36cdd25b997fb39b" - dependencies: - axios "^0.15.3" - js-cookie "^2.1.3" - lodash "^4.17.4" - transit-js "^0.8.846" - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -8180,8 +8181,8 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" transit-js@^0.8.846: - version "0.8.846" - resolved "https://registry.yarnpkg.com/transit-js/-/transit-js-0.8.846.tgz#76e06e8f0e6be27675e3442112f5c9bb75343464" + version "0.8.861" + resolved "https://registry.yarnpkg.com/transit-js/-/transit-js-0.8.861.tgz#829e516b80349a41fff5d59f5e6993b5473f72c9" trim-newlines@^1.0.0: version "1.0.0"