Merge branch 'master' into muxable-master

nicolas-van · Aug 24, 2021 · 5e6139e · 5e6139e
2 parents 0ce7bcd + 53d4b67
commit 5e6139e
Show file tree

Hide file tree

Showing 9 changed files with 21,374 additions and 6,120 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -3,11 +3,7 @@
 
 name: Node.js CI
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: ["push", "pull_request"]
 
 jobs:
   build:
@@ -16,12 +12,12 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
     - uses: actions/checkout@v2
-    - run: sudo apt install gfortran
-    - run: cd reference && make && cd ..
+#    - run: sudo apt install gfortran
+#    - run: cd reference && make && cd ..
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
       - run: sudo apt install gfortran
       - run: cd reference && make && cd ..
       - run: npm ci
@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm run build

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -1,6 +1,9 @@
 name: website
 
-on: push
+
+on:
+  push:
+    branches: [ master ]
 
 jobs:
   publish:
@@ -11,7 +14,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm run website-build

diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@
 /dist
 /public
 /.cache
+/.parcel-cache
diff --git a/demo/index.html b/demo/index.html
@@ -79,6 +79,6 @@ <h2>EGM96 to Ellipsoid</h2>
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.1/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
-    <script src="./index.js"></script>
+    <script type="module" src="./index.js"></script>
   </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ @@
     /dist
     /public
     /.cache
+    /.parcel-cache