Skip to content

Commit

Permalink
chore(all): merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
MarsiBarsi committed Dec 24, 2020
2 parents ec6e544 + 6c5667c commit 302e09c
Show file tree
Hide file tree
Showing 807 changed files with 3,307 additions and 1,280 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: 🐞 Bug report
about: Create a report to help us improve
title: '[BUG] '
labels: ''
assignees: waterplea
assignees: waterplea, MarsiBarsi
---

# 🐞 Bug report
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: 🚀 Feature request
about: Suggest an idea for this project
title: '[FEATURE]'
labels: ''
assignees: waterplea
assignees: waterplea, MarsiBarsi
---

# 🚀 Feature request
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: ~/.npm
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
${{ runner.OS }}-
- name: npm ci and build demo
run: |
npm ci
Expand All @@ -35,4 +35,4 @@ jobs:
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages
FOLDER: dist/demo
FOLDER: dist/demo/browser
37 changes: 36 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,43 @@ jobs:
- name: Install dependencies
run: npm ci
# End of setup
- run: npm run test
- run: npm run test cdk
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- run: npm run test core
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- run: npm run test kit
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- run: npm run test addon-charts
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- run: npm run test addon-commerce
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- run: npm run test addon-editor
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- run: npm run test addon-mobile
# Find out more about empty lcov generation
- run: npm run test addon-table
- name: Coveralls
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- run: npm run test addon-tablebars
# Find out more about empty lcov generation

45 changes: 34 additions & 11 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/demo",
"outputPath": "dist/demo/browser",
"index": "projects/demo/src/index.html",
"main": "projects/demo/src/main.browser.ts",
"polyfills": "projects/demo/src/polyfills.ts",
Expand All @@ -491,7 +491,7 @@
},
{
"glob": "**/*",
"input": "projects/icons/src/icons/src",
"input": "projects/icons/src",
"output": "assets/taiga-ui/icons"
}
],
Expand All @@ -502,7 +502,10 @@
"stylePreprocessorOptions": {
"includePaths": ["projects/core/styles"]
},
"scripts": ["node_modules/marked/lib/marked.js"],
"scripts": [
"node_modules/prismjs/prism.js",
"node_modules/marked/lib/marked.js"
],
"es5BrowserSupport": true
},
"configurations": {
Expand Down Expand Up @@ -610,25 +613,45 @@
"server": {
"builder": "@angular-devkit/build-angular:server",
"options": {
"outputPath": "dist/server",
"main": "projects/demo/src/main.server.ts",
"outputPath": "dist/demo/server",
"main": "projects/demo/server.ts",
"tsConfig": "projects/demo/tsconfig.server.json",
"stylePreprocessorOptions": {
"includePaths": ["projects/core/styles"]
}
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "projects/demo/src/environments/environment.ts",
"with": "projects/demo/src/environments/environment.prod.ts"
}
],
"outputHashing": "media",
"sourceMap": false,
"optimization": true
}
}
},
"serve-ssr": {
"builder": "@nguniversal/builders:ssr-dev-server",
"options": {
"browserTarget": "demo:build",
"serverTarget": "demo:server"
},
"configurations": {
"production": {
"browserTarget": "demo:build:production",
"serverTarget": "demo:server:production"
}
}
},
"prerender": {
"builder": "@nguniversal/builders:prerender",
"options": {
"browserTarget": "demo:build:production",
"serverTarget": "demo:server:production",
"routes": ["/"]
},
"configurations": {
"production": {}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
Expand Down
Loading

0 comments on commit 302e09c

Please sign in to comment.