Skip to content

Commit f8e037c

Browse files
authored
Merge pull request #51 from Serverless-Devs/zxy/dev-20250327
fix: login url
2 parents 663a73b + f92df00 commit f8e037c

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

packages/engine/__tests__/engine.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ describe('Engine Class', () => {
772772

773773
expect(loggerSpy).toHaveBeenCalledWith(
774774
`The [deploy] command was not found.`,
775-
`Please check the component ${mockItem.component} has the deploy command. Serverless Devs documents:https://manual.serverless-devs.com/`
775+
`Please check the component ${mockItem.component} has the deploy command. Serverless Devs documents:https://docs.serverless-devs.com/`
776776
);
777777
});
778778
});

packages/engine/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@serverless-devs/engine",
3-
"version": "0.1.6-beta.2",
3+
"version": "0.1.6-beta.3",
44
"description": "a engine lib for serverless-devs",
55
"main": "lib/index.js",
66
"scripts": {

packages/engine/src/actions/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ You can still use them now, but we suggest to modify them.`)
328328
exitCode: EXIT_CODE.DEVS,
329329
prefix: `${this.record.label} ${hook.hookType}-action failed to [${this.record.command}]:`,
330330
tips: `Please check the component ${componentName} has the ${command} command. Serverless Devs documents:${chalk.underline(
331-
'https://manual.serverless-devs.com/',
331+
'https://docs.serverless-devs.com/',
332332
)}`,
333333
trackerType: ETrackerType.parseException,
334334
});

packages/engine/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ class Engine {
744744
throw new DevsError(`The [${command}] command was not found.`, {
745745
exitCode: EXIT_CODE.DEVS,
746746
tips: `Please check the component ${item.component} has the ${command} command. Serverless Devs documents:${chalk.underline(
747-
'https://manual.serverless-devs.com/',
747+
'https://docs.serverless-devs.com/',
748748
)}`,
749749
prefix: `[${item.projectName}] failed to [${command}]:`,
750750
trackerType: ETrackerType.parseException,
@@ -774,7 +774,7 @@ class Engine {
774774
// 方法不存在,进行警告,但是并不会报错,最终的exit code为0;
775775
this.logger.tips(
776776
`The [${command}] command was not found.`,
777-
`Please check the component ${item.component} has the ${command} command. Serverless Devs documents:https://manual.serverless-devs.com/`,
777+
`Please check the component ${item.component} has the ${command} command. Serverless Devs documents:https://docs.serverless-devs.com/`,
778778
);
779779
}
780780

packages/registry/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@serverless-devs/registry",
3-
"version": "0.0.12-beta.4",
3+
"version": "0.0.12-beta.5",
44
"description": "request for serverless-devs",
55
"main": "lib/index.js",
66
"scripts": {

packages/registry/src/actions/package.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ const validate = (codeUri: string) => {
176176
checkEdition(publishYaml);
177177
const yamlObject = yaml.load(publishYaml) as Record<string, any>;
178178
const errorMsg = `Publish.yaml illegal.
179-
Application dev: https://manual.serverless-devs.com/dev-guide/application/
180-
Component dev: https://manual.serverless-devs.com/dev-guide/component/
181-
Plugin dev: https://manual.serverless-devs.com/dev-guide/plugin/
179+
Application dev: https://docs.serverless-devs.com/dev-guide/application/
180+
Component dev: https://docs.serverless-devs.com/dev-guide/component/
181+
Plugin dev: https://docs.serverless-devs.com/dev-guide/plugin/
182182
`
183183
const ajv = new Ajv({ allErrors: true });
184184
const validate = ajv.compile(publishSchema);

packages/registry/src/request-url.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ const baseUrl =
55
? 'https://server-serverlgistry-v-awljqvnszb.cn-hangzhou.fcapp.run/v3'
66
: getGlobalConfig('registry', 'https://api.devsapp.cn/v3');
77
// *** 登陆 *** //
8+
const baseUrlLogin = getGlobalConfig('registry', 'https://api.devsapp.cn/v3');
89
// 登陆
9-
export const REGISTRY_INFORMATION_GITHUB = `${baseUrl}/user/check`;
10+
export const REGISTRY_INFORMATION_GITHUB = `${baseUrlLogin}/user/check`;
1011

1112
// github回调
12-
export const GITHUB_LOGIN_URL = `https://github.com/login/oauth/authorize?client_id=ef1df7f4f6b9e5a343af&redirect_uri=${baseUrl}/user/login`;
13+
export const GITHUB_LOGIN_URL = `https://github.com/login/oauth/authorize?client_id=ef1df7f4f6b9e5a343af&redirect_uri=${baseUrlLogin}/user/login`;
1314
// 刷新 token
14-
export const RESET_URL = `${baseUrl}/user/token`;
15+
export const RESET_URL = `${baseUrlLogin}/user/token`;
1516

1617
// *** 发布 *** //
1718
export const PUBLISH_URL = `${baseUrl}/packages/releases`;

0 commit comments

Comments
 (0)