Merge pull request #2 from jawa-the-hutt/dev

Added prompt at invoke to check for new project; Re-organized the template directories to allow for sharing App_Resoruces

Author: jawa-the-hutt

generator/index.js

@@ -1,8 +1,21 @@
+const path = require('path');
+const fs = require('fs')
+const globby = require('globby');
+const rimraf = require('rimraf')
+const replace = require('replace-in-file');
+
 module.exports = (api, options, rootOptions) => {
-  const fs = require('fs')
-  const rimraf = require('rimraf')
-  const replace = require('replace-in-file');
-  const path = require('path');
+  
+  const commonRendorOptions = {
+    applicationName: api.generator.pkg.name,
+    applicationVersion: api.generator.pkg.version,
+    applicationAndroidVersionCode: api.generator.pkg.version.split('.').join('0'),
+    applicationDescription: api.generator.pkg.description || api.generator.pkg.name,
+    applicationLicense: api.generator.pkg.license || 'MIT',
+    applicationId: options.applicationId,
+    historyMode: options.historyMode || false,
+    doesCompile: api.hasPlugin('babel') || api.hasPlugin('typescript')
+  }
 
   console.log('adding to package.json');
 
@@ -61,55 +74,54 @@ module.exports = (api, options, rootOptions) => {
 
   console.log('doing template rendering');
 
-  api.render('./templates/simple', {
-    applicationName: api.generator.pkg.name,
-    applicationVersion: api.generator.pkg.version,
-    applicationAndroidVersionCode: api.generator.pkg.version.split('.').join('0'),
-    applicationDescription: api.generator.pkg.description || api.generator.pkg.name,
-    applicationLicense: api.generator.pkg.license || 'MIT',
-    applicationId: options.applicationId,
-    historyMode: options.historyMode || false,
-  })
+  // render the App_Resources files
+  api.render('./templates/App_Resources', commonRendorOptions)
 
-  console.log('onCreateComplete');
+  // use the answer from the invoke prompt and if it's a new project use the new template
+  // and if it is an existing project, use the existing template
+  if(options.isNewProject) {
+    api.render('./templates/simple/new', commonRendorOptions)
+  } else {
+    api.render('./templates/simple/existing', commonRendorOptions)
+  }
 
-  // delete the 'public' directory
   api.onCreateComplete(() => {
+
     const newline = process.platform === 'win32' ? '\r\n' : '\n';
-    // // // const publicPath = api.resolve('public')
-    const webpackConfigFile = api.resolve('./webpack.config.js')
-    const main = api.resolve('src/main.js');
-    const gitignorePath = api.resolve('.gitignore')
+    const webpackConfigFile = api.resolve('./webpack.config.js');
+    const src = api.resolve('src');
+    const gitignorePath = api.resolve('.gitignore');
 
+    // // // // delete the 'public' directory
+    // // // const publicPath = api.resolve('public')
     // // // if(fs.existsSync(publicPath)) {
     // // //   rimraf.sync(publicPath)
     // // // }
 
-    // remove any webpack.config.js file that might already be there
+    // rename any webpack.config.js file that might already be there
     if(fs.existsSync(webpackConfigFile)) {
-      fs.unlink(webpackConfigFile, (err) => {
+      fs.rename(webpackConfigFile, './webpack.config.old', (err) => {
         if (err) throw err;
-      });    }
+      });
+    }
 
-    // delete main.js
-     if(fs.existsSync(main)) {
-      fs.unlink(main, (err) => {
+    // rename main.js to main.web.js
+    if(fs.existsSync(path.resolve(src, 'main.js'))) {
+      fs.rename(path.resolve(src, 'main.js'), path.resolve(src, 'main.web.js'), (err) => {
         if (err) throw err;
       });
-     }
+    }
 
     // setup string replacement options for babel.config.js file
-    if(fs.existsSync('./babel.config.js')) {
+    if(api.hasPlugin('babel') && fs.existsSync('./babel.config.js')) {
       const replaceOptions = {
         files: './babel.config.js',
         from: '  \'@vue/app\'',
         to: '  process.env.VUE_PLATFORM === \'web\' ? \'@vue/app\' : {}, ' + newline + '    [\'@babel/env\', { targets: { esmodules: true } }]',
       }
-      replace(replaceOptions, (error, changes) => {
-        if (error) {
-          return console.error('Error occurred:', error);
-        }
-      })
+      replace(replaceOptions, (err, changes) => {
+        if (err) throw err;
+      });
     }
 
     // write out environmental files
@@ -120,36 +132,39 @@ module.exports = (api, options, rootOptions) => {
     const productionIOS = 'NODE_ENV=production' + newline + 'VUE_PLATFORM=ios' + newline + 'VUE_APP_MODE=native';
     const productionWeb = 'NODE_ENV=production' + newline + 'VUE_PLATFORM=web' + newline + 'VUE_APP_MODE=web';
 
-    fs.writeFileSync('./.env.development.android', developmentAndroid, { encoding: 'utf8' })
-    fs.writeFileSync('./.env.development.ios', developmentIOS, { encoding: 'utf8' })
-    fs.writeFileSync('./.env.development.web', developmentWeb, { encoding: 'utf8' })
-    fs.writeFileSync('./.env.production.android', productionAndroid, { encoding: 'utf8' })
-    fs.writeFileSync('./.env.production.ios', productionIOS, { encoding: 'utf8' })
-    fs.writeFileSync('./.env.production.web', productionWeb, { encoding: 'utf8' })
+    fs.writeFileSync('./.env.development.android', developmentAndroid, { encoding: 'utf8' }, (err) => {if (err) throw err;});
+    fs.writeFileSync('./.env.development.ios', developmentIOS, { encoding: 'utf8' }, (err) => {if (err) throw err;});
+    fs.writeFileSync('./.env.development.web', developmentWeb, { encoding: 'utf8' }, (err) => {if (err) throw err;});
+    fs.writeFileSync('./.env.production.android', productionAndroid, { encoding: 'utf8' }, (err) => {if (err) throw err;});
+    fs.writeFileSync('./.env.production.ios', productionIOS, { encoding: 'utf8' }, (err) => {if (err) throw err;});
+    fs.writeFileSync('./.env.production.web', productionWeb, { encoding: 'utf8' }, (err) => {if (err) throw err;});
 
 
     // write nsconfig.json
     const nsconfig = {
       'appPath': 'src',
       'appResourcesPath': 'src/App_Resources'
     }
-    fs.writeFileSync('./nsconfig.json', JSON.stringify(nsconfig, null, 2), {encoding: 'utf8'});
+    fs.writeFileSync('./nsconfig.json', JSON.stringify(nsconfig, null, 2), {encoding: 'utf8'}, (err) => {if (err) throw err;});
 
     // write .gitignore additions
-    let gitignoreContent
+    let gitignoreContent;
 
     if (fs.existsSync(gitignorePath)) {
-      gitignoreContent = fs.readFileSync(gitignorePath, { encoding: 'utf8' })
+      gitignoreContent = fs.readFileSync(gitignorePath, { encoding: 'utf8' });
     } else {
-      gitignoreContent = ''
+      gitignoreContent = '';
     }
 
     const gitignoreAdditions = newline + '# NativeScript application' + newline + 'hooks' + newline + 'platforms'
     if (gitignoreContent.indexOf(gitignoreAdditions) === -1) {
       gitignoreContent += gitignoreAdditions
 
-      fs.writeFileSync(gitignorePath, gitignoreContent, { encoding: 'utf8' })
+      fs.writeFileSync(gitignorePath, gitignoreContent, { encoding: 'utf8' }, (err) => {if (err) throw err;});
     }
 
   })
-}
+
+
+
+}

generator/templates/simple/src/App_Resources/Android/AndroidManifest.xml renamed to generator/templates/App_Resources/src/App_Resources/Android/AndroidManifest.xml

@@ -0,0 +1,27 @@
+---
+extend: '@vue/cli-service/generator/template/src/main.js'
+replace:
+  - !!js/regexp /import Vue from 'vue'/
+  - !!js/regexp /Vue.config.productionTip = false/
+  - !!js/regexp /h\(App\)/
+  - !!js/regexp /}\)\.\$mount\('#app'\)/
+---
+
+<%# REPLACE %>
+import Vue from 'nativescript-vue'
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+// Set the following to `true` to hide the logs created by nativescript-vue
+Vue.config.silent = false
+// Set the following to `false` to not colorize the logs created by nativescript-vue
+Vue.config.debug = true
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+h('frame', [h(App)])
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+}).$start()
+<%# END_REPLACE %>

