Merge pull request #8 from Jake-Short/dev

Merge dev into main

Author: Jake-Short

internal/generate.js

@@ -78,20 +78,20 @@ function completionHandler(type, params) {
         console.log()
         console.log(`${chalk.bold('Inside that folder, you can run all NextJS commands, such as:')}`)
         console.log()
-        console.log(chalk.cyan(`  npm run dev`))
+        console.log(chalk.cyan(`  yarn dev`))
         console.log('    Starts the development server.')
         console.log()
-        console.log(chalk.cyan(`  npm run build`))
+        console.log(chalk.cyan(`  yarn build`))
         console.log('    Builds the app for production.')
         console.log()
-        console.log(chalk.cyan(`  npm run start`))
+        console.log(chalk.cyan(`  yarn start`))
         console.log('    Runs the built app in production mode.')
         console.log()
         console.log('You can begin by typing:')
         console.log()
         console.log(chalk.cyan('  cd') + ' site')
         console.log(
-            `  ${chalk.cyan(`npm install && npm run dev`)}`
+            `  ${chalk.cyan(`yarn && yarn dev`)}`
         )
         console.log()
     }

internal/info.json

@@ -2,5 +2,5 @@ const chalk = require('chalk');
 
 console.log()
 console.log(`${chalk.red('Error: ')} This command is not available in development.`)
-console.log(`Run ${chalk.cyan('npm run generate')} and follow the instructions.`)
+console.log(`Run ${chalk.cyan('yarn generate')} and follow the instructions.`)
 console.log()

internal/unavailable.js

@@ -10,16 +10,22 @@ console.log(`${chalk.blue('Downloading repository...')}`);
 console.log('');
 
 const internalDir = path.resolve(__dirname);
+const baseDir = path.resolve(__dirname, '..');
+
+if(!fs.existsSync(internalDir + '/.temp')) {
+	fs.mkdirSync(internalDir + '/.temp');
+}
 download('Jake-Short/nextjs-docs-generator#main', `${internalDir}/.temp`, (error) => {
 	if(error) {
 		console.log(`${chalk.red.bold('Error: ')} There was a problem downloading the repository. (${error})`);
 		console.log(`Update aborted.`);
 		console.log('');
 	}
 	else {
-		let jsonData = JSON.parse(fs.readFileSync(`${internalDir}/.temp/internal/info.json`, 'utf-8'));
-		let version = jsonData.version;
-		let currVersion = JSON.parse(fs.readFileSync(`${internalDir}/info.json`, 'utf-8')).version;
+		let version = JSON.parse(fs.readFileSync(`${internalDir}/.temp/package.json`, 'utf-8')).version;
+
+		let currPackageContents = JSON.parse(fs.readFileSync(`${baseDir}/package.json`, 'utf-8'));
+		let currVersion = JSON.parse(fs.readFileSync(`${baseDir}/package.json`, 'utf-8')).version;
 
 		if(currVersion === version) {
 			console.log('');
@@ -71,11 +77,11 @@ download('Jake-Short/nextjs-docs-generator#main', `${internalDir}/.temp`, (error
 				if(res.Continue === true) {
 					// Trigger update
 					if(res.Continue === true) {
-						const baseDir = path.resolve(__dirname, '..');
-		
-						if(!fs.existsSync(internalDir + '/.temp')) {
-							fs.mkdirSync(internalDir + '/.temp');
-						}
+						// Update package.json version to new version
+						currPackageContents.version = version;
+						
+						// Write new package.json into site folder
+						fs.writeFileSync(baseDir + '/package.json', JSON.stringify(currPackageContents, null, 4));
 
 						// Copy selected folders below
 						if(foldersToUpdate.includes('internal')) {

internal/upgrade.js

@@ -2,9 +2,9 @@ const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
 
-const internalDir = path.resolve(__dirname);
+const baseDir = path.resolve(__dirname, '..');
 
-let currVersion = JSON.parse(fs.readFileSync(`${internalDir}/info.json`, 'utf-8')).version;
+let currVersion = JSON.parse(fs.readFileSync(`${baseDir}/package.json`, 'utf-8')).version;
 
 console.log('');
 console.log(`You are on version ${chalk.cyan.bold(currVersion)}.`);

internal/version.js

@@ -1,6 +1,6 @@
 {
   "name": "nextjs-docs-generator",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "dev": "node internal/runtimeserver.js",