Merge pull request #16 from Apillon/v1.0.1

V1.0.1
Apillon · Nov 29, 2023 · 2b9f86a · 2b9f86a
2 parents 43f3114 + e088021
commit 2b9f86a
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 51 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apillon-web3-tools",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Monorepo for Apillon tools",
   "author": "Apillon",
   "license": "MIT",
@@ -11,7 +11,7 @@
     "test": "npx turbo run test",
     "cli-install": "npx turbo run cli-install",
     "dev": "npx turbo run dev",
-    "publish-all": "npx turbo run publish-package",
+    "publish-beta": "npx turbo run publish-beta",
     "build": "npx turbo run build",
     "lint": "npx turbo run lint"
   },

diff --git a/packages/cli/README.md b/packages/cli/README.md
@@ -34,18 +34,15 @@ npx @apillon/cli <command> [options]
 
 ### Global Options
 
-- `--api-url <api url>`: Apillon API URL (default: Production API URL, can be set via the `APILLON_API_URL` environment
-  variable).
 - `--key <api key>`: Apillon API key (can be set via the `APILLON_API_KEY` environment variable).
 - `--secret <api secret>`: Apillon API secret (can be set via the `APILLON_API_SECRET` environment variable).
 - `--debug`: Output execution logs when running commands.
 - `-V`, `--version`: Output the version number.
 
 ### Environment Variables
 
-You can use environment variables to set the API URL, API key, and API secret:
+You can use environment variables to set an API key, and an API secret:
 
-- `APILLON_API_URL`: Apillon API URL.
 - `APILLON_API_KEY`: Apillon API key.
 - `APILLON_API_SECRET`: Apillon API secret.
 

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@apillon/cli",
   "description": "▶◀ Apillon CLI tools ▶◀",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Apillon",
   "license": "MIT",
   "main": "./dist/index.js",
@@ -25,7 +25,8 @@
     "dev": "tsc --declarationMap --watch",
     "lint": "tsc --declarationMap && eslint \"{src,test}/**/*.ts\" --fix",
     "cli-install": "tsc && npm uninstall -g ; npm i -g",
-    "publish-package": "npm publish"
+    "publish-package": "npm publish",
+    "publish-beta": "npm publish --tag beta"
   },
   "bin": {
     "apillon": "./dist/index.js",
@@ -55,7 +56,6 @@
     "axios": "^1.3.4",
     "chalk": "^4.1.2",
     "commander": "^10.0.0",
-    "dotenv": "^16.0.3",
     "@apillon/sdk": "*"
   }
 }
