fix debug

Signed-off-by: zxypro1 <[email protected]>
Serverless-Devs · Aug 12, 2024 · a0bbea4 · a0bbea4
1 parent 6991696
commit a0bbea4
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 26 deletions.
diff --git a/packages/engine/package.json b/packages/engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/engine",
-  "version": "0.1.4-beta.17",
+  "version": "0.1.4-beta.18",
   "description": "a engine lib for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/engine/src/actions/index.ts b/packages/engine/src/actions/index.ts
@@ -1,7 +1,7 @@
 import { IAction, IActionLevel, IActionType, IAllowFailure, IComponentAction, IHookType, IPluginAction, IRunAction, getInputs } from '@serverless-devs/parse-spec';
 import { isEmpty, filter, includes, set, get } from 'lodash';
 import * as utils from '@serverless-devs/utils';
-import { DevsError, ETrackerType, isDevsDebugMode } from '@serverless-devs/utils';
+import { DevsError, ETrackerType } from '@serverless-devs/utils';
 import fs from 'fs-extra';
 import { spawn } from 'child_process';
 import loadComponent from '@serverless-devs/load-component';
@@ -12,7 +12,7 @@ import { ILoggerInstance } from '@serverless-devs/logger';
 import { EXIT_CODE } from '../constants';
 import { IStepOptions } from '../types';
 
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:engine') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:engine');
 
 interface IRecord {
   magic: Record<string, any>; // 记录魔法变量

diff --git a/packages/engine/src/index.ts b/packages/engine/src/index.ts
@@ -10,14 +10,14 @@ import Credential from '@serverless-devs/credential';
 import loadComponent from '@serverless-devs/load-component';
 import Logger, { ILoggerInstance } from '@serverless-devs/logger';
 import SecretManager from '@serverless-devs/secret';
-import { DevsError, ETrackerType, emoji, getAbsolutePath, getRootHome, getUserAgent, traceid, isDevsDebugMode } from '@serverless-devs/utils';
+import { DevsError, ETrackerType, emoji, getAbsolutePath, getRootHome, getUserAgent, traceid } from '@serverless-devs/utils';
 import { EXIT_CODE, INFO_EXP_PATTERN, COMPONENT_EXP_PATTERN } from './constants';
 import assert from 'assert';
 import Ajv from 'ajv';
 export * from './types';
 export { verify, preview, init } from './utils';
 
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:engine') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:engine');
 
 /**
  * Engine Class

diff --git a/packages/load-application/package.json b/packages/load-application/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/load-application",
-  "version": "0.0.14-beta.10",
+  "version": "0.0.14-beta.11",
   "description": "load application for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/load-application/src/index.ts b/packages/load-application/src/index.ts
@@ -4,8 +4,7 @@ import assert from 'assert';
 import { IOptions } from './types';
 import { includes, get } from 'lodash';
 import { REGISTRY } from './constant';
-import { isDevsDebugMode } from '@serverless-devs/utils';
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:load-application') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:load-application');
 
 export default async (template: string, options: IOptions = {}) => {
   debug(`load application, template: ${template}, options: ${JSON.stringify(options)}`);

diff --git a/packages/load-application/src/v2.ts b/packages/load-application/src/v2.ts
@@ -3,7 +3,7 @@ import fs from 'fs-extra';
 import axios from 'axios';
 import download from '@serverless-devs/downloads';
 import artTemplate from 'art-template';
-import { getYamlContent, isCiCdEnvironment, getYamlPath, isDevsDebugMode } from '@serverless-devs/utils';
+import { getYamlContent, isCiCdEnvironment, getYamlPath } from '@serverless-devs/utils';
 import { isEmpty, includes, split, get, has, set, sortBy, map, concat, keys, find, startsWith } from 'lodash';
 import parse from './parse';
 import { IProvider, IOptions } from './types';
@@ -14,7 +14,7 @@ import chalk from 'chalk';
 import Credential from '@serverless-devs/credential';
 import { gray } from './constant';
 import assert from 'assert';
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:load-application') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:load-application');
 
 class LoadApplication {
   private provider: `${IProvider}`;

diff --git a/packages/load-application/src/v3.ts b/packages/load-application/src/v3.ts
@@ -3,7 +3,7 @@ import fs from 'fs-extra';
 import download from '@serverless-devs/downloads';
 import _artTemplate from 'art-template';
 import _devsArtTemplate from '@serverless-devs/art-template';
-import { getYamlContent, registry, isCiCdEnvironment, getYamlPath, isDevsDebugMode } from '@serverless-devs/utils';
+import { getYamlContent, registry, isCiCdEnvironment, getYamlPath } from '@serverless-devs/utils';
 import { isEmpty, includes, split, get, has, set, sortBy, map, concat, keys, startsWith, merge } from 'lodash';
 import axios from 'axios';
 import parse from './parse';
@@ -14,7 +14,7 @@ import inquirer from 'inquirer';
 import chalk from 'chalk';
 import Credential from '@serverless-devs/credential';
 import { CONFIGURE_LATER, DEFAULT_MAGIC_ACCESS, GITHUB_REGISTRY, gray, DIPPER_VARIABLES_PATH } from './constant';
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:load-appliaction') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:load-application');
 
 class LoadApplication {
   /**
@@ -215,7 +215,7 @@ class LoadApplication {
    * 判断s.yaml目录是否有variable.yaml，拼接到publishData
    */
   private parseVariableYaml() {
-    const variablePath = getYamlPath(path.join(this.filePath, 'variable.yaml'));
+    const variablePath = getYamlPath(path.join(this.filePath, DIPPER_VARIABLES_PATH));
     if (variablePath && fs.pathExistsSync(variablePath)) {
       const variableYaml = getYamlContent(variablePath);
       const services = get(variableYaml, 'services', {});

diff --git a/packages/load-component/package.json b/packages/load-component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/load-component",
-  "version": "0.0.8-beta.1",
+  "version": "0.0.8-beta.2",
   "description": "request for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/load-component/src/index.ts b/packages/load-component/src/index.ts
@@ -2,10 +2,10 @@ import fs from 'fs-extra';
 import { buildComponentInstance, getProvider, getZipballUrl, getComponentCachePath } from './utils';
 import download from '@serverless-devs/downloads';
 import { get } from 'lodash';
-import { readJson, registry, getLockFile, isDevsDebugMode } from '@serverless-devs/utils';
+import { readJson, registry, getLockFile } from '@serverless-devs/utils';
 import assert from 'assert';
 import semver from 'semver';
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:load-component') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:load-component');
 
 export class Component {
   constructor(private name: string, private params: Record<string, any> = {}, private cleanCache: boolean = false) {

diff --git a/packages/load-component/src/utils/index.ts b/packages/load-component/src/utils/index.ts
@@ -2,10 +2,10 @@ import path from 'path';
 import fs from 'fs-extra';
 import { get, includes, find, split, filter, isEmpty } from 'lodash';
 import axios from 'axios';
-import { getRootHome, getYamlContent, registry, isDevsDebugMode } from '@serverless-devs/utils';
+import { getRootHome, getYamlContent, registry } from '@serverless-devs/utils';
 import { BASE_URL } from '../constant';
 import assert from 'assert';
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:load-component') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:load-component');
 const getUrlWithLatest = (name: string) => `${BASE_URL}/packages/${name}/release/latest`;
 const getUrlWithVersion = (name: string, versionId: string) => `${BASE_URL}/packages/${name}/release/tags/${versionId}`;
 

diff --git a/packages/parse-spec/package.json b/packages/parse-spec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/parse-spec",
-  "version": "0.0.28-beta.13",
+  "version": "0.0.28-beta.14",
   "description": "a parse yaml spec lib for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/parse-spec/src/index.ts b/packages/parse-spec/src/index.ts
@@ -14,9 +14,9 @@ import { each, filter, find, get, has, includes, isArray, isEmpty, isString, key
 import { ISpec, IYaml, IActionType, IActionLevel, IStep, IRecord } from './types';
 import { ENVIRONMENT_FILE_NAME, ENVIRONMENT_FILE_PATH, ENVIRONMENT_KEY, REGX } from './contants';
 import assert from 'assert';
-import { DevsError, ETrackerType, isDevsDebugMode } from '@serverless-devs/utils';
+import { DevsError, ETrackerType } from '@serverless-devs/utils';
 const extend2 = require('extend2');
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:parse-spec') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:parse-spec');
 
 interface IOptions {
   argv?: string[];

diff --git a/packages/parse-spec/src/order.ts b/packages/parse-spec/src/order.ts
@@ -1,8 +1,7 @@
 import { includes, map, split, set, sortBy, isEmpty, get, cloneDeep, unset, isObject } from 'lodash';
 import { REGXG } from './contants';
 import { IStep } from './types';
-import { isDevsDebugMode } from '@serverless-devs/utils';
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:parse-spec') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:parse-spec');
 
 class Order {
   private useOrder = false; // 是否使用分析出来的order

diff --git a/packages/parse-spec/src/parse-content.ts b/packages/parse-spec/src/parse-content.ts
@@ -2,10 +2,9 @@ import path from 'path';
 import getInputs from './get-inputs';
 import { IStep } from './types';
 import { getCredential } from './utils';
-import { isDevsDebugMode } from '@serverless-devs/utils';
 import { each, get, omit, set, pickBy, cloneDeep, isEmpty, find } from 'lodash';
 const extend2 = require('extend2');
-const debug = isDevsDebugMode() ? require('@serverless-cd/debug')('serverless-devs:parse-spec') : (i: any) => {};
+const debug = require('@serverless-cd/debug')('serverless-devs:parse-spec');
 
 interface IOptions {
   logger?: any;

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/utils",
-  "version": "0.0.16-beta.1",
+  "version": "0.0.16-beta.2",
   "description": "utils for serverless-devs",
   "main": "lib/index.js",
   "scripts": {

diff --git a/packages/utils/src/is-devs-debug-mode.ts b/packages/utils/src/is-devs-debug-mode.ts
@@ -1,4 +1,6 @@
 const packagesList = [
+  '*',
+  'serverless-devs:*',
   'serverless-devs:engine',
   'serverless-devs:parse-spec',
   'serverless-devs:load-component',