@internetarchive/bookreader 5.0.0-35 → 5.0.0-38

package/.eslintrc.js

@@ -47,15 +47,5 @@ module.exports = {
     "prefer-const": ["error"],
     "space-infix-ops": ["error", { "int32Hint": false }],
     "eol-last": ["error", "always"]
-  },
-  "overrides": [
-    { // TODO; these should be cleaned up as well
-      "files": [
-        "src/BookReader.js"
-      ],
-      "rules": {
-        "no-var": ["off"],
-      }
-    },
-  ],
+  }
 };

package/.github/workflows/node.js.yml

@@ -10,28 +10,90 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
+  install:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1
       with:
-        node-version: 14.x
-    - uses: actions/cache@v2
+        node-version: 16.x
+    - name: Cache node_modules
+      uses: actions/cache@v2
+      id: cache
       with:
         # Caching node_modules isn't recommended because it can break across
         # Node versions and won't work with npm ci (See https://github.com/actions/cache/blob/main/examples.md#node---npm )
-        # But we pin the node version, and we don't update it that often anyways. And 
+        # But we pin the node version, and we don't update it that often anyways. And
         # we don't use `npm ci` specifically to try to get faster CI flows. So caching
         # `node_modules` directly.
         path: 'node_modules'
-        key: ${{ runner.os }}-node-${{ hashFiles('package*.json') }}
-    - run: npm install
-    - run: npm run build
+        key: ${{ runner.os }}-node-16-${{ hashFiles('package*.json') }}
+    - if: steps.cache.outputs.cache-hit != 'true'
+      run: npm install
+
+  build:
+    needs: install
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 16.x
+    - name: Load node_modules from cache
+      uses: actions/cache@v2
+      with:
+        # Use node_modules from previous jobs
+        path: 'node_modules'
+        key: ${{ runner.os }}-node-16-${{ hashFiles('package*.json') }}
+    - name: Cache BookReader/
+      uses: actions/cache@v2
+      id: build-cache
+      with:
+        # Cache the build files so we don't have to build twice for e2e tests
+        path: 'BookReader'
+        key: ${{ runner.os }}-${{ github.sha }}
+    - if: steps.build-cache.outputs.cache-hit != 'true'
+      run: npm run build
+
+  tests:
+    needs: install
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 16.x
+    - name: Load node_modules from cache
+      uses: actions/cache@v2
+      with:
+        # Use node_modules from previous jobs
+        path: 'node_modules'
+        key: ${{ runner.os }}-node-16-${{ hashFiles('package*.json') }}
     - run: npm run lint
     - run: npm run test
     - run: npm run codecov
+    
+  e2e-tests:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 16.x
+    - name: Load node_modules from cache
+      uses: actions/cache@v2
+      with:
+        # Use node_modules from previous jobs
+        path: 'node_modules'
+        key: ${{ runner.os }}-node-16-${{ hashFiles('package*.json') }}
+    - name: Load BookReader/ from cache
+      uses: actions/cache@v2
+      with:
+        # Cache the build files so we don't have to build twice for e2e tests
+        path: 'BookReader'
+        key: ${{ runner.os }}-${{ github.sha }}
     # Travis machines usually have 2 cores (see https://docs.travis-ci.com/user/reference/overview/#virtualisation-environment-vs-operating-system )
     # Quarantine mode (sigh) to catch unstable tests (see https://devexpress.github.io/testcafe/documentation/guides/basic-guides/run-tests.html#quarantine-mode )
     - run: npx testcafe --concurrency 2 --quarantine-mode

package/.github/workflows/npm-publish.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
       - run: npm ci
       - run: npm test
 
@@ -25,23 +25,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm publish --tag next
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-
-  publish-gpr:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14
-          registry-url: https://npm.pkg.github.com/
-      - run: npm ci
-      - run: npm publish --tag next
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}