fix(devkit): pass filepath to ejs for include statements (#19517)

nrwl · Oct 11, 2023 · b8e1500 · b8e1500 · vercel · Oct 11, 2023
1 parent 1c08c8b
commit b8e1500
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -109,6 +109,7 @@
     "@testing-library/react": "13.4.0",
     "@types/cytoscape": "^3.18.2",
     "@types/detect-port": "^1.3.2",
+    "@types/ejs": "3.1.2",
     "@types/eslint": "~8.44.2",
     "@types/express": "4.17.14",
     "@types/flat": "^5.0.1",

diff --git a/packages/devkit/src/generators/generate-files.ts b/packages/devkit/src/generators/generate-files.ts
@@ -34,7 +34,7 @@ export function generateFiles(
   target: string,
   substitutions: { [k: string]: any }
 ): void {
-  const ejs = require('ejs');
+  const ejs: typeof import('ejs') = require('ejs');
 
   const files = allFilesInDir(srcFolder);
   if (files.length === 0) {
@@ -56,7 +56,9 @@ export function generateFiles(
       } else {
         const template = readFileSync(filePath, 'utf-8');
         try {
-          newContent = ejs.render(template, substitutions, {});
+          newContent = ejs.render(template, substitutions, {
+            filename: filePath,
+          });
         } catch (e) {
           logger.error(`Error in ${filePath.replace(`${tree.root}/`, '')}:`);
           throw e;

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml