zmp-cli 3.12.0-rc.3 → 3.12.1-rc.2

package/.vscode/settings.json

@@ -1,4 +1,5 @@
 {
   "prettier.trailingComma": "none",
-  "workbench.colorTheme": "GitHub Dark Default"
-}
+  "workbench.colorTheme": "GitHub Dark Default",
+  "editor.formatOnSave": false
+}

package/create/templates/zaui/generate-scripts.js

@@ -2,7 +2,7 @@ const indent = require('../../utils/indent');
 const stylesExtension = require('../../utils/styles-extension');
 
 module.exports = (options) => {
-  const { cssPreProcessor,  includeTailwind } = options;
+  const { cssPreProcessor,  includeTailwind, framework } = options;
 
   let scripts = '';
 
@@ -30,7 +30,7 @@ module.exports = (options) => {
     }
 
     // Mount React App
-    const root = createRoot(document.getElementById('app'));
+    ${framework === 'react-typescript' ? "const root = createRoot(document.getElementById('app')!);" : "const root = createRoot(document.getElementById('app'));"}
     root.render(React.createElement(App));
   `
   );

package/create/utils/generate-app-config.js

@@ -1,17 +1,19 @@
-const generateRoutes = require('../templates/generate-routes');
-
 module.exports = function generateAppConfig(options) {
   const { name } = options;
 
   // Window config
   const appConfig = {
     title: name,
+    headerTitle: name,
     headerColor: '#1843EF',
     textColor: 'white',
     statusBarColor: '#1843EF',
     leftButton: 'back',
+    statusBar: 'normal',
+    actionBarHidden: false,
+    hideAndroidBottomNavigationBar: false,
+    hideIOSSafeAreaBottom: false,
   };
-  const routes = generateRoutes(options);
   // Content
   const content = JSON.stringify(
     {
@@ -20,7 +22,6 @@ module.exports = function generateAppConfig(options) {
       listCSS: [],
       listSyncJS: [],
       listAsyncJS: [],
-      pages: routes,
     },
     '',
     2

package/create/utils/generate-package-json.js

@@ -18,7 +18,6 @@ module.exports = function generatePackageJson(options) {
       : ['zmp-framework', 'zmp-sdk', 'swiper'];
   const dependenciesVue = ['vue@3', 'zmp-framework'];
   const dependenciesReact = ['react', 'react-dom', 'prop-types'];
-  const dependenciesReactTs = ['@types/react', '@types/react-dom'];
   const tailwindDependencies = [
     'autoprefixer',
     'tailwindcss',
@@ -36,17 +35,17 @@ module.exports = function generatePackageJson(options) {
     }
   }
 
-  if (framework === 'react-typescript') {
-    dependencies.push(...dependenciesReactTs);
-    if (package === 'zmp-ui') {
-      dependencies.push('@types/react-router-dom');
-    }
-  }
   const devDependencies = [
     'cross-env',
     'postcss-preset-env@6.7.0',
     'vite@2.6.14',
   ];
+  if (framework === 'react-typescript') {
+    devDependencies.push('@types/react', '@types/react-dom');
+    if (package === 'zmp-ui') {
+      devDependencies.push('@types/react-router-dom');
+    }
+  }
   // CSS PreProcessor
   if (cssPreProcessor === 'stylus') devDependencies.push(...['stylus']);
   else if (cssPreProcessor === 'less') devDependencies.push(...['less']);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmp-cli",
-  "version": "3.12.0-rc.3",
+  "version": "3.12.1-rc.2",
   "description": "ZMP command line utility (CLI)",
   "main": "index.js",
   "bin": {

package/start/index.js

@@ -88,9 +88,9 @@ module.exports = async (options = {}, logger, { exitOnError = true } = {}) => {
 
     const publicServer = {
       host: '0.0.0.0',
-      https: !isIOS,
       hmr: {
         host: host,
+        protocol: 'ws',
       },
     };
 
@@ -172,9 +172,7 @@ module.exports = async (options = {}, logger, { exitOnError = true } = {}) => {
 
     spinner.stop();
     return await new Promise(() => {
-      const previewOnZaloURL = `https://zalo.me/app/link/zapps/${appId}/?env=TESTING_LOCAL&clientIp=${
-        isIOS ? 'http' : 'https'
-      }://${host}:${app.config.server.port}`;
+      const previewOnZaloURL = `https://zalo.me/app/link/zapps/${appId}/?env=TESTING_LOCAL&clientIp=http://${host}:${app.config.server.port}`;
 
       if (previewOnZalo) {
         qrcode.generate(previewOnZaloURL, { small: true }, function (qrcode) {