Merge pull request #265 from kremalicious/feature/updates

Build and dev updates

.eslintrc

@@ -1,4 +1,15 @@
 {
+  "parser": "@babel/eslint-parser",
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaVersion": 2020,
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "babelOptions": {
+      "configFile": "./babel.config.js"
+    }
+  },
   "extends": [
     "eslint:recommended",
     "plugin:react/recommended",
@@ -6,13 +17,6 @@
     "prettier/react"
   ],
   "plugins": ["react"],
-  "parserOptions": {
-    "ecmaVersion": 2020,
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "jsx": true
-    }
-  },
   "env": {
     "browser": true,
     "es6": true,

.github/dependabot.yml

@@ -1,14 +1,12 @@
 version: 2
 updates:
-- package-ecosystem: npm
+  - package-ecosystem: npm
-  directory: "/site"
+    directory: '/site'
-  schedule:
-    interval: daily
-    time: '04:00'
-  open-pull-requests-limit: 10
-- package-ecosystem: npm
-  directory: "/"
     schedule:
       interval: weekly
       time: '04:00'
-  open-pull-requests-limit: 10
+  - package-ecosystem: npm
+    directory: '/'
+    schedule:
+      interval: monthly
+      time: '04:00'

.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+name: 'CI'
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest]
+        node: ['15', '14']
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+
+      - run: npm ci
+      - run: npm test
+      - run: npm run build
+
+  build:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '15'
+
+      - run: npm ci
+      - run: npm run build:all
+
+  coverage:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+      - run: npm ci
+      - uses: paambaati/codeclimate-action@v2.7.5
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+        with:
+          coverageCommand: npm test

.travis.yml

@@ -1,33 +0,0 @@
-osx_image: xcode11
-os: osx
-language: node_js
-node_js: node
-
-env:
-  global:
-    - ELECTRON_CACHE=$HOME/.cache/electron
-    - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
-
-cache:
-  npm: true
-  directories:
-    - $HOME/.cache/electron
-    - $HOME/.cache/electron-builder
-    - $HOME/.npm/_prebuilds
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-darwin-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
-script:
-  - npm test || travis_terminate 1
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-  - npm run build
-
-branches:
-  except:
-    - "/^v\\d+\\.\\d+\\.\\d+$/"
-
-notifications:
-  email: false

README.md

@@ -5,7 +5,7 @@
   <strong>🐡 Simple Electron-based desktop app to retrieve and display your total <a href="https://oceanprotocol.com">Ocean Token</a> balances.</strong>
 </p>
 <p align="center">
-  <a href="https://travis-ci.com/kremalicious/blowfish"><img src="https://travis-ci.com/kremalicious/blowfish.svg?branch=main" /></a>
+  <a href="https://github.com/kremalicious/blowfish/actions"><img src="https://github.com/kremalicious/blowfish/workflows/CI/badge.svg" /></a>
   <a href="https://codeclimate.com/github/kremalicious/blowfish/maintainability"><img src="https://api.codeclimate.com/v1/badges/beeab7902ee5307fc0a1/maintainability" /></a>
   <a href="https://codeclimate.com/github/kremalicious/blowfish/test_coverage"><img src="https://api.codeclimate.com/v1/badges/beeab7902ee5307fc0a1/test_coverage" /></a>
   <a href="https://dependabot.com"><img src="https://badgen.net/dependabot/thepracticaldev/dev.to?icon=dependabot" /></a>

babel.config.js

@@ -1,4 +1,4 @@
-const { devDependencies } = require('../package.json')
+const { devDependencies } = require('./package.json')
 
 module.exports = {
   presets: [

electron-builder.json

@@ -12,5 +12,6 @@
     "category": "Office",
     "executableName": "Blowfish",
     "artifactName": "${productName}-${version}.${ext}"
-  }
+  },
+  "publish": false
 }

package.json

