Merge pull request #8 from leviy/master_require_twigjs-loader

Use twigjs-loader instead of twig-loader
leviy · Oct 17, 2019 · 89d81c1 · 89d81c1
2 parents adeec2d + 586734e
commit 89d81c1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /.idea/
+/node_modules/
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@leviy/webpack-config-default",
-    "version": "3.0.1",
+    "version": "3.1.0",
     "repository": {
         "type": "git",
         "url": "git+ssh://git@github.com:leviy/webpack-config-default.git"
@@ -14,7 +14,7 @@
         "mini-css-extract-plugin": "^0.8",
         "postcss-loader": "^3.0",
         "sass-loader": "^7.1",
-        "twig-loader": "^0.5",
+        "twigjs-loader": "^1.0",
         "webpack-config": "^7.5",
         "webpack-manifest-plugin": "^2.0"
     },

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,5 +1,6 @@
 const { Config, environment } = require('webpack-config');
 
+const path = require('path');
 const webpack = require('webpack');
 
 const ManifestPlugin = require('webpack-manifest-plugin');
@@ -30,7 +31,17 @@ module.exports = new Config().defaults({
         rules: [
             {
                 test: /\.twig$/,
-                loader: 'twig-loader',
+                loader: 'twigjs-loader',
+                options: {
+                    renderTemplate(twigData, dependencies) {
+                        return `
+                            ${dependencies}
+                            var twig = require('${path.resolve(process.cwd(), 'node_modules/twig')}').twig;
+                            var tpl = twig(${JSON.stringify(twigData)});
+                            module.exports = function(context) { return tpl.render(context); };
+                        `;
+                    },
+                },
             },
             {
                 test: /\.js$/,