Skip to content

Commit b765ed9

Browse files
authored
Stage 6.2.0 (#34)
* angular 20 and package upgrade and code improvement * ip change * prettier rules change and package upgrade
1 parent 1477151 commit b765ed9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1786
-16490
lines changed

.github/workflows/prod.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@ jobs:
2020

2121
steps:
2222
- name: 🚚 Get latest code
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424

25-
- name: Install Node.js 20
26-
uses: actions/setup-node@v1
25+
- name: Install Node.js 22
26+
uses: actions/setup-node@v4
2727
with:
28-
node-version: '20.x'
28+
node-version: '22'
2929

3030
- name: 🔨 Build Project
3131
run: |
3232
yarn
3333
yarn build-prod
3434
3535
- name: 📂 Deploy to Server
36-
uses: easingthemes/ssh-deploy@v2.1.5
36+
uses: easingthemes/ssh-deploy@v4
3737
env:
3838
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
3939
# ARGS: "-rltgoDzvO --delete"
4040
SOURCE: 'dist/'
41-
REMOTE_HOST: 91.108.116.107
41+
REMOTE_HOST: 82.29.156.38
4242
REMOTE_USER: u106957989
4343
REMOTE_PORT: '65002'
4444
TARGET: domains/codedthemes.com/public_html/demos/admin-templates/datta-able/angular/free

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"tabWidth": 2,
77
"useTabs": false,
88
"htmlWhitespaceSensitivity": "ignore",
9-
"bracketSameLine": false
9+
"bracketSameLine": false,
10+
"endOfLine": "lf"
1011
}

angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@
9090
},
9191
"cli": {
9292
"analytics": "0eaad924-6e2a-434b-aad5-51d9f46776fc",
93-
"schematicCollections": ["angular-eslint"]
93+
"schematicCollections": ["@angular-eslint/schematics"]
9494
}
9595
}

eslint.config.mjs

Lines changed: 51 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,59 @@
1-
import path from "node:path";
2-
import { fileURLToPath } from "node:url";
3-
import js from "@eslint/js";
4-
import { FlatCompat } from "@eslint/eslintrc";
1+
import path from 'node:path';
2+
import { fileURLToPath } from 'node:url';
3+
import js from '@eslint/js';
4+
import { FlatCompat } from '@eslint/eslintrc';
55

66
const __filename = fileURLToPath(import.meta.url);
77
const __dirname = path.dirname(__filename);
88
const compat = new FlatCompat({
9-
baseDirectory: __dirname,
10-
recommendedConfig: js.configs.recommended,
11-
allConfig: js.configs.all
9+
baseDirectory: __dirname,
10+
recommendedConfig: js.configs.recommended,
11+
allConfig: js.configs.all
1212
});
1313

14-
export default [{
15-
ignores: ["projects/**/*"],
16-
}, ...compat.extends(
17-
"eslint:recommended",
18-
"plugin:@typescript-eslint/recommended",
19-
"plugin:@angular-eslint/recommended",
20-
"plugin:@angular-eslint/template/process-inline-templates",
21-
).map(config => ({
22-
...config,
23-
files: ["**/*.ts"],
24-
})), {
25-
files: ["**/*.ts"],
26-
14+
export default [
15+
{
16+
ignores: ['projects/**/*']
17+
},
18+
...compat
19+
.extends(
20+
'eslint:recommended',
21+
'plugin:@typescript-eslint/recommended',
22+
'plugin:@angular-eslint/recommended',
23+
'plugin:@angular-eslint/template/process-inline-templates'
24+
)
25+
.map((config) => ({
26+
...config,
27+
files: ['**/*.ts']
28+
})),
29+
{
30+
files: ['**/*.ts'],
2731
rules: {
28-
"@angular-eslint/directive-selector": ["error", {
29-
type: "attribute",
30-
prefix: "app",
31-
style: "camelCase",
32-
}],
33-
34-
"@angular-eslint/component-selector": ["error", {
35-
type: "element",
36-
prefix: "app",
37-
style: "kebab-case",
38-
}],
39-
},
40-
}, ...compat.extends("plugin:@angular-eslint/template/recommended").map(config => ({
32+
'@angular-eslint/directive-selector': [
33+
'error',
34+
{
35+
type: 'attribute',
36+
prefix: 'app',
37+
style: 'camelCase'
38+
}
39+
],
40+
'@angular-eslint/component-class-suffix': 'off',
41+
'@angular-eslint/component-selector': [
42+
'error',
43+
{
44+
type: 'element',
45+
prefix: 'app',
46+
style: 'kebab-case'
47+
}
48+
]
49+
}
50+
},
51+
...compat.extends('plugin:@angular-eslint/template/recommended').map((config) => ({
4152
...config,
42-
files: ["**/*.html"],
43-
})), {
44-
files: ["**/*.html"],
45-
rules: {},
46-
}];
53+
files: ['**/*.html']
54+
})),
55+
{
56+
files: ['**/*.html'],
57+
rules: {}
58+
}
59+
];

0 commit comments

Comments
 (0)