Merge pull request #4 from medayo/resolvePackageJSONConflicts

Resolve package json conflicts

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/node-js-ci.yml

@@ -0,0 +1,41 @@
+name: node-js-ci
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ${{matrix.os}}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        node-version: [12.x, 14.x, 15.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Test
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - run: npm install
+      - run: npm test

package.json

@@ -50,23 +50,23 @@
   },
   "devDependencies": {
     "regenerator-runtime": "^0.13.7",
-    "chai": "^4.2.0",
-    "chai-datetime": "^1.5.0",
-    "eslint": "^6.8.0",
-    "fake-indexeddb": "^3.0.0",
-    "karma": "^5.0.1",
+    "chai": "^4.3.0",
+    "chai-datetime": "^1.8.0",
+    "eslint": "^7.20.0",
+    "fake-indexeddb": "^3.1.2",
+    "karma": "^6.1.1",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.0",
-    "karma-firefox-launcher": "^1.3.0",
-    "karma-mocha": "^1.3.0",
+    "karma-firefox-launcher": "^2.1.0",
+    "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
-    "karma-summary-reporter": "^1.7.2",
-    "meow": "^6.1.0",
-    "mocha": "^7.1.1",
-    "nyc": "^15.0.1",
+    "karma-summary-reporter": "^2.0.0",
+    "meow": "^9.0.0",
+    "mocha": "^8.3.0",
+    "nyc": "^15.1.0",
     "parcel-bundler": "^1.12.4",
-    "pretty-bytes": "^5.3.0",
-    "release-it": "^13.5.2",
+    "pretty-bytes": "^5.5.0",
+    "release-it": "^14.4.1",
     "run.env": "^1.1.0",
     "unused-filename": "^2.1.0",
     "walk": "^2.3.14"