shoplazza-cli 1.0.2 → 1.0.4

package/examples/checkout-extension/extensions/add-shipping-desc/src/index.js

@@ -1,4 +1,4 @@
-import { extend } from "@shoplazza/extension-ui";
+import { extend } from "shoplazza-extension-ui";
 
 extend({
   extensionPoint: "Checkout::ShippingLinesTitle::RenderAfter",

package/examples/checkout-extension/extensions/ext-1/src/index.js

@@ -1,4 +1,4 @@
-import { extend } from '@shoplazza/extension-ui';
+import { extend } from 'shoplazza-extension-ui';
 import index from './index.html';
 
 function App() {

package/examples/checkout-extension/extensions/product-list/extension.json

@@ -0,0 +1,10 @@
+{
+  "version": "1.0",
+  "deleteTarget": [],
+  "placeholder": {},
+  "templateName": "checkout",
+  "themeName": "",
+  "extensionId": "",
+  "extensionName": "product-list",
+  "extensionDescription": ""
+}

package/examples/checkout-extension/extensions/product-list/src/index.js

@@ -0,0 +1,5 @@
+const productList = CheckoutAPI.summary.getProductList();
+
+console.debug('productList', productList);
+
+//  do something, such as report

package/examples/checkout-extension/extensions/rewrite-navigate/src/index.js

@@ -1,4 +1,4 @@
-import { extend } from '@shoplazza/extension-ui';
+import { extend } from 'shoplazza-extension-ui';
 import index from './index.html';
 
 function App() {

package/examples/checkout-extension/package-lock.json

@@ -0,0 +1,121 @@
+{
+  "name": "checkout-extension",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "checkout-extension",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "fs-extra": "11.1.1",
+        "shoplazza-extension-ui": "1.0.0"
+      },
+      "devDependencies": {}
+    },
+    "node_modules/fs-extra": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
+      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "license": "ISC"
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/react": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.2"
+      },
+      "peerDependencies": {
+        "react": "^18.3.1"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.23.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "node_modules/shoplazza-extension-ui": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shoplazza-extension-ui/-/shoplazza-extension-ui-1.0.0.tgz",
+      "integrity": "sha512-gW2sWnfyEXwbWfi9Sje4K+r0ECCHjF7lID/igWplMi8opOiTI+88JurPHuwtBAhC3V0T2WZvBlcykHWjNQzYBA==",
+      "license": "MIT",
+      "dependencies": {
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    }
+  }
+}

package/examples/checkout-extension/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "fs-extra": "11.1.1",
-    "@shoplazza/extension-ui": "2.0.8"
+    "shoplazza-extension-ui": "1.0.0"
   },
   "devDependencies": {},
   "scripts": {

package/lib/checkout/api.js

@@ -7,6 +7,7 @@ const { openAipVersion } = require('./config');
 const { isDebug } = require('./console');
 const { getProjectConfig } = require('./util');
 const chalk = require('chalk');
+const { consoleWarn } = require('./console');
 
 const FILE_SIGN_URL = '/checkout_extensions/file/sign';
 const CREATE_URL = '/checkout_extensions/create';
@@ -39,13 +40,13 @@ request.interceptors.request.use((config) => {
   return config;
 });
 
-const handleResponseError = (response)=>{
+const handleResponseError = (response) => {
   if (response.data?.status === 3 && response.data?.message === 'INVALID_ARGUMENT') {
     throw `Invalid argument at ${response.config.url}`;
-  }else if(response.data?.status === 13 && response.data?.message === 'INTERNAL_ERROR'){
+  } else if (response.data?.status === 13 && response.data?.message === 'INTERNAL_ERROR') {
     throw `Internal error at ${response.config.url}`;
   }
-}
+};
 
 request.interceptors.response.use(
   (response) => {
@@ -71,11 +72,11 @@ request.interceptors.response.use(
 
 async function upload(path, name) {
   const form = new FormData();
-  await request(`${FILE_SIGN_URL}?key=${name}`)
+  const url = await request(`${FILE_SIGN_URL}?key=${name}`)
     .then((data) => {
       return data.data;
     })
-    .then((data) => {
+    .then(async (data) => {
       const url = data.write_host;
       form.append('policy', data.policy);
       form.append('OSSAccessKeyId', data.access_id);
@@ -84,13 +85,25 @@ async function upload(path, name) {
       form.append('x-oss-forbid-overwrite', 'true');
       form.append('key', name);
       form.append('file', fs.createReadStream(path));
-      return request.post(`https:${url}`, form, { headers: form.getHeaders() });
+      await request.post(`https:${url}`, form, { headers: form.getHeaders() }).catch((error) => {
+        if (error.response?.data.includes('<Code>FileAlreadyExists</Code>')) {
+          consoleWarn('The current file already exists, not need to upload.');
+          return;
+        } else {
+          return Promise.reject(error);
+        }
+      });
+      return `${data.read_host}${data.read_host.endsWith('/') ? '' : '/'}${name}`;
     });
   loading('succeed upload').succeed();
+  return url;
 }
 
+async function uploadFile(dirPath, file) {
+  return upload(`${dirPath}/${file}`, `chick-extension/${file}`);
+}
 async function uploadDir(dirPath, files) {
-  await Promise.all(
+  return Promise.all(
     files.map((file) => {
       return upload(`${dirPath}/${file}`, `chick-extension/${file}`);
     })
@@ -98,8 +111,8 @@ async function uploadDir(dirPath, files) {
 }
 
 module.exports = {
-  upload,
   uploadDir,
+  uploadFile,
   getExtensionList: async (params) => {
     const load = loading('Fetch extension list').start();
     try {

package/lib/checkout/push.js

@@ -26,9 +26,9 @@ module.exports = async () => {
     }; // 兼容旧代码处理
     await viteBuild(composeCommands);
     consoleBlue('Starting to upload:');
-    await uploadOSS(composeCommands);
+    const url = await uploadOSS(composeCommands);
     consoleBlue('Starting to push:');
-    await pushExtension(composeCommands, extensionInfo);
+    await pushExtension(composeCommands, extensionInfo, url);
   } catch (error) {
     error.response ? consoleError(`Error: ${error.response.status}-${error.response.config.url}`) : consoleError(error);
   }
@@ -46,31 +46,27 @@ async function uploadOSS(command) {
   }
   const files = fsExtra.readdirSync(dir).filter((name) => name.includes(info.id));
   try {
-    await api.uploadDir(dir, files);
+    const url = await api.uploadFile(dir, files[0]);
+    consoleSuccess('Successfully uploaded to OSS.');
+    return url;
   } catch (error) {
-    if (error.response?.data.includes('<Code>FileAlreadyExists</Code>')) {
-      consoleWarn('The current file already exists, not need to upload.');
-      return;
-    } else {
-      consoleError('Failed to upload to OSS:', error);
-      throw 'upload_failed';
-    }
+    consoleError('Failed to upload to OSS:', error);
+    throw 'upload_failed';
   }
-  consoleSuccess('Successfully uploaded to OSS.');
 }
 
 /**
  * 发布
  * @returns
  */
-async function pushExtension(command, extraInfo) {
+async function pushExtension(command, extraInfo, url) {
   const info = getExtensionInfo(command.id);
   const load = loading(`start push the extension ${info.id}.`).start();
   try {
     const config = getExtensionConfig(command.id);
     // 兼容低版本extension配置文件
     const data = {
-      resource_url: `https://cn.static.shoplazza.com/chick-extension/${info.distName}`,
+      resource_url: url,
       version: config.version,
       scope: '',
       template_name: config.templateName || config.template_name,
@@ -91,7 +87,7 @@ async function pushExtension(command, extraInfo) {
       setExtensionConfig(command.id, {
         ...config,
         extensionId: extensionInfo.extension_id,
-        extensionName: extensionInfo.name,
+        extensionName: extensionInfo.name
       });
     }
 
@@ -111,7 +107,6 @@ async function pushExtension(command, extraInfo) {
     } catch (error) {
       consoleError(error);
     }
-
   } catch (err) {
     load.stop();
     throw '\nFailed to push the extension: ' + err;

package/lib/checkout/template/extensions/extension-template/src/index.js

@@ -1,4 +1,4 @@
-import { extend } from '@shoplazza/extension-ui';
+import { extend } from 'shoplazza-extension-ui';
 import index from './index.html';
 
 function App() {

package/lib/checkout/template/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "fs-extra": "11.1.1",
-    "@shoplazza/extension-ui": "2.0.8"
+    "shoplazza-extension-ui": "1.0.0"
   },
   "devDependencies": {},
   "scripts": {

package/lib/checkout/util.js

@@ -170,11 +170,9 @@ function checkLocalExtension(extensionInfo) {
     const extensionJsonPath = path.resolve(extensionPath, './extension.json');
     const localExtensionInfo = JSON.parse(fs.readFileSync(extensionJsonPath, 'utf8'));
     if (localExtensionInfo.extensionId !== extensionInfo.extension_id) {
-      consoleError(`The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`);
       throw `The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`;
     }
   } else {
-    consoleError(`The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`);
     throw `The extension ${extensionInfo.name}(${extensionInfo.extension_id}) does not exist in your local project.`;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoplazza-cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "bin/shoplazza",
   "engines": {
@@ -13,10 +13,6 @@
     "prettier": "prettier --write ./lib",
     "test": "jest --runInBand --forceExit"
   },
-  "repository": {
-    "type": "git",
-    "url": "git@gitlab.shoplazza.site:shoplaza/frontend/openapi/shoplazza-cli.git"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -28,7 +24,6 @@
   "dependencies": {
     "@sentry/node": "^6.19.7",
     "@sentry/tracing": "^6.19.7",
-    "@shoplazza/extension-ui": "^1.0.0",
     "adm-zip": "^0.5.9",
     "ali-oss": "^6.17.1",
     "archiver": "^5.3.1",