shoplazza-cli 1.0.6 → 1.0.7-beta.1

package/lib/app/index.js

@@ -1,23 +1,24 @@
 function initThemeAppCommand(_program) {
-  const program = _program.command('app').description('Shoplazza app CLI');
+  const program = _program.command('te').alias('theme_extension').description('Shoplazza theme extension CLI');
 
-  program.command('create').description('Create a new theme app').action(require('./commands/create').create);
+  program.command('create').description('Create a new theme extension').action(require('./commands/create').create);
 
   program
     .command('serve')
-    .description('Start a local development server for the theme app')
+    .description('Start a local development server for the theme extension')
     .action(require('./commands/serve').serve);
 
-  program.command('build').description('Build the theme app for production').action(require('./commands/build').build);
+  program.command('build').description('Build the theme extension for production').action(require('./commands/build').build);
 
   program
     .command('versions')
-    .description('List all versions of the theme app')
+    .description('List all versions of the theme extension')
     .action(require('./commands/versions').versions);
 
-  program.command('deploy').description('Deploy the theme app').action(require('./commands/deploy').deploy);
+  program.command('deploy').description('Deploy the theme extension').action(require('./commands/deploy').deploy);
+
+  program.command('list').description('List all theme extensions').action(require('./commands/list').list);
 
-  program.command('list').description('List all theme apps').action(require('./commands/list').list);
 }
 
 module.exports = {

package/lib/app/template/basic-app/README.md

@@ -19,7 +19,7 @@ npm install -g shoplazza-cli
 创建主题插件项目模版
 
 ```bash
-shoplazza app create
+shoplazza te create
 ```
 
 ---
@@ -37,7 +37,7 @@ npm start
 或者
 
 ```bash
-shoplazza app serve
+shoplazza te serve
 ```
 
 ### `build`
@@ -51,7 +51,7 @@ npm run build
 或者
 
 ```bash
-shoplazza app build
+shoplazza te build
 ```
 
 ### `deploy`
@@ -65,7 +65,7 @@ npm run deploy
 或者
 
 ```bash
-shoplazza app deploy
+shoplazza te deploy
 ```
 
 ### `versions`
@@ -79,6 +79,20 @@ npm run versions
 或者
 
 ```bash
-shoplazza app versions
+shoplazza te versions
+```
+
+### `list`
+
+查询店铺的私有主题插件列表
+
+```bash
+npm run list
+```
+
+或者
+
+```bash
+shoplazza te list
 ```
 

package/lib/app/template/basic-app/package.json

@@ -1,13 +1,14 @@
 {
   "name": "{{projectName}}",
   "version": "1.0.0",
-  "description": "theme basic app",
+  "description": "theme basic extension",
   "main": "null",
   "scripts": {
-    "start": "shoplazza app serve",
-    "build": "shoplazza app build",
-    "deploy": "shoplazza app deploy",
-    "versions": "shoplazza app versions"
+    "start": "shoplazza te serve",
+    "build": "shoplazza te build",
+    "deploy": "shoplazza te deploy",
+    "versions": "shoplazza te versions",
+    "list": "shoplazza te list"
   },
   "keywords": [],
   "author": "",

package/lib/app/template/basic-app/theme-app/assets/index.css

@@ -1,4 +1,4 @@
-/* css code */
 .container {
-  color: red;
+  color: #da534d;
+  text-align: center;
 }

package/lib/app/template/basic-app/theme-app/assets-manifest.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/basic-app/theme-app/blocks/index.liquid

@@ -1,13 +1,15 @@
+{% use "{{projectName}}.css" %}
+
 <div id="{{projectName}}" class="container">
-  <p>Hello world</p>
+  <h1>SHOPLAZZA THEME EXTENSION</h1>
+  {% include "{{projectName}}" %}
 </div>
-{% include "{{projectName}}_snippet" %}
 
 {% schema %} 
 {
   "name": {
-    "en-US": "default name",
-    "zh-CN": "默认名称"
+    "en-US": "{{projectName}}-US",
+    "zh-CN": "{{projectName}}-CN"
   },
   "settings": []
 }

package/lib/app/template/basic-app/theme-app/snippets/index.liquid

@@ -1,5 +1,5 @@
 <div>
-    Shoplazza theme APP
+    <h3>BASIC TYPE</h3>
 </div>
 
 

package/lib/app/template/basic-app/theme-extension.config.json

@@ -0,0 +1,4 @@
+{
+  "extensionId": "",
+  "extensionName": "{{projectName}}"
+}

package/lib/app/template/embed-app/README.md

@@ -19,7 +19,7 @@ npm install -g shoplazza-cli
 创建主题插件项目模版
 
 ```bash
-shoplazza app create
+shoplazza te create
 ```
 
 ---
@@ -37,7 +37,7 @@ npm start
 或者
 
 ```bash
-shoplazza app serve
+shoplazza te serve
 ```
 
 ### `build`
@@ -51,12 +51,12 @@ npm run build
 或者
 
 ```bash
-shoplazza app build
+shoplazza te build
 ```
 
 ### `deploy`
 
-部署正式版本的主题插件（部署后插件在店铺的主题编辑器的app列表中可见）
+部署正式版本的主题插件
 
 ```bash
 npm run deploy
@@ -65,7 +65,7 @@ npm run deploy
 或者
 
 ```bash
-shoplazza app deploy
+shoplazza te deploy
 ```
 
 ### `versions`
@@ -79,6 +79,19 @@ npm run versions
 或者
 
 ```bash
-shoplazza app versions
+shoplazza te versions
 ```
 
+### `list`
+
+查询店铺的私有主题插件列表
+
+```bash
+npm run list
+```
+
+或者
+
+```bash
+shoplazza te list
+```

package/lib/app/template/embed-app/package.json

@@ -1,13 +1,14 @@
 {
   "name": "{{projectName}}",
   "version": "1.0.0",
-  "description": "theme embed app",
+  "description": "theme embed extension",
   "main": "null",
   "scripts": {
-    "start": "shoplazza app serve",
-    "build": "shoplazza app build",
-    "deploy": "shoplazza app deploy",
-    "versions": "shoplazza app versions"
+    "start": "shoplazza te serve",
+    "build": "shoplazza te build",
+    "deploy": "shoplazza te deploy",
+    "versions": "shoplazza te versions",
+    "list": "shoplazza te list"
   },
   "keywords": [],
   "author": "",

package/lib/app/template/embed-app/theme-app/assets-manifest.json

@@ -0,0 +1 @@
+{}

package/lib/app/template/embed-app/theme-app/blocks/index.liquid

@@ -1,15 +1,18 @@
+{% include "{{projectName}}_css" %}
+
 <div id="{{projectName}}" class="container">
-  <p>Hello world</p>
+  <h1>SHOPLAZZA THEME EXTENSION</h1>
+  {% include "{{projectName}}" %}
 </div>
-{% include "{{projectName}}_snippet" %}
 
 {% schema %} 
 {
   "name": {
-    "en-US": "default name",
-    "zh-CN": "默认名称"
+    "en-US": "{{projectName}}-US",
+    "zh-CN": "{{projectName}}-CN"
   },
   "target":"body",
+  "icon":"https://cdn.shoplazza.com/oss/operation/0aee0d0cff21440e95a08ec4c560c691.svg",
   "settings": []
 }
 {% endschema %}

package/lib/app/template/embed-app/theme-app/snippets/index.liquid

@@ -1,5 +1,5 @@
 <div>
-    Shoplazza theme APP
+    <h3>EMBED TYPE</h3>
 </div>
 
 

package/lib/app/template/embed-app/theme-app/snippets/index_css.liquid

@@ -0,0 +1,6 @@
+<style>
+.container {
+  color: #da534d;
+  text-align: center;
+}
+</style>

package/lib/app/template/embed-app/theme-extension.config.json

@@ -0,0 +1,4 @@
+{
+  "extensionId": "",
+  "extensionTitle": "{{projectName}}"
+}

package/lib/app/utils/config.js

@@ -3,7 +3,9 @@ const { get } = require('../../db/user');
 
 const WORKSPACE_PATH = process.cwd();
 
-const THEME_APP_PATH = path.resolve(WORKSPACE_PATH, 'theme-app');
+const THEME_APP_DIR_PATH = path.resolve(WORKSPACE_PATH, 'theme-app');
+
+const THEME_APP_CONFIG_PATH = path.resolve(WORKSPACE_PATH, 'theme-extension.config.json')
 
 const STORE_DOMAIN = get('store_domain');
 
@@ -11,18 +13,19 @@ const EXCHANGE_TOKEN = get('exchange_token');
 
 const THEME_APP_TYPE = {
   BASIC_APP: {
-    description: 'basic app(just an basic app)',
+    description: 'basic extension(just an basic extension)',
     templatePath: path.resolve(__dirname, '../template/basic-app')
   },
   EMBEDS_APP: {
-    description: 'embed app(embed in a theme)',
+    description: 'embed extension(embed in a theme)',
     templatePath: path.resolve(__dirname, '../template/embed-app')
   }
 };
 
 module.exports = {
   WORKSPACE_PATH,
-  THEME_APP_PATH,
+  THEME_APP_DIR_PATH,
+  THEME_APP_CONFIG_PATH,
   STORE_DOMAIN,
   EXCHANGE_TOKEN,
   THEME_APP_TYPE,

package/lib/app/utils/index.js

@@ -4,13 +4,13 @@ const chalk = require('chalk');
 const AdmZip = require('adm-zip');
 const md5 = require('md5');
 const { table } = require('table');
-const { WORKSPACE_PATH } = require('./config');
+const { WORKSPACE_PATH, THEME_APP_CONFIG_PATH } = require('./config');
 
 /**
  * 通用的占位符替换函数
  */
 const replacePlaceholders = async (filePath, replacements) => {
-  if (!(await fsExtra.pathExists(filePath))) {
+  if (!fsExtra.pathExistsSync(filePath)) {
     console.warn(`File "${filePath}" does not exist, skipping replacement.`);
     return;
   }
@@ -30,7 +30,7 @@ const replacePlaceholders = async (filePath, replacements) => {
  * @param {string} targetName - 新的文件名
  */
 const renameFile = async (filePath, targetName) => {
-  if (!(await fsExtra.pathExists(filePath))) {
+  if (!fsExtra.pathExistsSync(filePath)) {
     console.warn(`File "${filePath}" does not exist, skipping.`);
     return;
   }
@@ -43,13 +43,12 @@ const renameFile = async (filePath, targetName) => {
  * @returns {Promise<string>}
  */
 async function getThemeAppConfig() {
-  const configFilePath = path.join(WORKSPACE_PATH, 'theme-app.config.json');
-  if (!(await fsExtra.pathExists(configFilePath))) {
+  if (!fsExtra.pathExistsSync(THEME_APP_CONFIG_PATH)) {
     throw new Error(
-      `The current workspace is not a valid theme app project, because "${WORKSPACE_PATH}" is missing the required "theme-app.config.json" file.`
+      `The current workspace is not a valid theme extension project, because "${WORKSPACE_PATH}" is missing the required "theme-extension.config.json" file.`
     );
   }
-  return fsExtra.readJson(configFilePath);
+  return fsExtra.readJson(THEME_APP_CONFIG_PATH);
 }
 
 /**
@@ -59,7 +58,7 @@ async function getThemeAppConfig() {
 async function setThemeAppConfig(config) {
   const oldThemeAppConfig = await getThemeAppConfig();
   const newThemeAppConfig = { ...oldThemeAppConfig, ...config };
-  await fsExtra.writeJson(configFilePath, newThemeAppConfig, { spaces: 2 });
+  await fsExtra.writeJson(THEME_APP_CONFIG_PATH, newThemeAppConfig, { spaces: 2 });
 }
 
 /**
@@ -68,7 +67,7 @@ async function setThemeAppConfig(config) {
  * @returns {Promise<string>} 返回基于文件夹内容的哈希值
  */
 async function calculateFolderHash(dirPath) {
-  if (!(await fsExtra.pathExists(dirPath))) {
+  if (!fsExtra.pathExistsSync(dirPath)) {
     throw new Error(chalk.red(`Calculate folder hash path does not exist: ${dirPath}`));
   }
   const files = await fsExtra.readdir(dirPath);
@@ -96,7 +95,7 @@ async function calculateFolderHash(dirPath) {
  * @returns {Promise<Object>} 返回压缩文件的生成路径&压碎文件名
  */
 async function compress(sourcePath) {
-  if (!(await fsExtra.pathExists(sourcePath))) {
+  if (!fsExtra.pathExistsSync(sourcePath)) {
     throw new Error(chalk.red(`Compress path does not exist: ${sourcePath}`));
   }
   const sourceName = path.basename(sourcePath);
@@ -117,7 +116,6 @@ async function compress(sourcePath) {
       if (err) {
         reject(err);
       } else {
-        console.log(chalk.green(`Source path compressed successfully. File saved at: ${outputPath}`));
         resolve({
           zipPath: outputPath,
           zipName: fileName
@@ -156,10 +154,7 @@ function compareVersions(version1, version2) {
  * @param {string} filePath - 文件的绝对路径
  * @returns {{ fileName: string, parentDirName: string }} 返回包含文件名和父目录名的对象
  */
-async function getFileInfo(filePath) {
-  if (!(await fsExtra.pathExists(filePath))) {
-    throw new Error(chalk.red(`File path does not exist: ${filePath}`));
-  }
+function getFileInfo(filePath) {
   const fileName = path.basename(filePath);
   const parentDirName = path.basename(path.dirname(filePath));
   return { fileName, parentDirName };
@@ -206,8 +201,6 @@ function renderTable(data, options) {
   });
 }
 
-
-
 module.exports = {
   replacePlaceholders,
   renameFile,

package/lib/oss.js

@@ -3,7 +3,6 @@ const fs = require('fs');
 const path = require('path');
 const FormData = require('form-data');
 const chalk = require('chalk');
-const loading = require('loading-cli');
 
 /**
  * 获取OSS上传功能，适用于上传文件到店铺的OSS服务器
@@ -67,7 +66,6 @@ function useOss(accessToken, storeDomain, storeDomainTips) {
    * console.log(ossUrl);  // 输出文件的 OSS 地址
    */
   async function uploadOss(filePath) {
-    console.log(chalk.green('正在上传文件到OSS...',filePath));
     let fileName = path.basename(filePath);
     const key = 'chick-extension/' + fileName;
     const form = new FormData();
@@ -90,7 +88,6 @@ function useOss(accessToken, storeDomain, storeDomainTips) {
       });
       return `${data.read_host}${data.read_host.endsWith('/') ? '' : '/'}${key}`;
     });
-    loading('succeed upload').succeed();
     return url;
   }
 

package/lib/utils.js

@@ -124,7 +124,7 @@ exports.getSSOAuthUrl = (store) => {
  * @param {any} [options.xxx] - 其他chokidar.watch配置项
  * @returns {Function} - 取消监听的函数
  */
-exports.initWatcher = (workspace, options = {}) => {
+exports.watchWorkspace = (workspace, options = {}) => {
   if (!fsExtra.pathExistsSync(workspace)) {
     console.error(chalk.red(`[ERROR] "${workspace}" does not exist.`));
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoplazza-cli",
-  "version": "1.0.6",
+  "version": "1.0.7-beta.1",
   "description": "",
   "main": "bin/shoplazza",
   "engines": {

package/lib/app/api/api.js

@@ -1,93 +0,0 @@
-const { get, post, put, del, patch } = require('./request');
-
-/**
- * 获取主题列表
- */
-async function getThemeList() {
-  return get('/themes');
-}
-
-/**
- * 获取店铺私有主题插件列表
- * @returns
- */
-async function getThemeAppList() {
-  return [
-    {
-      name: '主题插件1',
-      version: '1.0.0',
-      description: '主题插件1的描述'
-    },
-    {
-      name: '主题插件2',
-      version: '2.0.0',
-      description: '主题插件2的描述'
-    },
-    {
-      name: '主题插件3',
-      version: '3.0.0',
-      description: '主题插件3的描述'
-    }
-  ];
-  // return get('/theme-extensions');
-}
-
-/**
- * 创建主题插件
- */
-async function toCreateThemeApp(data) {
-  return put('/theme-extensions', data);
-}
-
-/**
- * 上传主题插件
- */
-async function toUploadThemeApp(data) {
-  return patch(`theme-extensions/${data.appId}/dev-doctree`, data);
-}
-
-/**
- * 获取任务状态
- */
-async function getTaskStatus(data) {
-  return get(`/theme-extensions/version-tasks/${data.taskId}`);
-}
-
-/**
- * 获取主题插件版本列表
- */
-async function getThemeAppVersionList(data) {
-  return [
-    { version: '1.0.0', date: '2023-01-01', description: 'Initial release' },
-    { version: '1.1.0', date: '2023-02-01', description: 'Added new features and bug fixes' },
-    { version: '1.2.0', date: '2023-03-01', description: 'Fixed bugs and improved performance' },
-    { version: '1.3.0', date: '2023-04-01', description: 'Optimized performance and added new features' },
-    { version: '1.4.0', date: '2023-05-01', description: 'Fixed bugs and improved user experience' }
-  ];
-  // return get(`/theme-extensions/:${data.appId}/versions`);
-}
-
-/**
- * 创建主题插件版本
- */
-async function toCreateThemeAppVersion(data) {
-  return post(`/theme-extensions/version-tasks`, data);
-}
-
-/**
- * 部署主题插件
- */
-async function toDeployThemeApp(data) {
-  return post(`theme-extensions/publications`, data);
-}
-
-module.exports = {
-  getThemeList,
-  getThemeAppList,
-  toCreateThemeApp,
-  toUploadThemeApp,
-  getThemeAppVersionList,
-  toCreateThemeAppVersion,
-  toDeployThemeApp,
-  getTaskStatus
-};

package/lib/app/api/request.js

@@ -1,72 +0,0 @@
-const instance = require('../../openAPI/index');
-
-/**
- * 基础的 API 请求方法
- * @param {string} method 请求方法 (GET, POST, PUT, DELETE)
- * @param {string} url 请求的路径
- * @param {Object} data 请求的数据（适用于 POST、PUT）
- * @param {Object} params 请求的 URL 参数（适用于 GET）
- */
-async function request({ method, url, data, params }) {
-  const response = await instance({
-    method,
-    url,
-    data,
-    params
-  });
-  return response; // 返回请求结果
-}
-
-/**
- * GET 请求封装
- * @param {string} url 请求的路径
- * @param {Object} params 请求的 URL 参数
- */
-async function get(url, params) {
-  return request({ method: 'get', url, params });
-}
-
-/**
- * POST 请求封装
- * @param {string} url 请求的路径
- * @param {Object} data 请求的数据
- */
-async function post(url, data) {
-  return request({ method: 'post', url, data });
-}
-
-/**
- * PUT 请求封装
- * @param {string} url 请求的路径
- * @param {Object} data 请求的数据
- */
-async function put(url, data) {
-  return request({ method: 'put', url, data });
-}
-
-/**
- * DELETE 请求封装
- * @param {string} url 请求的路径
- * @param {Object} params 请求的 URL 参数
- */
-async function del(url, params) {
-  return request({ method: 'delete', url, params });
-}
-
-/**
- * PATCH 请求封装
- * @param {string} url 请求的路径
- * @param {Object} data 请求的数据
- */
-async function patch(url, data) {
-  return request({ method: 'patch', url, data });
-}
-
-
-module.exports = {
-  get,
-  post,
-  put,
-  del,
-  patch
-};

package/lib/app/template/basic-app/.ci/k8s.yaml

@@ -1,4 +0,0 @@
-deployJob:
-  name: {{projectName}}-deployjob
-alarmHandler:
-  group: none

package/lib/app/template/basic-app/theme-app.config.json

@@ -1,4 +0,0 @@
-{
-  "appId": "",
-  "appName": "{{projectName}}"
-}

package/lib/app/template/embed-app/.ci/k8s.yaml

@@ -1,4 +0,0 @@
-deployJob:
-  name: {{projectName}}-deployjob
-alarmHandler:
-  group: none

package/lib/app/template/embed-app/theme-app/assets/index.css

@@ -1,4 +0,0 @@
-/* css code */
-.container {
-  color: red;
-}

package/lib/app/template/embed-app/theme-app.config.json

@@ -1,4 +0,0 @@
-{
-  "appId": "",
-  "appName": ""
-}