Merge pull request #991 from duncdrum/node14-eol

Node14 eol
eXist-db · May 10, 2023 · 34a5e1c · 34a5e1c
2 parents 4106221 + 7bd892e
commit 34a5e1c
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 25 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false    
       matrix:
-        node-version: ['14', '16', '18']
+        node-version: ['18', '20']
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}

diff --git a/generators/app/templates/Dockerfile b/generators/app/templates/Dockerfile
@@ -1,3 +1,3 @@
-FROM existdb/existdb:<%- dockertag %>
+FROM duncdrum/existdb:<%- dockertag %>
 
 COPY build/<%- title %>-<%- version %>.xar /exist/autodeploy
diff --git a/generators/app/templates/ci/.travis.yml b/generators/app/templates/ci/.travis.yml
@@ -7,7 +7,7 @@ dist: bionic
 
 node_js:
   - "node"
-  - "14"
+  - "18"
 
 jdk:
   - openjdk8

diff --git a/generators/app/templates/ci/exist.yml b/generators/app/templates/ci/exist.yml
@@ -10,10 +10,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+       fail-fast: false
        matrix:
          exist-version: [latest, release]
-         java-version: [8]
-         node-version: ['14', '16']
+         java-version: [8, 17]
+         node-version: ['18', '20']
+         exclude:
+           - exist-version: release
+             java-version: 17
+           - exist-version: latest
+             java-version: 8
     # TODO: see #563 could still be usefull for gulp builds 
     # services:
     #   # Label used to access the service container
@@ -84,7 +90,7 @@ jobs:
   #     - name: Setup Node.js
   #       uses: actions/setup-node@v2
   #       with:
-  #         node-version: 14
+  #         node-version: 18
   #         cache: 'npm'
   #     - name: Install dependencies
   #       run: npm ci

diff --git a/generators/app/templates/expath-pkg.xml b/generators/app/templates/expath-pkg.xml
@@ -2,6 +2,6 @@
 <package xmlns="http://expath.org/ns/pkg" name="<%- defuri %>/<%- defcoll %>/<%- short %>"
   abbrev="<%- short %>" version="<%- version %>" spec="1.0">
     <title><%- desc %></title>
-    <dependency processor="http://exist-db.org" semver-min="5.3.0"/>
+    <dependency processor="http://exist-db.org" semver-min="6.2.0"/>
     <%_ if (apptype !== 'empty') { %><dependency package="http://exist-db.org/html-templating" semver-min="1.0.2"/><% } -%>
 </package>
diff --git a/generators/app/templates/github/readme.md b/generators/app/templates/github/readme.md
@@ -14,11 +14,11 @@
 
 ## Requirements
 
-*   [exist-db](http://exist-db.org/exist/apps/homepage/index.html) version: `5.3` or greater
+*   [exist-db](http://exist-db.org/exist/apps/homepage/index.html) version: `6.2` or greater
 
 *   [ant](http://ant.apache.org) version: `1.10.12` \(for building from source\)
 <% if (apptype == 'exist-design' || 'plain') { %>
-*   [node](http://nodejs.org) version: `14.x` \(for building from source\)
+*   [node](http://nodejs.org) version: `18.x` \(for building from source\)
 <% } %>    
 
 ## Installation

diff --git a/generators/app/templates/specs/xqs/xqSuite.js b/generators/app/templates/specs/xqs/xqSuite.js
@@ -51,7 +51,7 @@ http.get(url, (res) => {
       // see https://mochajs.org/api/mocha#unloadFiles
       let suiteRun = mochaInstance.cleanReferencesAfterRun(true).run()
       process.on('exit', () => {
-        process.exit(suiteRun.stats.failures > 0)
+        if (suiteRun.stats.failures > 0) { process.exit(1) } else { process.exit(0) }
       })
     }
     else {

diff --git a/generators/app/templates/styles/exist-2.2.css b/generators/app/templates/styles/exist-2.2.css
@@ -1,6 +1,6 @@
 @charset "utf-8";
 
-@import "bootstrap.min.css";
+@import url("bootstrap.min.css");
 
 /* ---------------------------------------- FONTS ---------------------------------------- */
 @font-face {
@@ -203,7 +203,7 @@ body {
   margin: 0 auto 30px;
 }
 
-@media (min-width: 767px) {
+@media (width >= 767px) {
   #grey-top {
     background: #f3f3f3;
     height: 100%;
@@ -226,7 +226,7 @@ body {
   }
 }
 
-@media (max-width: 767px) {
+@media (width <= 767px) {
   #grey-top {
     background: #f3f3f3;
     height: 100%;
@@ -325,7 +325,7 @@ body {
   display: none;
 }
 
-@media (max-width: 767px) {
+@media (width <= 767px) {
   .navbar-default {
     height: auto;
     margin-bottom: 20px;
@@ -360,7 +360,7 @@ body {
   }
 }
 
-@media (min-width: 767px) {
+@media (width >= 767px) {
   .navbar .nav li.dropdown.open > .dropdown-toggle {
     background-color: transparent;
     color: #ffcb05;
@@ -407,7 +407,7 @@ body {
   display: none;
 }
 
-@media (min-width: 992px) {
+@media (width >= 992px) {
   .navbar li#about {
     display: inline-block;
   }

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/mock_xqs.js b/test/mock_xqs.js
@@ -54,7 +54,7 @@ function xqsMock (mockRun) {
   // see https://mochajs.org/api/mocha#unloadFiles
   const suiteRun = mochaInstance.cleanReferencesAfterRun(true).run()
   process.on('exit', () => {
-    process.exit(suiteRun.stats.failures > 0)
+    if (suiteRun.stats.failures > 0) { process.exit(1) } else { process.exit(0) }
   })
 
   // TODO: mark %pending xqstests as pending in mocha report