From 3442c4bf241559e46b55a0888fe82f84875bbe69 Mon Sep 17 00:00:00 2001 From: cipchk Date: Sat, 20 Jan 2024 23:20:45 +0800 Subject: [PATCH 1/4] release: fix stackblitz --- src/app/core/code/code.service.ts | 27 ++++--------------------- src/app/core/code/files/package.json.ts | 1 + 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/app/core/code/code.service.ts b/src/app/core/code/code.service.ts index 8b5dd782e..eb63f0813 100644 --- a/src/app/core/code/code.service.ts +++ b/src/app/core/code/code.service.ts @@ -31,30 +31,10 @@ export class CodeService { return `node_modules/@delon/theme/${this.appSrv.theme}.css`; } - private genPackage({ - dependencies = [], - includeCli = false - }: { - dependencies: string[]; - includeCli: boolean; - }): Record> { + private genPackage({ includeCli = false }: { includeCli: boolean }): Record> { const ngCoreVersion = pkg.dependencies['@angular/core']; // const mainVersion = ngCoreVersion.substring(1).split('.').shift(); const res = packageJSON as Record; - [ - 'ng-zorro-antd', - 'ng-antd-color-picker', - '@delon/theme', - '@delon/abc', - '@delon/chart', - '@delon/acl', - '@delon/auth', - '@delon/cache', - '@delon/mock', - '@delon/form', - '@delon/util', - ...dependencies - ]; if (includeCli) { res.devDependencies = { '@angular-devkit/build-angular': '^17.0.0', @@ -74,6 +54,7 @@ export class CodeService { }); }); res.dependencies['@angular/core'] = ngCoreVersion; + console.log(res); return res; } @@ -136,7 +117,7 @@ export class CodeService { const res = this.parseCode(appComponentCode); const json = deepCopy(angularJSON); json.projects.demo.architect.build.options.styles.splice(0, 0, this.themePath); - const packageJson = this.genPackage({ dependencies: [], includeCli }); + const packageJson = this.genPackage({ includeCli }); packageJson.description = title; const files: Record = { 'angular.json': `${JSON.stringify(json, null, 2)}`, @@ -188,7 +169,7 @@ export class CodeService { const mockObj = this.genMock; const json = deepCopy(angularJSON); json.projects.demo.architect.build.options.styles.splice(0, 0, this.themePath); - const packageJson = this.genPackage({ dependencies: [], includeCli }); + const packageJson = this.genPackage({ includeCli }); // packageJson.name = 'NG-ALAIN'; packageJson.description = title; const files: { diff --git a/src/app/core/code/files/package.json.ts b/src/app/core/code/files/package.json.ts index 63e5a0ff2..bdea5eaa4 100644 --- a/src/app/core/code/files/package.json.ts +++ b/src/app/core/code/files/package.json.ts @@ -32,6 +32,7 @@ export default { '@delon/mock': '~17.0.3', '@delon/form': '~17.0.3', '@delon/util': '~17.0.3', + 'ng-zorro-antd': '^17.1.0', 'ng-antd-color-picker': '^0.0.2', ajv: '^8.12.0', 'ajv-formats': '^2.1.1', From 89627e720e48132e4ca58f7381bfb002d14f2481 Mon Sep 17 00:00:00 2001 From: cipchk Date: Sat, 20 Jan 2024 23:23:45 +0800 Subject: [PATCH 2/4] release: remove console.log --- src/app/core/code/code.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/core/code/code.service.ts b/src/app/core/code/code.service.ts index eb63f0813..d27f636b7 100644 --- a/src/app/core/code/code.service.ts +++ b/src/app/core/code/code.service.ts @@ -54,7 +54,6 @@ export class CodeService { }); }); res.dependencies['@angular/core'] = ngCoreVersion; - console.log(res); return res; } From f5de37783f6c8f2bb269f6b8ea3735f60b4266a2 Mon Sep 17 00:00:00 2001 From: cipchk Date: Sat, 20 Jan 2024 23:27:48 +0800 Subject: [PATCH 3/4] release: try build doc site --- .github/workflows/docker-build-doc-site.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-build-doc-site.yml b/.github/workflows/docker-build-doc-site.yml index 2a01ead37..861be11b9 100644 --- a/.github/workflows/docker-build-doc-site.yml +++ b/.github/workflows/docker-build-doc-site.yml @@ -1,10 +1,10 @@ name: docker-build-doc-site -# on: push -on: - push: - branches: - - master +on: push +# on: +# push: +# branches: +# - master jobs: website: From 43b92a8c8550d7c5e9033d7888bc94bb3324f348 Mon Sep 17 00:00:00 2001 From: cipchk Date: Sat, 20 Jan 2024 23:28:49 +0800 Subject: [PATCH 4/4] chore: fix --- .github/workflows/docker-build-doc-site.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-build-doc-site.yml b/.github/workflows/docker-build-doc-site.yml index 861be11b9..2a01ead37 100644 --- a/.github/workflows/docker-build-doc-site.yml +++ b/.github/workflows/docker-build-doc-site.yml @@ -1,10 +1,10 @@ name: docker-build-doc-site -on: push -# on: -# push: -# branches: -# - master +# on: push +on: + push: + branches: + - master jobs: website: