Skip to content

Commit 45d1cbf

Browse files
authored
Merge pull request #144 from open-source-labs/dev
dev into master
2 parents 1f2a808 + 2340dc7 commit 45d1cbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2833
-1121
lines changed

.eslintrc

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"extends": ["airbnb", "plugin:jest/recommended"],
33
"root": true,
4-
"plugins": ["jest"],
4+
"plugins": ["jest", "react"],
5+
"rules": {
6+
"arrow-parens": [2, "as-needed"],
7+
"import/no-unresolved": "off",
8+
"import/extensions": "off"
9+
},
510
"env": {
11+
"es6": true,
612
"jest/globals": true,
713
"browser": true,
814
"webextensions": true
915
},
1016
"globals": {
17+
"Atomics": "readonly",
18+
"SharedArrayBuffer": "readonly",
1119
"fetch": false
1220
},
13-
"rules": {
14-
"arrow-parens": [2, "as-needed"]
21+
"parserOptions": {
22+
"ecmaFeatures": {
23+
"jsx": true
24+
},
25+
"ecmaVersion": 2018,
26+
"sourceType": "module"
1527
}
16-
}
28+
}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ coverage
88
src/extension/build.zip
99
src/extension/build.crx
1010
src/extension/build/key.pem
11+
bower_components
12+
package/__tests__/astParser.test.js

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM node:10.16.2
2-
WORKDIR /usr/src/app
2+
WORKDIR /usr/src/app
33
COPY package*.json ./
44
RUN npm i

assets/reactime with website svg.svg

Lines changed: 38 additions & 0 deletions
Loading

assets/readme-logo-svg.svg

Lines changed: 38 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)