terraform 1.25.2 → 1.26.1

package/lib/stylesheet/processors/less.js

@@ -53,7 +53,7 @@ exports.compile = function(rootPath, filePath, options, callback){
       paths: dirs,            // Specify search paths for @import directives
       filename: filePath,     // Specify a filename, for better error messages
       compress: false,         // Minify CSS output
-      sourceMap: true
+      sourceMap: { disableSourcemapAnnotation: true } // return map separately, don't embed the /*# sourceMappingURL */ comment
     }, function(e, css){
       if (e) return callback(formatError(e))
       var map = css.map || ""

package/lib/stylesheet/processors/sass.js

@@ -1,4 +1,5 @@
 var sass = require("sass")
+var url  = require("url")
 var TerraformError = require("../../error").TerraformError
 var path  = require("path")
 var fs    = require("fs")
@@ -6,7 +7,7 @@ var fs    = require("fs")
 exports.compile = function(rootPath, filePath, options, callback){
 
   var srcFullPath = path.resolve(rootPath, filePath)
-  
+
   try{
     var fileContents = fs.readFileSync(srcFullPath)
   }catch(e){
@@ -18,28 +19,25 @@ exports.compile = function(rootPath, filePath, options, callback){
     path.dirname(path.resolve(rootPath))
   ]
 
-  sass.render({
-    file: srcFullPath,
-    includePaths: dirs,
-    outputStyle: 'compressed',
-    sourceMap: true,
-    sourceMapEmbed: false,
-    sourceMapContents: true,
-    outFile: filePath,
-    omitSourceMapUrl: true
-  }, function (e, css) {
-    if (e) {
-      var error = new TerraformError ({
-        source: "Sass",
-        dest: "CSS",
-        lineno: e.line || 99,
-        name: "Sass Error",
-        message: e.message,
-        filename: e.file || filePath,
-        stack: fileContents.toString()
-      })
-      return callback(error)
-    }  
-    callback(null, css.css.toString(), css.map.toString())
-  });
+  try{
+    var result = sass.compile(srcFullPath, {
+      loadPaths: dirs,
+      style: 'compressed',
+      sourceMap: true,
+      sourceMapIncludeSources: true
+    })
+  }catch(e){
+    var error = new TerraformError({
+      source: "Sass",
+      dest: "CSS",
+      lineno: (e.span && e.span.start ? e.span.start.line + 1 : null) || 99,
+      name: "Sass Error",
+      message: e.sassMessage || e.message,
+      filename: (e.span && e.span.url ? url.fileURLToPath(e.span.url) : null) || filePath,
+      stack: fileContents.toString()
+    })
+    return callback(error)
+  }
+
+  callback(null, result.css.toString(), JSON.stringify(result.sourceMap))
 }

package/lib/stylesheet/processors/scss.js

@@ -1,4 +1,5 @@
-var scss = require("sass")
+var sass = require("sass")
+var url  = require("url")
 var TerraformError = require("../../error").TerraformError
 var path  = require("path")
 var fs    = require("fs")
@@ -6,7 +7,7 @@ var fs    = require("fs")
 exports.compile = function(rootPath, filePath, options, callback){
 
   var srcFullPath = path.resolve(rootPath, filePath)
-  
+
   try{
     var fileContents = fs.readFileSync(srcFullPath)
   }catch(e){
@@ -18,28 +19,25 @@ exports.compile = function(rootPath, filePath, options, callback){
     path.dirname(path.resolve(rootPath))
   ]
 
-  scss.render({
-    file: srcFullPath,
-    includePaths: dirs,
-    outputStyle: 'compressed',
-    sourceMap: true,
-    sourceMapEmbed: false,
-    sourceMapContents: true,
-    outFile: filePath,
-    omitSourceMapUrl: true
-  }, function (e, css) {
-    if (e) {
-      var error = new TerraformError ({
-        source: "Sass",
-        dest: "CSS",
-        lineno: e.line || 99,
-        name: "Sass Error",
-        message: e.message,
-        filename: e.file || filePath,
-        stack: fileContents.toString()
-      })
-      return callback(error)
-    }
-    callback(null, css.css.toString(), css.map.toString())
-  });
+  try{
+    var result = sass.compile(srcFullPath, {
+      loadPaths: dirs,
+      style: 'compressed',
+      sourceMap: true,
+      sourceMapIncludeSources: true
+    })
+  }catch(e){
+    var error = new TerraformError({
+      source: "Sass",
+      dest: "CSS",
+      lineno: (e.span && e.span.start ? e.span.start.line + 1 : null) || 99,
+      name: "Sass Error",
+      message: e.sassMessage || e.message,
+      filename: (e.span && e.span.url ? url.fileURLToPath(e.span.url) : null) || filePath,
+      stack: fileContents.toString()
+    })
+    return callback(error)
+  }
+
+  callback(null, result.css.toString(), JSON.stringify(result.sourceMap))
 }

package/lib/template/processors/md.js

@@ -1,30 +1,24 @@
 
 var TerraformError = require("../../error").TerraformError
-var marked = require("marked").setOptions({
-  langPrefix: 'language-',
-  headerPrefix: '',
-  gfm: true,
-  tables: true,
-  mangle: false,
-  headerIds: false
-})
-var renderer = new marked.Renderer()
+var marked = require("marked")
 
-// This overrides Marked’s default headings with IDs,
-// since this changed after v0.2.9
-// https://github.com/sintaxi/harp/issues/328
-renderer.heading = function(text, level){
-  return '<h' + level + '>' +  text + '</h' + level + '>'
-}
+/**
+ * marked v18 defaults already produce the output this processor
+ * needs:
+ *   - headings without ids       (e.g. <h1>hello markdown</h1>)
+ *   - code blocks with a         <code class="language-xxx"> prefix
+ *   - GFM + tables enabled
+ *
+ * so the old setOptions()/custom-renderer/langPrefix/headerIds
+ * configuration (removed from marked years ago) is no longer needed.
+ */
 
 module.exports = function(fileContents, options){
 
   return {
     compile: function(){
       return function (locals){
-        return marked(fileContents.toString().replace(/^\uFEFF/, ''), {
-          renderer: renderer
-        })
+        return marked.parse(fileContents.toString().replace(/^\uFEFF/, ''))
       }
     },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terraform",
-  "version": "1.25.2",
+  "version": "1.26.1",
   "description": "pre-processor engine that powers the harp web server",
   "repository": {
     "type": "git",
@@ -48,14 +48,14 @@
     "ejs": "3.1.9",
     "esbuild": "0.28.1",
     "lru-cache": "10.0.0",
-    "marked": "5.1.2",
-    "sass": "1.64.1"
+    "marked": "18.0.5",
+    "sass": "1.101.0"
   },
   "devDependencies": {
     "coffeescript": "2.7.0",
-    "less": "4.1.3",
-    "mocha": "10.2.0",
-    "should": "3.3.2",
-    "stylus": "0.59.0"
+    "less": "4.6.7",
+    "mocha": "11.7.6",
+    "should": "13.2.3",
+    "stylus": "0.64.0"
   }
 }