Merge pull request #22 from obewds/dev

0.3.2 - patching file scrapers bug from double cwd calls

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obewds/vilt-ds",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "The official repository for the VILT Design System for the Vue.js, Inertia.js, Laravel, and Tailwind CSS web app stack that is turbocharged with Typescript and VueVentus.",
   "license": "MIT",
   "author": "Matt McT",

src/installers/install-vilt-ds-jetstream.ts

@@ -29,13 +29,13 @@ import generateWebPhp from '../generators/jetstream/routes/generate-web-php.js'
 
 export default function (): void {
 
-    // update the app gitignore file for VILT DS
-    installFile( '/.gitignore', generateGitignore() )
-
     // install client side deps and package scripts/mods for VILT DS and VueVentus
     installJetstreamNpmDeps()
     installJetstreamPackageJsonMods()
 
+    // update the app gitignore file for VILT DS
+    installFile( '/.gitignore', generateGitignore() )
+
     // install typescript specific app files
     installFile( '/resources/js/Types/app-colors-types.ts', generateAppColorsTypesTs() )
     installFile( '/resources/js/Types/app-jetstream-types.ts', generateAppJetstreamTypesTs() )

src/scrapers/scrape-config-jetstream-php.ts

@@ -6,11 +6,11 @@ import projectFileDoesExist from '../helpers/project-file-does-exist.js'
 
 export default function (): string|null {
 
-    const path = cwd + '/config/jetstream.php'
+    const path = '/config/jetstream.php'
 
     if ( projectFileDoesExist(path) ) {
 
-        var scraped = fs.readFileSync(path,'utf8')
+        var scraped = fs.readFileSync(cwd + path, 'utf8')
 
         let modifiedData = String(scraped).replace(
             '// Features::termsAndPrivacyPolicy()',

src/scrapers/scrape-gitignore.ts

@@ -6,11 +6,11 @@ import projectFileDoesExist from '../helpers/project-file-does-exist.js'
 
 export default function (): string|null {
 
-    const path = cwd + '/.gitignore'
+    const path = '/.gitignore'
 
     if ( projectFileDoesExist(path) ) {
 
-        var scraped = fs.readFileSync(path,'utf8')
+        var scraped = fs.readFileSync(cwd + path, 'utf8')
 
         return scraped
 

src/scrapers/scrape-routes-web-php.ts

@@ -6,11 +6,11 @@ import projectFileDoesExist from '../helpers/project-file-does-exist.js'
 
 export default function (): string|null {
 
-    const path = cwd + '/routes/web.php'
+    const path = '/routes/web.php'
 
     if ( projectFileDoesExist(path) ) {
 
-        var scraped = fs.readFileSync(path,'utf8')
+        var scraped = fs.readFileSync(cwd + path, 'utf8')
 
         return scraped
 

tests/scrapers/scrape-gitignore.test.ts

@@ -15,7 +15,8 @@ describe('./src/scrapers/scrape-gitignore module', () => {
 
     test('module returns null when a .gitignore file does not exist', () => {
 
-        expect(scrapeGitignore()).toBe(null)
+        // this will be true by default for this repo's ./.gitignore file!
+        expect(typeof scrapeGitignore() === 'string').toBe(true)
 
     })