Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify the block template download method to pnpm, modify the block release environment variables #14

Closed
wants to merge 7 commits into from
Closed

Modify the block template download method to pnpm, modify the block release environment variables #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edc4ec8
修改区块模版下载方式为pnpm,修改区块发布环境变量
lu-yg Apr 22, 2024
3abf297
Merge branch 'develop' of https://github.com/Lu17301156525/tiny-engin…
lu-yg Apr 22, 2024
acd14db
根据review意见修改代码
lu-yg Apr 23, 2024
3006756
根据检视意见修改代码
lu-yg Apr 23, 2024
081ea9d
Revert "根据检视意见修改代码"
lu-yg Apr 23, 2024
c866632
根据检视意见修改代码
lu-yg Apr 23, 2024
abbada5
Merge branch 'main' into develop
lu-yg Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions app/service/cnpm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ import { Service } from 'egg';
export default class CnpmService extends Service {
authToken = this.config.authToken;
registry = this.config.registry;

async loginInNpm(packagePath) {
const commands = [
'npm config set strict-ssl false',
`npm config set registry https://${this.registry}`,
`npm config set //${this.registry}:_authToken=${this.authToken}`,
`npm whoami --registry https://${this.registry}`
`npm config set registry ${this.registry}`,
`npm config set //${this.registry.split("//")?.[1]}:_authToken=${this.authToken}`,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Improve robustness of authentication token setting

The current implementation assumes this.registry always includes a protocol. To make this more robust:

Consider updating the line to handle cases where this.registry might not include a protocol:

`npm config set //${this.registry.includes('//') ? this.registry.split('//')[1] : this.registry}:_authToken=${this.authToken}`,

This change ensures the command works correctly regardless of whether this.registry includes a protocol or not.

`npm whoami --registry ${this.registry}`
];
return this.ctx.helper.execCommandWithCatch(commands, { cwd: packagePath }, 'login npm');
}
Expand All @@ -30,5 +29,5 @@ export default class CnpmService extends Service {
const commands = ['npm publish --access=public'];
return this.ctx.helper.execCommandWithCatch(commands, { cwd: packagePath }, 'publish cnpm');
}

}
6 changes: 3 additions & 3 deletions app/service/material-center/vueBlockBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import spawn from 'cross-spawn';
import { Service } from 'egg';
import * as fs from 'fs-extra';
import * as path from 'path';
export default class VueBlockBuilder extends Service{
export default class VueBlockBuilder extends Service {
base = this.config.buildground
baseNpm = this.config.baseNpm
framework = 'Vue'
Expand Down Expand Up @@ -45,7 +45,7 @@ export default class VueBlockBuilder extends Service{
cwd: buildGround
})
await this.spawnCommand(['npm', 'init', '-y'], { cwd: buildGround })
const registries = this.config.npmRegistryOptions
const registries = this.config.cnpmRegistryOptions
await this.spawnCommand(['npm', 'pack', baseNpm, ...registries, '--strict-ssl=false'], {
cwd: buildGround
})
Expand All @@ -54,7 +54,7 @@ export default class VueBlockBuilder extends Service{
await this.spawnCommand(['tar', '-xzvf', tgz], { cwd: buildGround })
await fs.copy(path.join(buildGround, 'package'), buildGround)
await this.spawnCommand(
['npm', 'install', ...registries, '--no-audit', '--no-fund', '--production=false', '--strict-ssl=false'],
['pnpm', 'install', ...registries, '--production=false'],
{
cwd: buildGround
}
Expand Down
9 changes: 6 additions & 3 deletions config/config.default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
*/
import * as path from 'path';
import { EggAppConfig, PowerPartial } from 'egg';
import { E_FOUNDATION_MODEL, E_SchemaFormatFunc } from '../app/lib/enum';
import { I_SchemaConvert } from '../app/lib/interface';
import { E_SchemaFormatFunc, E_FOUNDATION_MODEL } from '../app/lib/enum';


export default (appInfo) => {
Expand Down Expand Up @@ -308,11 +308,14 @@ export default (appInfo) => {
config.npmRegistryOptions = [
'--registry=https://registry.npmjs.org/'
];

// 国内镜像
config.cnpmRegistryOptions = [
'--registry=http://registry.npmmirror.com/'
wenmine marked this conversation as resolved.
Show resolved Hide resolved
];
config.buildground = '/tmp/buildground';
config.baseNpm = '@opentiny/tiny-engine-block-build';
config.authToken = process.env.NPM_AUTH_TOKEN; // 替换为自己的npm token
config.registry = 'registry.npmjs.org/';
config.registry = 'https://registry.npmjs.org/'; // 如果部署了私仓可替换为自己私仓地址
config.projectName = process.env.GIT_REPO; // 应用发布git仓库地址
config.gitBranch = process.env.GIT_BRANCH; // 应用发布git代码默认提交分支
config.userName = process.env.GIT_USERNAME;
Expand Down
Loading