Update deps and minimum node 14

HMPO · Apr 27, 2023 · d788021 · d788021
1 parent f729a84
commit d788021
Show file tree

Hide file tree

Showing 4 changed files with 659 additions and 531 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x, 18.x]
+        node-version: [14.x, 16.x, 18.x, 20.x]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/lib/backends/fs.js b/lib/backends/fs.js
@@ -1,6 +1,6 @@
 /* istanbul ignore file */
 
-var glob = require('glob'),
+var glob = require('glob').glob,
     yaml = require('js-yaml'),
     path = require('path'),
     fs = require('fs'),
@@ -46,13 +46,13 @@ module.exports = {
 
     var glb = options.path
       .replace('__lng__', '+([a-zA-Z_-])')
-      .replace('__ns__', '+(+([a-zA-Z_.-]))')
+      .replace('__ns__', '+(+([a-zA-Z_-])*(.)+([a-zA-Z_-]))')
       .replace('__ext__', '@(json|yml|yaml)');
     var rgx = options.path
       .replace(/\\/g, '\\\\') // Windows hack, noop for unix file paths
       .replace(/\./g, '\\.')
       .replace('__lng__', '([a-zA-Z_-]+)')
-      .replace('__ns__', '([a-zA-Z_.-]+)')
+      .replace('__ns__', '([a-zA-Z_.-]+[a-zA-Z_]+)')
       .replace('__ext__', '(json|yml|yaml|__ext__)');
     rgx = new RegExp(rgx);
 
@@ -84,14 +84,20 @@ module.exports = {
       });
     }
 
+    function sortFiles(a, b) {
+      if (a.lng !== b.lng) return a.lng < b.lng ? -1 : 1;
+      if (a.ns !== b.ns) return (a.ns === 'default' || a.ns < b.ns) ? -1 : 1;
+      if (a.ext !== b.ext) return a.ext < b.ext ? -1 : 1;
+      return 0;
+    }
 
     var files = [];
 
     function findFiles(done) {
       async.forEachSeries(dirs, function(dir, done) {
         var filePath = path.resolve(dir, glb);
-        glob(filePath, function (err, filenames) {
-          if (err) return done(err);
+        glob(filePath).catch(done).then(function (filenames) {
+          var dirFiles = [];
           filenames.forEach(function (filename) {
             filename = path.normalize(filename);
             var parts = filename.match(rgx).slice(1);
@@ -102,9 +108,14 @@ module.exports = {
 
             if (lng && ns) {
               filename = path.resolve(dir, filename);
-              files.push({ filename, lng, ns, ext });
+              dirFiles.push({ filename, dir, lng, ns, ext });
             }
           });
+
+          dirFiles.sort(sortFiles);
+
+          files = files.concat(dirFiles);
+
           done();
         });
       }, done);
@@ -114,6 +125,7 @@ module.exports = {
     var datastore = {};
 
     function readFiles(done) {
+      console.log('SORTED FILES', files.map(f => f.filename));
       datastore = {};
       async.forEachSeries(files, function(file, done) {