diff --git a/.circleci/config.yml b/.circleci/config.yml index d055b0f74..34070f725 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,11 +35,11 @@ commands: default: false steps: - checkout + - run: chmod -R 777 ~/repo - restore_cache: keys: - - v1-dependencies-{{ arch }}-{{ checksum "package.json" }} - - v1-dependencies-{{ arch }} - + - v2-dependencies-{{ arch }}-{{ checksum "package.json" }} + - v2-dependencies-{{ arch }} - run: << parameters.sudo >> apt-get -y update - run: << parameters.sudo >> apt-get -y install libusb-1.0-0 - when: @@ -55,8 +55,9 @@ jobs: - pre: sudo: 'sudo' - run: yarn dist --linux + - run: chmod -R 777 ~/repo - save_cache: - key: v1-dependencies-{{ arch }}-{{ checksum "package.json" }} + key: v2-dependencies-{{ arch }}-{{ checksum "package.json" }} paths: - node_modules build_win: @@ -66,7 +67,7 @@ jobs: windows: true - run: yarn dist --win --x64 --ia32 - save_cache: - key: v1-dependencies-{{ arch }}-{{ checksum "package.json" }} + key: v2-dependencies-{{ arch }}-{{ checksum "package.json" }} paths: - node_modules build_mac: @@ -75,12 +76,12 @@ jobs: - checkout - restore_cache: keys: - - v1-dependencies-{{ arch }}-{{ checksum "package.json" }} - - v1-dependencies-{{ arch }} + - v2-dependencies-{{ arch }}-{{ checksum "package.json" }} + - v2-dependencies-{{ arch }} - run: yarn - run: yarn dist --mac - save_cache: - key: v1-dependencies-{{ arch }}-{{ checksum "package.json" }} + key: v2-dependencies-{{ arch }}-{{ checksum "package.json" }} paths: - node_modules test: @@ -121,8 +122,8 @@ jobs: - checkout - restore_cache: keys: - - v1-dependencies-{{ arch }}-{{ checksum "package.json" }} - - v1-dependencies-{{ arch }} + - v2-dependencies-{{ arch }}-{{ checksum "package.json" }} + - v2-dependencies-{{ arch }} - run: yarn - run: yarn release:mac - persist_to_workspace: diff --git a/.eslintrc.json b/.eslintrc.json index 87ffdc466..ae2aba6fc 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -21,6 +21,7 @@ "endOfLine": "auto" } ], + "react/state-in-constructor": "off", "react/jsx-props-no-spreading": "off", "react/static-property-placement": "off", "consistent-return": "off", @@ -39,12 +40,7 @@ "import/no-extraneous-dependencies": [ "error", { - "devDependencies": [ - "__mocks__/**/*.js", - "__tests__/**/*.js", - "config/**/*.js", - "scripts/**/*.js" - ] + "devDependencies": ["__mocks__/**/*.js", "__tests__/**/*.js", "config/**/*.js", "scripts/**/*.js"] } ], "import/order": [ diff --git a/package.json b/package.json index 01c560cdd..c33d799ca 100644 --- a/package.json +++ b/package.json @@ -110,8 +110,8 @@ "electron-webpack": "1.13.0", "enzyme": "3.9.0", "enzyme-adapter-react-16": "1.13.2", - "eslint": "6.1.0", - "eslint-config-airbnb": "18.0.0", + "eslint": "6.2.0", + "eslint-config-airbnb": "18.0.1", "eslint-config-prettier": "6.0.0", "eslint-import-resolver-babel-module": "5.1.0", "eslint-plugin-import": "2.18.2", diff --git a/yarn.lock b/yarn.lock index a7b875bf1..ec6bfb0fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -553,11 +553,16 @@ acorn@^5.0.0, acorn@^5.5.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== -acorn@^6.0.1, acorn@^6.0.7: +acorn@^6.0.1: version "6.2.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz#3ed8422d6dec09e6121cc7a843ca86a330a86b51" integrity sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q== +acorn@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz#26b8d1cd9a9b700350b71c0905546f64d1284e7a" + integrity sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ== + add-dom-event-listener@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310" @@ -4730,10 +4735,10 @@ eslint-config-airbnb-base@^14.0.0: object.assign "^4.1.0" object.entries "^1.1.0" -eslint-config-airbnb@18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-18.0.0.tgz#47a50107484b7776b7541fcac4308abbeee1c102" - integrity sha512-C9p7TGMuefhUWPuiObkfF9pytgAA2293bk1n0h7FdazazHNtzATTGkVv7V0gZt1/FTzdCfwWhjGSbRz/KR89og== +eslint-config-airbnb@18.0.1: + version "18.0.1" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-18.0.1.tgz#a3a74cc29b46413b6096965025381df8fb908559" + integrity sha512-hLb/ccvW4grVhvd6CT83bECacc+s4Z3/AEyWQdIT2KeTsG9dR7nx1gs7Iw4tDmGKozCNHFn4yZmRm3Tgy+XxyQ== dependencies: eslint-config-airbnb-base "^14.0.0" object.assign "^4.1.0" @@ -4855,7 +4860,7 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1: +eslint-utils@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.0.tgz#e2c3c8dba768425f897cf0f9e51fe2e241485d4c" integrity sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ== @@ -4867,10 +4872,15 @@ eslint-visitor-keys@^1.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ== -eslint@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.1.0.tgz#06438a4a278b1d84fb107d24eaaa35471986e646" - integrity sha512-QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ== +eslint-visitor-keys@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" + integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== + +eslint@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.2.0.tgz#4c42c20e3fc03f28db25f34ccba621a9a47e8b56" + integrity sha512-sS0SZwm5UAoI83F+cgdomz0cBNPs+AnRvEboNYeWvrZ8UcDHCu/5muocwoDL2TkHq9skkP0GvZjmwI8HG7S3sw== dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.10.0" @@ -4879,9 +4889,9 @@ eslint@6.1.0: debug "^4.0.1" doctrine "^3.0.0" eslint-scope "^5.0.0" - eslint-utils "^1.3.1" - eslint-visitor-keys "^1.0.0" - espree "^6.0.0" + eslint-utils "^1.4.0" + eslint-visitor-keys "^1.1.0" + espree "^6.1.0" esquery "^1.0.1" esutils "^2.0.2" file-entry-cache "^5.0.1" @@ -4910,14 +4920,14 @@ eslint@6.1.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6" - integrity sha512-lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q== +espree@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.0.tgz#a1e8aa65bf29a331d70351ed814a80e7534e0884" + integrity sha512-boA7CHRLlVWUSg3iL5Kmlt/xT3Q+sXnKoRYYzj1YeM10A76TEJBbotV5pKbnK42hEUIr121zTv+QLRM5LsCPXQ== dependencies: - acorn "^6.0.7" + acorn "^7.0.0" acorn-jsx "^5.0.0" - eslint-visitor-keys "^1.0.0" + eslint-visitor-keys "^1.1.0" esprima@3.x.x, esprima@^3.1.3, esprima@~3.1.0: version "3.1.3"