Merge pull request #843 from complexdatacollective/schema-8

Schema 8

Author: jthrilly

.github/workflows/dist.yml

@@ -9,9 +9,9 @@ on:
 
 jobs:
   dist:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: actions/setup-python@v4
@@ -21,13 +21,13 @@ jobs:
       - name: Update apt cache
         run: sudo apt-get update -y
       # Set node version
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: "14.21.3"
       - name: Set NPM 7
         run: npm install -g npm@8.19.4
       # Cache node_modules
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:

.github/workflows/main.yml

@@ -9,9 +9,9 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: actions/setup-python@v4
@@ -21,13 +21,13 @@ jobs:
       - name: Update apt cache
         run: sudo apt-get update -y
       # Set node version
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: "14.21.3"
       - name: Set NPM 7
         run: npm install -g npm@8.19.4
       # Cache node_modules
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -48,9 +48,9 @@ jobs:
 
   build:
     needs: test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: actions/setup-python@v4
@@ -60,13 +60,13 @@ jobs:
       - name: Update apt cache
         run: sudo apt-get update -y
       # Set node version
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
           node-version: "14.21.3"
       - name: Set NPM 7
         run: npm install -g npm@8.19.4
       # Cache node_modules
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:

config/webpack.config.js

@@ -87,35 +87,29 @@ const loaderRules = Object.freeze([
       // Process JS with Babel.
       {
         test: /\.(js|jsx)$/,
-        include: paths.appSrc,
+        include: [
+          paths.appSrc,
+          /node_modules\/@codaco\/protocol-validation/,
+        ],
         use: [
           {
             loader: require.resolve('thread-loader'),
             options: {
               // In dev, keep workers alive for more effective watch mode
-              poolTimeout: isProduction ? 500 : Infinity,
+              poolTimeout: isProduction ? 500 : Number.POSITIVE_INFINITY,
             },
           },
           {
             loader: require.resolve('babel-loader'),
             options: {
               compact: isProduction,
               cacheDirectory: !isProduction,
+              presets: ['@babel/preset-env'],
+              plugins: ['@babel/plugin-proposal-nullish-coalescing-operator'],
             },
           },
         ],
       },
-      {
-        test: /\.js$/,
-        exclude: /node_modules\/(?!(@codaco\/protocol-validation)\/).*/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            presets: ['@babel/preset-env'],
-            plugins: ['@babel/plugin-proposal-nullish-coalescing-operator'],
-          },
-        },
-      },
       {
         test: /\.woff2?$|\.woff$/,
         use: [{