Skip to content

Commit 7f4d37f

Browse files
kelsonpwkelsonpw
committed
AMP-32165 get all files to pass prettier and eslint
1 parent bcd30d4 commit 7f4d37f

File tree

11 files changed

+95
-186
lines changed

11 files changed

+95
-186
lines changed

‎.eslintrc.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": ["eslint:recommended", "plugin:prettier/recommended"],
33
"plugins": ["prettier", "@amplitude/eslint-plugin-amplitude"],
4-
"env": { "es6": true, "browser": true, "node": true },
4+
"env": { "es6": true, "browser": true, "node": true, "mocha": true },
55
"parserOptions": {
66
"sourceType": "module",
77
"ecmaVersion": 2018
@@ -14,6 +14,13 @@
1414
"BUILD_COMPAT_REACT_NATIVE": "readonly",
1515
"BUILD_COMPAT_LOCAL_STORAGE": "readonly",
1616
"BUILD_COMPAT_SNIPPET": "readonly",
17-
"BUILD_COMPAT_2_0": "readonly"
17+
"BUILD_COMPAT_2_0": "readonly",
18+
"assert": "readonly",
19+
"expect": "readonly",
20+
"should": "readonly",
21+
"define": "readonly",
22+
"amplitude": "readonly",
23+
"opera": "readonly",
24+
"ActiveXObject": "readonly"
1825
}
1926
}

