Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 9 additions & 27 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
name: Deploy
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: valitydev/action-frontend/setup-install@v2
- name: Build
run: npm run build
Expand All @@ -16,32 +16,14 @@ jobs:
with:
registry-username: ${{ github.actor }}
registry-access-token: ${{ secrets.GITHUB_TOKEN }}
# - name: set config
# run: |
# printf "$APP_ENV_FILE" > dist/control-center/browser/assets/appConfig.json
# printf "$AUTH_ENV_FILE" > dist/control-center/browser/assets/authConfig.json
# env:
# APP_ENV_FILE: ${{secrets.APP_CONF}}
# AUTH_ENV_FILE: ${{secrets.AUTH_CONF}}
# - name: Publish to CF Pages
# uses: cloudflare/pages-action@1
# with:
# apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
# accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
# projectName: 'cc'
# directory: 'dist/control-center/browser'
# gitHubToken: ${{ secrets.GITHUB_TOKEN }}
# branch: main
# - name: Publish MatEz Library
# uses: valitydev/action-frontend/publish@v1.0
# with:
# npm-token: ${{ secrets.NPM_TOKEN }}
# directory: ./dist/libs/matez
# - name: Publish NgThrift Library
# uses: valitydev/action-frontend/publish@v1.0
# with:
# npm-token: ${{ secrets.NPM_TOKEN }}
# directory: ./dist/libs/ng-thrift
- name: Build MatEz Library
run: npm run build -- matez
- name: Publish MatEz Library
uses: valitydev/action-frontend/publish@v2
with:
directory: ./dist/matez
npm-token: ${{ secrets.NPM_TOKEN }}
pr-label: 'matez'
notify:
name: Notify
runs-on: ubuntu-latest
Expand Down
35 changes: 11 additions & 24 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,31 @@
name: PR
on:
pull_request:
types: [opened, synchronize, reopened, labeled]
jobs:
check:
name: Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: valitydev/action-frontend/setup-install@v2
- name: Check
run: npm run check
build:
name: Build
runs-on: ubuntu-latest
env:
SHORT_SHA: $(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7)
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: valitydev/action-frontend/setup-install@v2
with:
npm-install-force: true
- name: Build
run: npm run build
# - name: Publish MatEz Library
# if: >
# contains(github.event.pull_request.labels.*.name, 'publish')
# || contains(github.event.pull_request.labels.*.name, 'publish matez')
# working-directory: ./dist/libs/matez
# run: >
# npm version prerelease --preid pr-${{ github.event.number }}-${{ env.SHORT_SHA }} --no-git-tag-version
# && npm publish --tag pr
# env:
# NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
# - name: Publish NgThrift Library
# if: >
# contains(github.event.pull_request.labels.*.name, 'publish')
# || contains(github.event.pull_request.labels.*.name, 'publish ng-thrift')
# working-directory: ./dist/libs/ng-thrift
# run: >
# npm version prerelease --preid pr-${{ github.event.number }}-${{ env.SHORT_SHA }} --no-git-tag-version
# && npm publish --tag pr
# env:
# NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Build MatEz Library
run: npm run build -- matez
- name: Publish MatEz Library
uses: valitydev/action-frontend/publish@v2
with:
directory: ./dist/matez
npm-token: ${{ secrets.NPM_TOKEN }}
pr-label: 'matez'
17 changes: 10 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion projects/matez/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,14 @@
"dest": "../../dist/matez",
"lib": {
"entryFile": "src/public-api.ts"
}
},
"allowedNonPeerDependencies": [
"@ng-matero/extensions",
"@s-libs/js-core",
"@s-libs/micro-dash",
"@s-libs/ng-core",
"@s-libs/rxjs-core",
"dinero.js",
"papaparse"
]
}
2 changes: 1 addition & 1 deletion projects/matez/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"utility-types": "^3.11.0"
},
"dependencies": {
"@dinero.js/currencies": "^2.0.0-alpha.14",
"@ng-matero/extensions": "^21.1.4",
"@s-libs/js-core": "^20.2.0",
"@s-libs/micro-dash": "^20.0.0",
"@s-libs/ng-core": "^20.2.0",
"@s-libs/rxjs-core": "^20.2.0",
"dinero.js": "^2.0.0",
"papaparse": "^5.5.3"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions projects/matez/src/lib/components/cmdk/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ export * from './types/cmdk-option';
export * from './types/cmdk-options';
export * from './cmdk.module';
export * from './cmdk.component';
export * from './components/cmdk-button.component';
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Component, TemplateRef, booleanAttribute, computed, input, model } from '@angular/core';

import { Column, ObservableResource, PagedObservableResource, UpdateOptions } from '@vality/matez';
import { ObservableResource, PagedObservableResource } from '../../utils';

import { TableModule } from './table.module';
import { Column, UpdateOptions } from './types';

@Component({
selector: 'v-table-resource',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as currencies from '@dinero.js/currencies';
import * as currencies from 'dinero.js/currencies';

export const getCurrencyExponent = (currencyCode: string): number =>
currencies[currencyCode as keyof typeof currencies]?.exponent;
Loading