file.render: remove eco dependency

adaltas · Jun 19, 2018 · 61e161c · 61e161c
1 parent 3532bde
commit 61e161c
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 212 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 ## Trunk
 
+Backward incompatibilities:
+
+* file.render: remove eco dependency
+
 Management:
 
 * package: remove fs.realpath dependency

diff --git a/lib/file/index.js b/lib/file/index.js
diff --git a/lib/file/render.js b/lib/file/render.js
diff --git a/lib/misc/string.js b/lib/misc/string.js
diff --git a/lib/misc/template.js b/lib/misc/template.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,7 +43,6 @@
     "tilde-expansion": "~0.0.0"
   },
   "optionalDependencies": {
-    "eco": "~1.1.0-rc-3",
     "season": "^6.0.2"
   },
   "devDependencies": {

diff --git a/src/file/index.coffee.md b/src/file/index.coffee.md
@@ -385,7 +385,6 @@ require('nikita').file({
 ## Dependencies
 
     path = require 'path'
-    eco = require 'eco'
     nunjucks = require 'nunjucks/src/environment'
     misc = require '../misc'
     diff = require '../misc/diff'

diff --git a/src/file/render.coffee.md b/src/file/render.coffee.md
@@ -87,7 +87,6 @@ require('nikita').file.render({
         extension = path.extname options.source
         switch extension
           when '.j2' then options.engine = 'nunjunks'
-          when '.eco' then options.engine = 'eco'
           else throw Error "Invalid Option: extension '#{extension}' is not supported"
       # Read source
       @fs.readFile

diff --git a/src/misc/string.coffee b/src/misc/string.coffee
@@ -62,11 +62,6 @@ module.exports =
               else
                 @log message: "Option filter not a function and ignored", level: 'WARN', module: 'nikita/lib/write'
             options.content = env.renderString options.content.toString(), options.context
-          when 'eco'
-            try
-              eco = require 'eco'
-            catch e then throw Error "Uninstalled Package: the optional package \"echo\" is not installed"
-            options.content = eco.render options.content.toString(), options.context
           else throw Error "Invalid engine: #{options.engine}"
       catch err
         throw (if typeof err is 'string' then Error(err) else err)

diff --git a/src/misc/template.coffee b/src/misc/template.coffee
@@ -4,8 +4,6 @@ module.exports = (string, options) ->
   options.engine ?= 'nunjunks'
   return switch options.engine
     when 'nunjunks' then (new nunjucks.Environment()).renderString string, options
-    when 'eco' then eco.render string, options
     else throw Error "Invalid engine: #{options.engine}"
 
-eco = require 'eco'
 nunjucks = require 'nunjucks/src/environment'