‎.vscode/settings.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"editor.codeActionsOnSave": {
3+
"source.fixAll": true
4+
},
5+
"editor.defaultFormatter": "esbenp.prettier-vscode",
6+
"editor.formatOnType": true,
7+
"editor.formatOnPaste": false,
8+
"editor.formatOnSave": true,
9+
"editor.rulers": [120],
10+
"editor.tabSize": 2,
11+
"files.autoSave": "onWindowChange",
12+
"files.trimTrailingWhitespace": true,
13+
"files.insertFinalNewline": true,
14+
"search.exclude": {
15+
"**/node_modules/": true,
16+
"**/build/": true,
17+
"**/dist/": true
18+
},
19+
"[json]": {
20+
"editor.formatOnType": false,
21+
"editor.formatOnPaste": false,
22+
"editor.formatOnSave": false
23+
}
24+
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373
"docs:deploy": "cd website/ && yarn deploy",
7474
"lint": "yarn run lint:prettier && yarn run lint:eslint",
7575
"lint:prettier": "prettier --check \"{src,test,scripts}/**/*.js\"",
76-
"lint:eslint": "eslint 'src/**/*.js'",
76+
"lint:eslint": "eslint \"{src,test,scripts}/**/*.js\"",
7777
"fix": "yarn run fix:eslint && yarn run fix:prettier",
7878
"fix:prettier": "prettier --write \"{src,test,scripts}/**/*.js\"",
79-
"fix:eslint": "eslint --fix 'src/**/*.js'"
79+
"fix:eslint": "eslint --fix \"{src,test,scripts}/**/*.js\""
8080
},
8181
"bugs": {
8282
"url": "https://github.com/amplitude/amplitude-javascript/issues"

‎scripts/version.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const fs = require('fs');
22
const path = require('path');
33
const { version } = require('../package');
4-
const { format } = require('date-fns');
54
const crypto = require('crypto');
65

76
const cwd = process.cwd();
@@ -33,7 +32,7 @@ const sdkText = fs.readFileSync(path.join('.', `amplitude.min.js`), 'utf-8');
3332
const hash = crypto.createHash('sha384').update(sdkText).digest('base64');
3433
replaceTextInFile(
3534
path.join('src', 'amplitude-snippet.js'),
36-
/as.integrity = 'sha384-[a-zA-Z0-9+\/]+';/,
35+
/as.integrity = 'sha384-[a-zA-Z0-9+/]+';/,
3736
`as.integrity = 'sha384-${hash}';`,
3837
);
3938

‎test/amplitude-client.js‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
import sinon from 'sinon';
22
import AmplitudeClient from '../src/amplitude-client.js';
3-
import getUtmData from '../src/utm.js';
4-
import Cookie from '../src/cookie';
53
import MetadataStorage from '../src/metadata-storage';
64
import localStorage from '../src/localstorage.js';
7-
import CookieStorage from '../src/cookiestorage.js';
85
import baseCookie from '../src/base-cookie.js';
96
import Base64 from '../src/base64.js';
107
import cookie from '../src/cookie.js';
118
import utils from '../src/utils.js';
129
import queryString from 'query-string';
1310
import Identify from '../src/identify.js';
14-
import Revenue from '../src/revenue.js';
1511
import constants from '../src/constants.js';
1612
import { mockCookie, restoreCookie, getCookie } from './mock-cookie';
1713

@@ -121,10 +117,10 @@ describe('AmplitudeClient', function () {
121117
let onInitCalled = false;
122118
let onInit2Called = false;
123119
amplitude.onInit(() => {
124-
onInitCalled = true;
120+
onInitCalled = true; /* eslint-disable-line no-unused-vars */
125121
});
126122
amplitude.onInit(() => {
127-
onInit2Called = true;
123+
onInit2Called = true; /* eslint-disable-line no-unused-vars */
128124
});
129125

130126
amplitude.init(apiKey);
@@ -151,7 +147,6 @@ describe('AmplitudeClient', function () {
151147
});
152148

153149
it('should accept numerical userIds', function () {
154-
const userId = 5;
155150
amplitude.init(apiKey, 5);
156151
assert.equal(amplitude.options.userId, '5');
157152
});
@@ -291,8 +286,6 @@ describe('AmplitudeClient', function () {
291286
});
292287

293288
it('should load device id from the cookie', function () {
294-
var now = new Date().getTime();
295-
296289
// deviceId and sequenceNumber not set, init should load value from localStorage
297290
var cookieData = {
298291
deviceId: 'current_device_id',
@@ -1652,7 +1645,7 @@ describe('AmplitudeClient', function () {
16521645
server.respond();
16531646

16541647
assert.lengthOf(server.requests, 2);
1655-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1648+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
16561649
assert.lengthOf(events, 6);
16571650
assert.deepEqual(events[0].event_properties, { index: 10 });
16581651
assert.deepEqual(events[5].event_properties, { index: 100 });
@@ -1690,7 +1683,7 @@ describe('AmplitudeClient', function () {
16901683
server.respondWith('success');
16911684
server.respond();
16921685
assert.lengthOf(amplitude._unsentEvents, 0);
1693-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1686+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
16941687
assert.lengthOf(events, 5);
16951688
assert.deepEqual(events[4].event_properties, { index: 14 });
16961689
});
@@ -1798,7 +1791,7 @@ describe('AmplitudeClient', function () {
17981791
server.respond();
17991792

18001793
assert.lengthOf(server.requests, 2);
1801-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1794+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
18021795
assert.lengthOf(events, 5);
18031796
assert.deepEqual(events[0].event_properties, { index: 0 });
18041797
assert.deepEqual(events[4].event_properties, { index: 4 });
@@ -1808,13 +1801,13 @@ describe('AmplitudeClient', function () {
18081801
amplitude.init(apiKey, null, { uploadBatchSize: 9 });
18091802

18101803
amplitude._sending = true;
1811-
for (var i = 0; i < 10; i++) {
1804+
for (let i = 0; i < 10; i++) {
18121805
amplitude.logEvent('Event', { index: i });
18131806
}
18141807
amplitude._sending = false;
18151808
amplitude.logEvent('Event', { index: 100 });
18161809

1817-
for (var i = 0; i < 6; i++) {
1810+
for (let i = 0; i < 6; i++) {
18181811
assert.lengthOf(server.requests, i + 1);
18191812
server.respondWith([413, {}, '']);
18201813
server.respond();
@@ -1985,7 +1978,7 @@ describe('AmplitudeClient', function () {
19851978

19861979
// after sending first backoff batch, callback still should not have fired
19871980
assert.lengthOf(server.requests, 2);
1988-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1981+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
19891982
assert.lengthOf(events, 8);
19901983
server.respondWith('success');
19911984
server.respond();
@@ -1995,7 +1988,7 @@ describe('AmplitudeClient', function () {
19951988

19961989
// after sending second backoff batch, callback should fire
19971990
assert.lengthOf(server.requests, 3);
1998-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1991+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
19991992
assert.lengthOf(events, 8);
20001993
server.respondWith('success');
20011994
server.respond();
@@ -2741,7 +2734,7 @@ describe('AmplitudeClient', function () {
27412734

27422735
amplitude.logEvent('UTM Test Event', {});
27432736
assert.lengthOf(server.requests, 2);
2744-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
2737+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
27452738
assert.deepEqual(events[0].user_properties, {});
27462739
});
27472740

@@ -3545,7 +3538,6 @@ describe('AmplitudeClient', function () {
35453538

35463539
it('should let user override sessionId with setSessionId', function () {
35473540
var amplitude2 = new AmplitudeClient();
3548-
var cookieStorage = new CookieStorage().getStorage();
35493541

35503542
// set up initial session
35513543
var sessionId = 1000;

‎test/amplitude.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ describe('Amplitude', function () {
10441044
server.respond();
10451045

10461046
assert.lengthOf(server.requests, 2);
1047-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1047+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
10481048
assert.lengthOf(events, 6);
10491049
assert.deepEqual(events[0].event_properties, { index: 10 });
10501050
assert.deepEqual(events[5].event_properties, { index: 100 });
@@ -1082,7 +1082,7 @@ describe('Amplitude', function () {
10821082
server.respondWith('success');
10831083
server.respond();
10841084
assert.lengthOf(amplitude.getInstance()._unsentEvents, 0);
1085-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1085+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
10861086
assert.lengthOf(events, 5);
10871087
assert.deepEqual(events[4].event_properties, { index: 14 });
10881088
});
@@ -1190,7 +1190,7 @@ describe('Amplitude', function () {
11901190
server.respond();
11911191

11921192
assert.lengthOf(server.requests, 2);
1193-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1193+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
11941194
assert.lengthOf(events, 5);
11951195
assert.deepEqual(events[0].event_properties, { index: 0 });
11961196
assert.deepEqual(events[4].event_properties, { index: 4 });
@@ -1200,13 +1200,13 @@ describe('Amplitude', function () {
12001200
amplitude.init(apiKey, null, { uploadBatchSize: 9 });
12011201

12021202
amplitude.getInstance()._sending = true;
1203-
for (var i = 0; i < 10; i++) {
1203+
for (let i = 0; i < 10; i++) {
12041204
amplitude.logEvent('Event', { index: i });
12051205
}
12061206
amplitude.getInstance()._sending = false;
12071207
amplitude.logEvent('Event', { index: 100 });
12081208

1209-
for (var i = 0; i < 6; i++) {
1209+
for (let i = 0; i < 6; i++) {
12101210
assert.lengthOf(server.requests, i + 1);
12111211
server.respondWith([413, {}, '']);
12121212
server.respond();
@@ -1377,7 +1377,7 @@ describe('Amplitude', function () {
13771377

13781378
// after sending first backoff batch, callback still should not have fired
13791379
assert.lengthOf(server.requests, 2);
1380-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1380+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
13811381
assert.lengthOf(events, 8);
13821382
server.respondWith('success');
13831383
server.respond();
@@ -1387,7 +1387,7 @@ describe('Amplitude', function () {
13871387

13881388
// after sending second backoff batch, callback should fire
13891389
assert.lengthOf(server.requests, 3);
1390-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1390+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
13911391
assert.lengthOf(events, 8);
13921392
server.respondWith('success');
13931393
server.respond();
@@ -1992,7 +1992,7 @@ describe('Amplitude', function () {
19921992

19931993
amplitude.logEvent('UTM Test Event', {});
19941994
assert.lengthOf(server.requests, 2);
1995-
var events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
1995+
events = JSON.parse(queryString.parse(server.requests[1].requestBody).e);
19961996
assert.deepEqual(events[0].user_properties, {});
19971997
});
19981998
});

0 commit comments

Comments
 (0)