Update to latest Metalsmith Layouts plugin (#476)

playcanvas · Feb 14, 2023 · d4c9829 · d4c9829
1 parent 4481921
commit d4c9829
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 111 deletions.
diff --git a/build.js b/build.js
@@ -148,7 +148,9 @@ Metalsmith(__dirname)
  partialName: 'shader-editor-navigation'
  }))
  .use(tutorials('tutorials')())
- .use(layouts())
+ .use(layouts({
+ pattern: '**/*.html'
+ }))
  .use(locale()())
  .use(i18nout()({
  data: localization

diff --git a/lib/i18n/index.js b/lib/i18n/index.js
@@ -47,12 +47,7 @@ module.exports = function makePlugin() {
 
  return function (files, metalsmith, done) {
  for (const filename in files) {
- // add locale metadata to files
-
- // Ensure Windows paths are converted to forward slashes as necessary
- const filenameForwardSlashes = filename.replace(/\\/g, "/");
-
- const locale = filenameForwardSlashes.split("/")[0];
+ const locale = filename.split(path.sep)[0];
  files[filename].locale = locale; // locale: 'en'
  files[filename][locale] = true; // 'en': true
  }

diff --git a/lib/tutorials/index.js b/lib/tutorials/index.js
@@ -204,7 +204,11 @@ module.exports = function makePlugin(dir) {
  contents: Buffer.from(taggedProjectTemplate(project))
  };
 
- files[file.path + '/index.html'] = file;
+ // change path separators to OS specific
+ let fileKey = file.path + '/index.html';
+ fileKey = fileKey.split('/').join(path.sep);
+
+ files[fileKey] = file;
  }
  }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
  }
  },
  "devDependencies": {
- "@metalsmith/layouts": "2.4.0",
+ "@metalsmith/layouts": "^2.6.0",
  "@metalsmith/markdown": "^1.9.0",
  "@metalsmith/permalinks": "2.4.1",
  "@playcanvas/eslint-config": "^1.3.0",