@@ -6,12 +6,13 @@
   "main": "app/background.js",
   "scripts": {
     "start": "nextron",
-    "build": "nextron build --all",
+    "build": "nextron build",
+    "build:all": "nextron build --all",
     "postinstall": "electron-builder install-app-deps",
     "test": "npm run lint && npm run jest",
     "test:watch": "npm run jest -- --watch",
-    "jest": "NODE_ENV=test jest -c tests/jest.config.js",
+    "jest": "cross-env NODE_ENV=test jest -c tests/jest.config.js",
-    "lint": "eslint --ignore-path .gitignore ./src/**/*.{js,jsx}",
+    "lint": "eslint --ignore-path .gitignore --ext .js --ext .jsx .",
     "format": "prettier --write --ignore-path .gitignore 'src/**/*.{js,jsx,json,css,scss}'",
     "release": "release-it",
     "changelog": "auto-changelog -p"
@@ -26,47 +27,55 @@
   "license": "MIT",
   "dependencies": {
     "@coingecko/cryptoformat": "^0.4.2",
-    "@oceanprotocol/contracts": "^0.5.6",
+    "@oceanprotocol/contracts": "^0.5.8",
     "axios": "^0.21.1",
-    "electron": "^10.1.3",
-    "electron-store": "^6.0.1",
     "ethereum-address": "^0.0.4",
     "ethereum-blockies": "github:MyEtherWallet/blockies",
     "ethjs": "^0.4.0",
-    "ms": "^2.1.2",
+    "ms": "^2.1.3",
-    "next": "9.5.4",
+    "next": "^10.0.6",
-    "nextron": "^5.15.3",
+    "nextron": "^6.0.3",
-    "react": "^16.14.0",
+    "react": "^17.0.1",
-    "react-dom": "^16.14.0",
+    "react-dom": "^17.0.1",
     "react-pose": "^4.0.10",
-    "shortid": "^2.2.15",
+    "shortid": "^2.2.16",
-    "swr": "^0.3.5"
+    "swr": "^0.4.1"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.12.1",
     "@jest-runner/electron": "^3.0.0",
     "@react-mock/state": "^0.1.8",
-    "@svgr/webpack": "^5.4.0",
+    "@svgr/webpack": "^5.5.0",
-    "@testing-library/jest-dom": "^5.11.8",
+    "@testing-library/jest-dom": "^5.11.9",
-    "@testing-library/react": "^11.1.0",
+    "@testing-library/react": "^11.2.3",
     "auto-changelog": "^2.2.1",
-    "babel-jest": "^26.5.2",
+    "babel-jest": "^26.6.3",
+    "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
+    "electron": "10.1.3",
     "electron-builder": "^22.9.1",
-    "electron-serve": "^1.0.0",
+    "electron-serve": "^1.1.0",
-    "eslint": "^7.17.0",
+    "electron-store": "^7.0.0",
-    "eslint-config-prettier": "^7.1.0",
+    "eslint": "^7.18.0",
+    "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-react": "^7.22.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^26.6.3",
-    "prettier": "^2.1.2",
+    "prettier": "^2.2.1",
-    "release-it": "^14.2.0"
+    "release-it": "^14.2.2"
   },
-  "browserslist": "electron >= 10.0",
+  "browserslist": [
+    "electron >= 10.0",
+    ">0.3%",
+    "not ie 11",
+    "not dead",
+    "not op_mini all"
+  ],
   "release-it": {
     "hooks": {
       "after:init": "npm test",
       "after:bump": "npm run changelog",
-      "before:release": "npm run build"
+      "before:release": "npm run build:all"
     },
     "git": {
       "tagName": "v${version}"

src/main/background.js

@@ -50,7 +50,7 @@ const height = 450
   })
 
   if (isProd) {
-    await mainWindow.loadURL('app://./index.html')
+    await mainWindow.loadURL('app://index.html')
   } else {
     const port = process.argv[2]
     await mainWindow.loadURL(`http://localhost:${port}/`)

tests/jest.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   rootDir: '../',
   transform: {
-    '^.+\\.[t|j]sx?$': ['babel-jest', { configFile: './tests/babel.config.js' }]
+    '^.+\\.[t|j]sx?$': ['babel-jest']
   },
   moduleNameMapper: {
     '.+\\.(css|styl|less|sass|scss)$': 'identity-obj-proxy',