generator/templates/simple/src/App_Resources/Android/app.gradle renamed to generator/templates/App_Resources/src/App_Resources/Android/app.gradle

@@ -0,0 +1,27 @@
+---
+extend: '@vue/cli-service/generator/template/src/main.js'
+replace:
+  - !!js/regexp /import Vue from 'vue'/
+  - !!js/regexp /Vue.config.productionTip = false/
+  - !!js/regexp /h\(App\)/
+  - !!js/regexp /}\)\.\$mount\('#app'\)/
+---
+
+<%# REPLACE %>
+import Vue from 'nativescript-vue'
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+// Set the following to `true` to hide the logs created by nativescript-vue
+Vue.config.silent = false
+// Set the following to `false` to not colorize the logs created by nativescript-vue
+Vue.config.debug = true
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+h('frame', [h(App)])
+<%# END_REPLACE %>
+
+<%# REPLACE %>
+}).$start()
+<%# END_REPLACE %>

generator/templates/simple/src/App_Resources/Android/drawable-hdpi/background.png renamed to generator/templates/App_Resources/src/App_Resources/Android/drawable-hdpi/background.png

@@ -0,0 +1,9 @@
+{
+  "android": {
+    "v8Flags": "--expose_gc",
+    "markingMode": "none"
+  },
+  "main": "main.native",
+  "name": "<%- applicationName %>",
+  "version": "<%- applicationVersion %>"
+}

generator/templates/simple/src/App_Resources/Android/drawable-hdpi/icon.png renamed to generator/templates/App_Resources/src/App_Resources/Android/drawable-hdpi/icon.png

@@ -18,6 +18,7 @@
   "dependencies": {},
   "devDependencies": {
     "@vue/cli-service": "^3.1.1",
+    "fs-extra": "^7.0.0",
     "nativescript-dev-webpack": "^0.16.3",
     "nativescript-vue-template-compiler": "^1.3.1",
     "node-cmd": "^3.0.0",

generator/templates/simple/src/App_Resources/Android/drawable-hdpi/logo.png renamed to generator/templates/App_Resources/src/App_Resources/Android/drawable-hdpi/logo.png

@@ -24,5 +24,11 @@ Example: com.company.app`
     type: 'confirm',
     message: 'Use HTML5 history mode? (Default: hash mode)',
     default: false
+  },
+  {
+    name: 'isNewProject',
+    type: 'confirm',
+    message: 'Is this a brand new project? (Default: No)',
+    default: false
   }
 ]