7.0.0

.eslintignore

@@ -1,3 +1,2 @@
 src/ui
-src/protocol-validation
 network-canvas

.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:

.gitmodules

@@ -1,9 +1,7 @@
 [submodule "network-canvas"]
 	path = network-canvas
 	url = https://github.com/complexdatacollective/network-canvas.git
-[submodule "src/protocol-validation"]
-	path = src/protocol-validation
-	url = https://github.com/complexdatacollective/protocol-validation.git
+
 [submodule "development-protocol"]
 	path = development-protocol
 	url = https://github.com/complexdatacollective/development-protocol.git

babel.config.js

@@ -1,16 +1,26 @@
 module.exports = {
   presets: [
-    '@babel/preset-env',
-    '@babel/react',
+    ['@babel/preset-env', { 
+      targets: { node: 'current' },
+      modules: 'commonjs'
+    }],
+    '@babel/preset-react',
   ],
   plugins: [
     '@babel/plugin-syntax-import-meta',
-    [
-      '@babel/plugin-proposal-class-properties',
-      {
-        loose: true,
-      },
-    ],
+    ['@babel/plugin-proposal-class-properties', { loose: true }],
+    ['@babel/plugin-transform-private-property-in-object', { loose: true }],
+    ['@babel/plugin-transform-private-methods', { loose: true }],
     '@babel/plugin-proposal-json-strings',
   ],
-};
+  env: {
+    test: {
+      presets: [
+        ['@babel/preset-env', { 
+          targets: { node: 'current' },
+          modules: 'commonjs'
+        }]
+      ]
+    }
+  }
+};

config/jest/automock.js

@@ -7,3 +7,5 @@ jest.mock('archiver');
 jest.mock('decompress');
 jest.mock('electron');
 jest.mock('electron-log');
+jest.mock('mapbox-gl/dist/mapbox-gl-unminified');
+jest.mock('mapbox-gl/dist/mapbox-gl.css', () => {});

config/webpack.config.js

@@ -87,20 +87,25 @@ 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-transform-nullish-coalescing-operator'],
             },
           },
         ],