Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
andriikamaldinov1 committed Jul 7, 2023
2 parents 04109ec + d5019cb commit d9b018d
Show file tree
Hide file tree
Showing 65 changed files with 19,991 additions and 31,328 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"@angular-eslint/component-selector": [
"error",
{
"prefix": "ngx-loader-indicator",
"prefix": "jsdaddy",
"style": "kebab-case",
"type": "element"
}
],
"@angular-eslint/directive-selector": [
"error",
{
"prefix": "loader",
"prefix": "jsdaddy",
"style": "camelCase",
"type": "attribute"
}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: GitHub pages
on:
push:
branches:
- master
- develop

jobs:
build:
Expand All @@ -17,7 +17,8 @@ jobs:
node-version: 18
- name: Build demo
run: |
npm ci
npm ci --force
git submodule update --init --recursive --remote
npm run build
- name: Deploy demo
uses: peaceiris/actions-gh-pages@v3
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ jobs:
registry-url: https://registry.npmjs.org/
- name: Build library
run: |
npm ci
npm ci --force
git submodule update --init --recursive --remote
npm run build:lib
- name: Publish library
run: npm run publish:lib
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/quality-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
node-version: 18
- name: Check quality
run: |
npm ci
npm ci --force
git submodule update --init --recursive --remote
npm run lint
npm test
npm run build
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "src/libraries"]
path = src/libraries
url = https://github.com/JsDaddy/libraries.git
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# 16.0.0(2023-07-07)

### Feature

- update ng 16.x

<a name="16.0.0"></a>

# 15.0.0(2022-26-12)

### Feature
- update to ng15

<a name="15.0.0"></a>


<a name="6.0.0"></a>
# [6.0.0 base functionality] (2018-05-17)

Expand Down
1 change: 0 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"tsConfig": "src/tsconfig.app.json",
"assets": ["src/favicon.ico", "src/assets"],
"styles": [
"@angular/material/prebuilt-themes/indigo-pink.css",
"node_modules/highlight.js/styles/github.css",
"src/styles.scss"
],
Expand Down
Loading

0 comments on commit d9b018d

Please sign in to comment.