Skip to content

Commit

Permalink
chore: merge branch 'master' into issues-2333
Browse files Browse the repository at this point in the history
  • Loading branch information
cipchk committed Nov 29, 2023
2 parents ba839c6 + 49a84a1 commit f0ebea1
Show file tree
Hide file tree
Showing 782 changed files with 11,265 additions and 7,550 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ node_modules/

# yarn v2
.yarn

**/src/index.html
4 changes: 1 addition & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ module.exports = {
],
rules: {
'prettier/prettier': ['error', prettierConfig],
'jsdoc/newline-after-description': 1,
'@angular-eslint/component-selector': [
'off',
{
Expand Down Expand Up @@ -171,8 +170,7 @@ module.exports = {
'@angular-eslint/no-input-rename': 'off',
'prefer-const': 'off',
'max-len': 'off',
'deprecation/deprecation': 'warn',
'jsdoc/newline-after-description': 'off'
'deprecation/deprecation': 'warn'
}
},
{
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@ jobs:
runs-on: ubuntu-latest
environment: prod
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 16.15.0

- name: checkout
uses: actions/checkout@v4

- uses: borales/[email protected]
with:
cmd: install
node-version-file: '.nvmrc'
- run: yarn install

- name: build
run: |
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/docker-build-doc-site.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: docker-build-doc-site

# on: push
on:
push:
branches:
Expand All @@ -11,12 +12,7 @@ jobs:
runs-on: ubuntu-latest
environment: prod
steps:
- uses: actions/setup-node@v3
with:
node-version: 16.15.0

- name: checkout
uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
Expand Down
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
node_modules
npm-debug.log
# package-lock.json
yarn.lock
yarn-error.log
pnpm-lock.yaml
/coverage
/coverage-report
/junit
Expand Down Expand Up @@ -32,3 +31,14 @@ src/assets/style.dark.css
/integration
scripts/build/var.less
/schematics/plugin/files/rtl

# Yarn
yarn.lock
yarn-error.log
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
.pnp.*
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# https://pnpm.io/npmrc#node-linker
node-linker=hoisted
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.15.0
18.13.0
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
**/test.ts
src/index.html

.stylelintrc
.stylelintrc.js
.prettierrc

_nginx/
Expand Down
3 changes: 3 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ src/assets/**/*
packages/theme/system/utils/_border.less
packages/theme/system/utils/_color.less
packages/theme/system/utils/_spacing.less

dist/**/*
ng-alain/**/*
59 changes: 0 additions & 59 deletions .stylelintrc

This file was deleted.

88 changes: 88 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
const { propertyGroups } = require('stylelint-config-clean-order');

const propertiesOrder = propertyGroups.map(properties => ({
noEmptyLineBetween: true,
emptyLineBefore: 'never',
properties
}));

module.exports = {
extends: ['stylelint-config-standard'],
customSyntax: 'postcss-less',
plugins: ['stylelint-order', 'stylelint-declaration-block-no-ignored-properties'],
rules: {
'function-name-case': ['lower', { ignoreFunctions: ['/colorPalette/'] }],
'function-no-unknown': [
true,
{
ignoreFunctions: [
'fade',
'tint',
'darken',
'ceil',
'fadein',
'floor',
'unit',
'shade',
'lighten',
'percentage',
'-',
'~`colorPalette',
'snaplist',
'fade-out'
]
}
],
'no-descending-specificity': null,
'no-invalid-position-at-import-rule': null,
'declaration-empty-line-before': null,
'keyframes-name-pattern': null,
'custom-property-pattern': null,
'number-max-precision': 8,
'alpha-value-notation': 'number',
'color-function-notation': 'legacy',
'selector-class-pattern': null,
'selector-id-pattern': null,
'plugin/declaration-block-no-ignored-properties': true,
'selector-type-no-unknown': null,
'selector-pseudo-element-no-unknown': [
true,
{
ignorePseudoElements: ['ng-deep']
}
],
'no-invalid-double-slash-comments': null,
'import-notation': 'string',
'media-feature-range-notation': 'prefix',
'media-query-no-invalid': null,
'order/order': [
[
'dollar-variables',
'at-variables',
"custom-properties",
{ type: 'at-rule', name: 'custom-media' },
{ type: 'at-rule', name: 'function' },
{ type: 'at-rule', name: 'mixin' },
{ type: 'at-rule', name: 'extend' },
{ type: 'at-rule', name: 'include' },
'declarations',
'less-mixins',
{
type: 'rule',
selector: /^&::[\w-]+/,
hasBlock: true
},
'rules',
{ type: 'at-rule', name: 'media', hasBlock: true }
],
{ severity: 'warning' }
],
'order/properties-order': [
propertiesOrder,
{
severity: 'warning',
unspecified: 'bottomAlphabetical'
}
]
}
};
9 changes: 5 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"**/.git/subtree-cache/**": true,
"**/node_modules/*/**": true,
"**/dist/*/**": true,
"**/coverage/*/**": true
"**/coverage/*/**": true,
"**/.yarn/**": true
},
"editor.codeActionsOnSave": {
// For ESLint
Expand Down Expand Up @@ -33,8 +34,8 @@
},
"files.associations": {
"*.json": "jsonc",
".prettierrc": "json",
".stylelintrc": "json"
".prettierrc": "json"
},
"angular.enable-strict-mode-prompt": false
"angular.enable-strict-mode-prompt": false,
"typescript.referencesCodeLens.enabled": true
}
893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.1.cjs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
enableImmutableInstalls: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.1.cjs
Loading

0 comments on commit f0ebea1

Please sign in to comment.