Skip to content

Commit

Permalink
Merge pull request #53 from wszgrcy/ng17
Browse files Browse the repository at this point in the history
Ng17
  • Loading branch information
wszgrcy authored Mar 25, 2024
2 parents fbd1e97 + 6d2ebba commit 70642d5
Show file tree
Hide file tree
Showing 48 changed files with 5,982 additions and 17,071 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ jobs:
- name: pull-code
uses: actions/checkout@v2
- name: install-node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 16.x
cache: "npm"
- name: install-dependencies
run: |
npm i --legacy-peer-deps
npm ci --legacy-peer-deps
- name: lint
run: |
npm run lint
- name: hook-code
run: |
npm run hook-code
npm run sync
- name: test
run: |
npm run test:ci
Expand All @@ -44,7 +45,7 @@ jobs:
token: ${{ secrets.NPM_PUBLISH_TOKEN }}
package: ./dist/package.json
tag: alpha
- if: ${{ github.repository_owner == 'wszgrcy' && steps.publish.outputs.type != 'none' }}
- if: ${{ github.repository_owner == 'wszgrcy' && steps.publish.outputs.type }}
run: |
echo "[${{ steps.publish.outputs.type }}]版本已变更: ${{ steps.publish.outputs.old-version }} => ${{ steps.publish.outputs.version }}"
git tag v${{steps.publish.outputs.version}}
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ jobs:
- name: pull-code
uses: actions/checkout@v2
- name: install-node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 16.x
cache: "npm"
- name: install-dependencies
run: |
npm i --legacy-peer-deps
npm ci --legacy-peer-deps
- name: lint
run: |
npm run lint
- name: hook-code
run: |
npm run hook-code
npm run sync
- name: test
run: |
npm run test:ci
Expand All @@ -43,7 +44,7 @@ jobs:
with:
token: ${{ secrets.NPM_PUBLISH_TOKEN }}
package: ./dist/package.json
- if: ${{ github.repository_owner == 'wszgrcy' && steps.publish.outputs.type != 'none' }}
- if: ${{ github.repository_owner == 'wszgrcy' && steps.publish.outputs.type }}
run: |
echo "[${{ steps.publish.outputs.type }}]Version changed: ${{ steps.publish.outputs.old-version }} => ${{ steps.publish.outputs.version }}"
git tag v${{steps.publish.outputs.version}}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ jobs:
- name: pull-code
uses: actions/checkout@v2
- name: install-node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 16.x
cache: "npm"
- name: install-dependencies
run: |
npm i --legacy-peer-deps
npm ci --legacy-peer-deps
- name: hook-code
run: |
npm run hook-code
npm run sync
- name: build-docs
continue-on-error: true
run: |
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@ jobs:
- name: pull-code
uses: actions/checkout@v2
- name: install-node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: 16.x
cache: "npm"
- name: install-dependencies
run: |
npm i --legacy-peer-deps
npm ci --legacy-peer-deps
- name: lint
run: |
npm run lint
- name: hook-code
run: |
npm run hook-code
npm run sync
- name: test
run: |
npm run test:ci
Expand Down
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
registry=https://registry.npm.taobao.org/
registry =https://registry.npmmirror.com/
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.fixAll.tslint": false
"source.fixAll.eslint": "explicit",
"source.fixAll.tslint": "never"
}
}
7 changes: 4 additions & 3 deletions deploy/doc/en-US/attention.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ title: Attention

## Import Change

- Use `angular-miniprogram/common` replace `@angular/common`,
- Use `angular-miniprogram/common` replace `@angular/common`
- Use `angular-miniprogram/common/http` replace `@angular/common/http`
- Use `angular-miniprogram/forms` replace `@angular/forms`
- Use `import { HttpClientModule } from 'angular-miniprogram';` replace `import { HttpClientModule } from '@angular/common/http'`
- Use `import { HttpClientModule, provideHttpClient } from 'angular-miniprogram'` replace `import { HttpClientModule, provideHttpClient } from '@angular/common/http'`

## Attention

Expand Down Expand Up @@ -86,4 +87,4 @@ export function libraryTemplateScopeName(library: string) {
<app-outside-template
[template]="$$mp$$TestLibrary$$first"
></app-outside-template>
```
```
5 changes: 3 additions & 2 deletions deploy/doc/zh-Hans/attention.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ title: 注意事项
## 引入变更

- 使用`angular-miniprogram/common`代替`@angular/common`,
- 使用`angular-miniprogram/common/http`代替`@angular/common/http`
- 使用`angular-miniprogram/forms`代替`@angular/forms`
- 使用`import { HttpClientModule } from 'angular-miniprogram';`代替`import { HttpClientModule } from '@angular/common/http'`
- 使用`import { HttpClientModule, provideHttpClient } from 'angular-miniprogram'`代替`import { HttpClientModule, provideHttpClient } from '@angular/common/http'`

## 注意

Expand Down Expand Up @@ -82,4 +83,4 @@ export function libraryTemplateScopeName(library: string) {
<app-outside-template
[template]="$$mp$$TestLibrary$$first"
></app-outside-template>
```
```
Loading

0 comments on commit 70642d5

Please sign in to comment.