Skip to content

Commit cde2528

Browse files
authored
revert the json3 changes for segmentio integration (#564)
1 parent a441a1f commit cde2528

File tree

4 files changed

+17
-35
lines changed

4 files changed

+17
-35
lines changed

integrations/segmentio/lib/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@ var clone = require('component-clone');
99
var cookie = require('component-cookie');
1010
var extend = require('@ndhoule/extend');
1111
var integration = require('@segment/analytics.js-integration');
12+
var json = require('json3');
1213
var keys = require('@ndhoule/keys');
1314
var localstorage = require('yields-store');
1415
var protocol = require('@segment/protocol');
1516
var send = require('@segment/send-json');
1617
var topDomain = require('@segment/top-domain');
1718
var utm = require('@segment/utm-params');
18-
var uuid = require('@lukeed/uuid').v4;
19+
var uuid = require('uuid').v4;
1920
var Queue = require('@segment/localstorage-retry');
2021

21-
var json = JSON;
22-
2322
/**
2423
* Cookie options
2524
*/

integrations/segmentio/package.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@segment/analytics.js-integration-segmentio",
33
"description": "The Segmentio analytics.js integration.",
4-
"version": "4.4.0",
4+
"version": "4.4.1",
55
"keywords": [
66
"analytics.js",
77
"analytics.js-integration",
@@ -28,22 +28,24 @@
2828
"@ndhoule/keys": "^2.0.0",
2929
"@segment/ad-params": "^1.0.0",
3030
"@segment/analytics.js-integration": "^2.1.0",
31-
"@segment/localstorage-retry": "^1.2.5",
31+
"@segment/localstorage-retry": "^1.2.2",
3232
"@segment/protocol": "^1.0.0",
33-
"@segment/send-json": "^4.0.2",
33+
"@segment/send-json": "^3.0.0",
3434
"@segment/top-domain": "^3.0.0",
3535
"@segment/utm-params": "^2.0.0",
3636
"component-clone": "^0.2.2",
3737
"component-cookie": "^1.1.2",
3838
"component-type": "^1.2.1",
39-
"@lukeed/uuid": "^2.0.0",
39+
"json3": "^3.3.2",
40+
"uuid": "^2.0.2",
4041
"yields-store": "^1.0.2"
4142
},
4243
"devDependencies": {
4344
"@segment/analytics.js-core": "^3.8.0",
4445
"@segment/analytics.js-integration-tester": "^2.0.0",
4546
"@segment/clear-env": "^2.0.0",
4647
"browserify": "^16.2.3",
48+
"eslint": "^5.16.0",
4749
"karma": "^4.1.0",
4850
"karma-browserify": "^6.0.0",
4951
"karma-chrome-launcher": "^2.2.0",
@@ -53,8 +55,8 @@
5355
"karma-spec-reporter": "^0.0.32",
5456
"karma-summary-reporter": "^1.6.0",
5557
"mocha": "^6.1.4",
58+
"watchify": "^3.11.1",
5659
"proclaim": "^3.4.1",
57-
"sinon": "^1.17.4",
58-
"watchify": "^3.11.1"
60+
"sinon": "^1.17.4"
5961
}
6062
}

integrations/segmentio/test/index.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22

33
var Analytics = require('@segment/analytics.js-core').constructor;
4+
var JSON = require('json3');
45
var Segment = require('../lib/');
56
var assert = require('proclaim');
67
var cookie = require('component-cookie');

yarn.lock

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,18 +1601,6 @@
16011601
npmlog "^4.1.2"
16021602
write-file-atomic "^2.3.0"
16031603

1604-
"@lukeed/csprng@^1.0.0":
1605-
version "1.0.0"
1606-
resolved "https://registry.yarnpkg.com/@lukeed/csprng/-/csprng-1.0.0.tgz#733a122382749d27e2e46ec38f8c71c9d53a9636"
1607-
integrity sha512-ruuGHsnabmObBdeMg3vKdGRmh06Oog3eFpf/Tk6X0kDSJDpJTDCj2dqdp1+0VjzIUgHlFF9GBm7uFqfYhhdX9g==
1608-
1609-
"@lukeed/uuid@^2.0.0":
1610-
version "2.0.0"
1611-
resolved "https://registry.yarnpkg.com/@lukeed/uuid/-/uuid-2.0.0.tgz#1c0f33c071cb6902bc3b9e475782ada7314ef9bd"
1612-
integrity sha512-dUz8OmYvlY5A9wXaroHIMSPASpSYRLCqbPvxGSyHguhtTQIy24lC+EGxQlwv71AhRCO55WOtgwhzQLpw27JaJQ==
1613-
dependencies:
1614-
"@lukeed/csprng" "^1.0.0"
1615-
16161604
"@mrmlnc/readdir-enhanced@^2.2.1":
16171605
version "2.2.1"
16181606
resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -2210,16 +2198,17 @@
22102198
next-tick "^0.2.2"
22112199
script-onload "^1.0.2"
22122200

2213-
"@segment/localstorage-retry@^1.2.5":
2214-
version "1.2.5"
2215-
resolved "https://registry.yarnpkg.com/@segment/localstorage-retry/-/localstorage-retry-1.2.5.tgz#6e378160d0c9d02d4e0d17cea9cb200f36e26f19"
2216-
integrity sha512-wQ9HxNsEcWNotrBImO7fHTPThWg7lnymmdMqhnT2z6jCiNqHmDeK0ivnh+klomXI8AwAX4OpI0BO5cfNIS5nCw==
2201+
"@segment/localstorage-retry@^1.2.2":
2202+
version "1.2.2"
2203+
resolved "https://registry.yarnpkg.com/@segment/localstorage-retry/-/localstorage-retry-1.2.2.tgz#d141fab7212fd3efb0ee19bf7eb16b1e38930af3"
2204+
integrity sha1-0UH6tyEv0++w7hm/frFrHjiTCvM=
22172205
dependencies:
2218-
"@lukeed/uuid" "^2.0.0"
22192206
"@ndhoule/each" "^2.0.1"
22202207
"@ndhoule/keys" "^2.0.0"
22212208
component-emitter "^1.2.1"
22222209
debug "^0.7.4"
2210+
json3 "^3.3.2"
2211+
uuid "^3.0.1"
22232212

22242213
"@segment/prevent-default@^1.0.0":
22252214
version "1.0.0"
@@ -2241,15 +2230,6 @@
22412230
json3 "^3.3.2"
22422231
jsonp "^0.2.0"
22432232

2244-
"@segment/send-json@^4.0.2":
2245-
version "4.0.2"
2246-
resolved "https://registry.yarnpkg.com/@segment/send-json/-/send-json-4.0.2.tgz#69dc4d320be6a6c7c904b44568b33b79ab293620"
2247-
integrity sha512-HFNr6FB+mvBDC+ZcQCMblOuaLE+b0D7mk5hgkIhcun2+S0AucL0HsD50P6PnncZrinc7AXHIoAcfWLn8FEPtlg==
2248-
dependencies:
2249-
"@segment/base64-encode" "^2.0.2"
2250-
has-cors "^1.1.0"
2251-
jsonp "^0.2.0"
2252-
22532233
"@segment/spy@^1.0.0":
22542234
version "1.1.0"
22552235
resolved "https://registry.yarnpkg.com/@segment/spy/-/spy-1.1.0.tgz#6cd35fe699a8c02a9b1718d0aad28bce6bc89404"

0 commit comments

Comments
 (0)