fix eslint config path generation

CyberCookie · Jan 7, 2022 · 14a90bd · 14a90bd
1 parent f66b1d7
commit 14a90bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/bin/init_project.js b/bin/init_project.js
@@ -78,7 +78,7 @@ function main(isGlobal) {
             paths[alias][0] = replaceDevPathWithSiegel(paths[alias][0], ...replacementArgs)
         }
 
-        clientTSConfig.include.push(
+        INIT_PATHS.siegelDemoAppShift && clientTSConfig.include.push(
             clientTSConfig.include.pop()
                 .replace(`${INIT_PATHS.siegelDemoAppShift}/`, '')
         )
@@ -104,7 +104,11 @@ function main(isGlobal) {
         // Extend Eslint jsons
         const ESLintConfig = JSON.parse(readFileSync(INIT_PATHS.userESLint, 'utf8'))
 
-        ESLintConfig.extends.push(INIT_PATHS.siegelEsLint)
+        ESLintConfig.extends.push(
+            INIT_PATHS.siegelEsLint[0] == '.' || INIT_PATHS.siegelEsLint[0] == '/'
+                ?   INIT_PATHS.siegelEsLint
+                :   `./${INIT_PATHS.siegelEsLint}`
+        )
         ESLintConfig.ignorePatterns.pop()
         ESLintConfig.rules = {}
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "siegel",
-    "version": "0.11.10",
+    "version": "0.11.11",
     "homepage": "https://github.com/CyberCookie/siegel",
     "url": "https://github.com/CyberCookie/siegel",
     "bugs": "https://github.com/CyberCookie/siegel/issues",