@wiajs/core 1.0.7 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wiajs/core",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "wia app core package. refer to Framework7.",
   "main": "./dist/core.cmn.js",
 	"module": "./dist/core.esm.js",

package/util/wiapage.js

@@ -1,4 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
+
 /**
  * 自动根据page目录文件生成 src目录的pages.js 文件
  */
@@ -81,7 +82,7 @@ async function getPage(dir) {
   try {
     dir = dir || process.cwd();
     const src = path.join(dir, './src');
-    _cfg = require(path.join(src, './config/app.js'));
+    _cfg = require(path.join(dir, './wia.config.js'));
     const rs = [];
     // 获取目标项目目录、子目录下的文件MD5对象
     await getFile(path.join(src, './page'), rs, src);
@@ -160,25 +161,36 @@ function makeFile(pf, name, dir) {
   const src = path.join(dir, './src');
 
   const p = [];
+  const ns = [];
   Object.keys(pf).forEach(k => {
     const f = pf[k].replace(/.js$/, '');
     p.push(`import ${k} from '${f}';`);
+    ns.push(`  '${f}': ${k},`);
   });
 
-  const ns = [];
-  Object.keys(pf).forEach(k => {
-    const n = k[0].toLowerCase() + k.slice(1);
-    ns.push(`    const ${n} = new ${k}();`);
-  });
-
+  // Object.keys(pf).forEach(k => {
+  //   const n = k[0].toLowerCase() + k.slice(1);
+  //   ns.push(`  '${n}': ${k},`);
+  // });
+
+// webpack 
+//   p.push(`
+// export default class ${name[0].toUpperCase() + name.slice(1)} {
+//   init() {
+// ${ns.join('\n')}
+//   }
+// }
+// `);
+
+// vite
   p.push(`
-export default class ${name[0].toUpperCase() + name.slice(1)} {
-  init() {
+const ${name} = {
 ${ns.join('\n')}
-  }
-}
-`);
+};
 
+export default ${name};
+`);
+  
   // 将内容写入page.js 文件
   const ps = p.join('\n');
   if (!_.isEmpty(ps)) {
@@ -249,8 +261,9 @@ function clear(dir) {
     dir = dir || process.cwd();
     const src = path.join(dir, './src');
     const ps = `
-export default class Pages {
-}
+const pages = {};
+
+export default pages;
 `;
     let lastH = '';
     const f = path.join(src, './pages.js');