Updates

- save project in framework7.json
- internal renames
- generate-assets -> assets

Author: nolimits4web

.eslintignore

@@ -1,6 +1,6 @@
-create-app/templates/react/pages
-create-app/templates/vue/pages
-create-app/templates/common
+create/templates/react/pages
+create/templates/vue/pages
+create/templates/common
 ui/src
 ui/www
-node_modules
+node_modules

README.md

@@ -40,8 +40,10 @@ module.exports = async (options = {}, logger, { exitOnError = true } = {}) => {
   logger.statusStart('Generating package.json');
   const packageJson = generatePackageJson(options);
 
-  // Write Package.json
+  // Write Package.json and project json
   fse.writeFileSync(path.join(cwd, 'package.json'), packageJson.content);
+  fse.writeFileSync(path.join(cwd, 'framework7.json'), JSON.stringify(options, '', 2));
+
   logger.statusDone('Generating package.json');
 
   // Create Folders

generate-assets/index.js assets/index.js

@@ -127,7 +127,6 @@ module.exports = function generatePackageJson(options) {
   "description": "${name}",
   "repository" : "",
   "license" : "UNLICENSED",
-  "framework7": ${JSON.stringify(options)},
   "scripts" : ${JSON.stringify(scripts)},
   "browserslist": [
     "Android >= 7",

create-app/index.js create/index.js

@@ -60,13 +60,13 @@ There is also cordova Electron platform installed. To learn more about it and El
 Assets (icons, splash screens) source images located in \`assets-src\` folder. To generate your own icons and splash screen images, you will need to replace all assets in this directory with your own images (pay attention to image size and format), and run the following command in the project directory:
 
 \`\`\`
-framework7 generate-assets
+framework7 assets
 \`\`\`
 
 Or launch UI where you will be able to change icons and splash screens:
 
 \`\`\`
-framework7 generate-assets --ui
+framework7 assets --ui
 \`\`\`
 
 ## Documentation & Resources

create-app/templates/app-parameters.js create/templates/app-parameters.js

@@ -8,9 +8,10 @@ const fse = require('./utils/fs-extra');
 const checkUpdate = require('./utils/check-update');
 const spinner = require('./utils/spinner');
 const log = require('./utils/log');
-const getOptions = require('./create-app/utils/get-options');
-const createApp = require('./create-app/index');
-const generateAssets = require('./generate-assets/index');
+const getCurrentProject = require('./utils/get-current-project');
+const getOptions = require('./create/utils/get-options');
+const createApp = require('./create/index');
+const generateAssets = require('./assets/index');
 const server = require('./ui/server');
 const pkg = require('./package.json');
 
@@ -39,13 +40,8 @@ program
       await checkUpdate();
     }
 
-    let currentProject;
-    try {
-      // eslint-disable-next-line
-      currentProject = require(path.resolve(cwd, 'package.json')).framework7;
-    } catch (err) {
-      // all good
-    }
+    const currentProject = getCurrentProject(cwd);
+
     if (currentProject) {
       log.text(`${logSymbols.error} Framework7 project already set up in current directory`);
       process.exit(1);
@@ -69,8 +65,8 @@ program
   });
 
 program
-  .command('generate-assets')
-  .alias('assets')
+  .command('assets')
+  .alias('generate-assets')
   .option('--skipUpdate', 'Skip checking for update of framework7-cli')
   .option('--ui', 'Launch assets generation UI')
   .option('-P, --port <n>', 'Specify UI server port. By default it is 3001', parseInt)
@@ -81,24 +77,15 @@ program
       await checkUpdate();
     }
 
-    let currentProject;
-    try {
-      // eslint-disable-next-line
-      const pkg = require(path.resolve(cwd, 'package.json'));
-      if (!pkg || !pkg.framework7) {
-        log.text(`${logSymbols.error} Framework7 project not found in current directory`);
-        process.exit(1);
-      }
-      // eslint-disable-next-line
-      currentProject = Object.assign({ cwd }, pkg.framework7);
-    } catch (err) {
+    const currentProject = getCurrentProject(cwd);
+    if (!currentProject) {
       log.text(`${logSymbols.error} Framework7 project not found in current directory`);
       process.exit(1);
     }
 
     if (options.ui) {
       spinner.start('Launching Framework7 UI server');
-      server('/generate-assets/', options.port);
+      server('/assets/', options.port);
       spinner.end('Launching Framework7 UI server');
     } else {
       await generateAssets({}, currentProject, logger);

create-app/templates/common/cordova-app.js create/templates/common/cordova-app.js

@@ -9,8 +9,9 @@ const opn = require('opn');
 const bodyParser = require('body-parser');
 const multer = require('multer');
 const fse = require('../utils/fs-extra');
-const createApp = require('../create-app/index');
-const generateAssets = require('../generate-assets/index');
+const createApp = require('../create/index');
+const generateAssets = require('../assets/index');
+const getCurrentProject = require('../utils/get-current-project');
 
 const upload = multer({ storage: multer.memoryStorage() });
 
@@ -49,8 +50,7 @@ module.exports = (startPage = '/', port = 3001) => {
   });
 
   app.get('/api/project/', (req, res) => {
-    const pkg = require(path.resolve(cwd, 'package.json'));
-    res.json(pkg.framework7);
+    res.json(getCurrentProject(cwd));
   });
 
   // Create App
@@ -84,12 +84,12 @@ module.exports = (startPage = '/', port = 3001) => {
     });
 
   // Generate Assets
-  app.post('/api/generate-assets/upload/', upload.any(), (req, res) => {
+  app.post('/api/assets/upload/', upload.any(), (req, res) => {
     const file = req.files[0];
     fse.writeFileSync(path.resolve(cwd, 'assets-src', `${file.fieldname}.png`), file.buffer);
     res.send('Ok');
   });
-  app.route('/api/generate-assets/generate/')
+  app.route('/api/assets/generate/')
     .get((req, res) => {
       res.json({ log, done, error });
       if (done) {
@@ -117,7 +117,7 @@ module.exports = (startPage = '/', port = 3001) => {
   const availablePaths = [
     '/',
     '/create/',
-    '/generate-assets/',
+    '/assets/',
   ];
   availablePaths.forEach((availablePath) => {
     app.get(availablePath, (req, res) => {

create-app/templates/common/cordova-res/icon/android/mipmap-hdpi/ic_launcher.png create/templates/common/cordova-res/icon/android/mipmap-hdpi/ic_launcher.png

@@ -1,6 +1,6 @@
 import HomePage from '../pages/home.vue';
 import CreatePage from '../pages/create.vue';
-import GenerateAssetsPage from '../pages/generate-assets.vue';
+import AssetsPage from '../pages/assets.vue';
 
 const routes = [
   {
@@ -12,8 +12,8 @@ const routes = [
     component: CreatePage,
   },
   {
-    path: '/generate-assets/',
-    component: GenerateAssetsPage,
+    path: '/assets/',
+    component: AssetsPage,
   },
 ];
 

create-app/templates/common/cordova-res/icon/android/mipmap-ldpi/ic_launcher.png create/templates/common/cordova-res/icon/android/mipmap-ldpi/ic_launcher.png

@@ -1,5 +1,5 @@
 <template>
-  <f7-page name="generate-assets">
+  <f7-page name="assets">
     <f7-navbar :sliding="false" large>
       <f7-nav-title>
         <i class="f7-navbar-logo"></i>
@@ -178,7 +178,7 @@
       logText,
       getLog() {
         const self = this;
-        getLog(self, '/api/generate-assets/generate/');
+        getLog(self, '/api/assets/generate/');
       },
       getImage(src) {
         const self = this;
@@ -198,7 +198,7 @@
         self.$request({
           method: 'post',
           contentType: 'multipart/form-data',
-          url: '/api/generate-assets/upload/',
+          url: '/api/assets/upload/',
           data: fd,
           complete() {
             self.uploading = null;
@@ -209,7 +209,7 @@
         const self = this;
         if (self.loading) return;
         self.loading = true;
-        self.$f7.request.postJSON('/api/generate-assets/generate/', {}, () => {
+        self.$f7.request.postJSON('/api/assets/generate/', {}, () => {
           self.getLog();
         });
       },

create-app/templates/common/cordova-res/icon/android/mipmap-mdpi/ic_launcher.png create/templates/common/cordova-res/icon/android/mipmap-mdpi/ic_launcher.png

@@ -20,7 +20,7 @@
           </a>
         </div>
         <div class="col-100 medium-33 card">
-          <a href="/generate-assets/" class="card-content card-content-padding link">
+          <a href="/assets/" class="card-content card-content-padding link">
             <i class="f7-icons">photo_fill_on_rectangle_fill</i>
             <span>Generate Assets</span>
           </a>

create-app/templates/common/cordova-res/icon/android/mipmap-xhdpi/ic_launcher.png create/templates/common/cordova-res/icon/android/mipmap-xhdpi/ic_launcher.png

@@ -0,0 +1,24 @@
+const path = require('path');
+
+module.exports = (cwd) => {
+  let currentProject;
+  try {
+    // eslint-disable-next-line
+    currentProject = require(path.resolve(cwd, 'framework7.json'));
+  } catch (err) {
+    // all good
+  }
+  if (!currentProject) {
+    try {
+      // eslint-disable-next-line
+      currentProject = require(path.resolve(cwd, 'package.json')).framework7;
+    } catch (err) {
+      // all good
+    }
+  }
+  if (!currentProject) return undefined;
+  return {
+    cwd,
+    ...(currentProject || {}),
+  };
+};