diff --git a/packages/cli/src/config.ts b/packages/cli/src/config.ts
@@ -1,8 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-import * as dotenv from 'dotenv';
-
-dotenv.config();
-
 function getVersion(rollback: string) {
   try {
     return require('./package.json').version;
@@ -17,7 +12,4 @@ function getVersion(rollback: string) {
 
 export default {
   VERSION: getVersion('1.0.0'),
-  APILLON_API_KEY: process.env.APILLON_API_KEY,
-  APILLON_API_SECRET: process.env.APILLON_API_SECRET,
-  APILLON_API_URL: process.env.APILLON_API_URL || 'https://api.apillon.io',
 };
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -31,12 +31,6 @@ cli.addOption(
     .env('APILLON_API_SECRET')
     .makeOptionMandatory(),
 );
-cli.addOption(
-  new Option('--api-url <api url>', 'Apillon API secret')
-    .env('APILLON_API_URL')
-    .default('https://api.apillon.io', 'Production API url')
-    .makeOptionMandatory(),
-);
 
 cli.addOption(
   new Option('--debug', 'Output debug messages').env('APILLON_DEBUG'),

diff --git a/packages/cli/src/lib/types.ts b/packages/cli/src/lib/types.ts
@@ -5,6 +5,5 @@ export interface Options {
 export interface GlobalOptions {
   key: string;
   secret: string;
-  apiUrl?: string;
   [key: string]: string;
 }
diff --git a/packages/sdk/README.md b/packages/sdk/README.md
@@ -73,7 +73,6 @@ import * as fs from 'fs';
 const hosting = new Hosting({
   key: 'yourApiKey',
   secret: 'yourApiSecret',
-  apiUrl: 'https://api.apillon.io',
   logLevel: LogLevel.VERBOSE,
 });
 await hosting.listWebsites({ orderBy: 'createTime' });
@@ -124,7 +123,6 @@ import * as fs from 'fs';
 const storage = new Storage({
   key: 'yourApiKey',
   secret: 'yourApiSecret',
-  apiUrl: 'https://api.apillon.io',
   logLevel: LogLevel.VERBOSE,
 });
 await storage.listBuckets({ limit: 5 });
@@ -178,7 +176,6 @@ import {
 const nft = new Nft({
   key: 'yourApiKey',
   secret: 'yourApiSecret',
-  apiUrl: 'https://api.apillon.io',
   logLevel: LogLevel.VERBOSE,
 });
 await nft.create({

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@apillon/sdk",
   "description": "▶◀ Apillon SDK for NodeJS ▶◀",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Apillon",
   "license": "MIT",
   "main": "./dist/index.js",
@@ -26,6 +26,7 @@
     "dev": "tsc --declarationMap --watch",
     "lint": "tsc --declarationMap && eslint \"{src,test}/**/*.ts\" --fix",
     "publish-package": "npm publish",
+    "publish-beta": "npm publish --tag beta",
     "test": "npx jest",
     "generate-docs": "npx typedoc src/docs-index.ts --sort enum-value-ascending"
   },
@@ -79,4 +80,4 @@
     "preset": "ts-jest",
     "verbose": true
   }
-}
+}
diff --git a/packages/sdk/src/lib/apillon.ts b/packages/sdk/src/lib/apillon.ts
@@ -32,19 +32,9 @@ export interface ApillonConfig {
 
 export class ApillonModule {
   public constructor(config?: ApillonConfig) {
-    const defaultConfig: ApillonConfig = {
-      key: process.env.APILLON_API_KEY,
-      secret: process.env.APILLON_API_SECRET,
-      apiUrl: process.env.APILLON_API_URL || 'https://api.apillon.io',
-      logLevel: LogLevel.ERROR,
-      debug: false,
-    };
-
-    const mergedConfig = { ...defaultConfig, ...config };
-
-    ApillonApi.initialize(mergedConfig);
+    ApillonApi.initialize(config);
     ApillonLogger.initialize(
-      mergedConfig.debug ? LogLevel.VERBOSE : mergedConfig.logLevel,
+      config.debug ? LogLevel.VERBOSE : config.logLevel || LogLevel.ERROR,
     );
   }
 }

diff --git a/packages/sdk/src/modules/hosting/hosting-website.ts b/packages/sdk/src/modules/hosting/hosting-website.ts
@@ -103,12 +103,12 @@ export class HostingWebsite extends ApillonModel {
       })`,
     );
 
-    ApillonLogger.logWithTime('Deploy start');
+    ApillonLogger.logWithTime('Initiating deployment');
     const { data } = await ApillonApi.post<any>(`${this.API_PREFIX}/deploy`, {
       environment: toEnvironment,
     });
 
-    ApillonLogger.logWithTime('Deploy complete');
+    ApillonLogger.logWithTime('Deployment in progress');
 
     return data;
   }

diff --git a/packages/sdk/src/tests/helpers/helper.ts b/packages/sdk/src/tests/helpers/helper.ts
@@ -9,7 +9,6 @@ export function getConfig(): ApillonConfig {
   dotenv.config({ path: envPath });
 
   return {
-    apiUrl: process.env['APILLON_API_URL'],
     secret: process.env['APILLON_API_SECRET'],
     key: process.env['APILLON_API_KEY'],
     logLevel: LogLevel.VERBOSE,

diff --git a/turbo.json b/turbo.json
@@ -2,28 +2,39 @@
   "$schema": "https://turborepo.org/schema.json",
   "pipeline": {
     "build": {
-      "dependsOn": ["^build"],
-      "outputs": ["dist/**"]
+      "dependsOn": [
+        "^build"
+      ],
+      "outputs": [
+        "dist/**"
+      ]
     },
     "cli-install": {
-      "dependsOn": ["^build"],
+      "dependsOn": [
+        "^build"
+      ],
       "outputs": []
     },
     "dev": {
       "dependsOn": [],
       "outputs": []
     },
-    "publish-package": {
-      "dependsOn": ["^build"],
+    "publish-beta": {
+      "dependsOn": [
+        "^build",
+        "^publish-beta"
+      ],
       "outputs": []
     },
     "lint": {
       "outputs": []
     },
     "test": {
       "cache": false,
-      "dependsOn": ["^build"],
+      "dependsOn": [
+        "^build"
+      ],
       "outputs": []
     }
   }
-}
+}