Skip to content

Commit 293f82f

Browse files
committed
Merge branch 'devOps/CI_CD' of https://github.com/Samuelsotogit/systemlink-enterprise-examples-fork into devOps/CI_CD
2 parents a8ff6e2 + 06a0c28 commit 293f82f

File tree

3 files changed

+199
-199
lines changed

3 files changed

+199
-199
lines changed

.github/workflows/webapp-deploy.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
name: Deploy React WebApps
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
- master
8-
- devOps/CI_CD
9-
paths:
10-
- "examples/web_apps/Framework_Examples/**"
11-
- ".github/workflows/webapp_deploy.yml"
124
pull_request:
5+
paths:
6+
- "examples/Web Applications/Framework Examples/**"
7+
- ".github/workflows/deploy.yml"
8+
9+
push:
1310
branches:
14-
- main
15-
- master
11+
- "**"
1612
paths:
17-
- "examples/web_apps/Framework_Examples/**"
13+
- "examples/Web Applications/Framework Examples/**"
1814
- ".github/workflows/deploy.yml"
1915

16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.ref }}
18+
cancel-in-progress: true
19+
2020
jobs:
2121
build-package-deploy:
2222
runs-on: ubuntu-latest
Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
1-
import { defineConfig } from 'eslint/config';
2-
import react from 'eslint-plugin-react';
1+
import { defineConfig } from "eslint/config";
2+
import react from "eslint-plugin-react";
33

4-
import reactHooks from 'eslint-plugin-react-hooks';
5-
import reactRefresh from 'eslint-plugin-react-refresh';
4+
import reactHooks from "eslint-plugin-react-hooks";
5+
import reactRefresh from "eslint-plugin-react-refresh";
66

7-
import { javascriptConfig } from '@ni/eslint-config-javascript';
8-
import { typescriptConfig } from '@ni/eslint-config-typescript';
7+
import { javascriptConfig } from "@ni/eslint-config-javascript";
8+
import { typescriptConfig } from "@ni/eslint-config-typescript";
99

1010
export default defineConfig([
11-
{
12-
ignores: ['dist/**'],
11+
{
12+
ignores: ["dist/**"],
13+
},
14+
{
15+
files: ["**/*.ts", "**/*.tsx"],
16+
plugins: {
17+
react,
18+
"react-refresh": reactRefresh,
19+
"react-hooks": reactHooks,
1320
},
14-
{
15-
files: ['**/*.ts', '**/*.tsx'],
16-
plugins: {
17-
react,
18-
'react-refresh': reactRefresh,
19-
'react-hooks': reactHooks,
20-
},
21-
extends: [
22-
typescriptConfig,
23-
react.configs.flat.recommended,
24-
react.configs.flat['jsx-runtime'],
25-
reactHooks.configs.flat.recommended,
26-
],
27-
languageOptions: {
28-
parserOptions: {
29-
project: './tsconfig.app.json',
30-
tsconfigRootDir: import.meta.dirname,
31-
ecmaFeatures: {
32-
jsx: true,
33-
},
34-
},
35-
},
36-
settings: {
37-
react: {
38-
version: 'detect',
39-
},
40-
},
41-
rules: {
42-
// The React components should use PascalCase
43-
'@typescript-eslint/naming-convention': [
44-
'error',
45-
{
46-
selector: 'variable',
47-
format: ['camelCase', 'PascalCase'],
48-
},
49-
],
50-
'react-refresh/only-export-components': [
51-
'error',
52-
{ allowConstantExport: true },
53-
],
54-
// "@typescript-eslint/strict-boolean-expressions": "off",
55-
// "no-alert": "off",
21+
extends: [
22+
typescriptConfig,
23+
react.configs.flat.recommended,
24+
react.configs.flat["jsx-runtime"],
25+
reactHooks.configs.flat.recommended,
26+
],
27+
languageOptions: {
28+
parserOptions: {
29+
project: "./tsconfig.app.json",
30+
tsconfigRootDir: import.meta.dirname,
31+
ecmaFeatures: {
32+
jsx: true,
5633
},
34+
},
5735
},
58-
59-
{
60-
files: ['vite.config.ts'],
61-
extends: [typescriptConfig],
62-
languageOptions: {
63-
parserOptions: {
64-
project: './tsconfig.node.json',
65-
tsconfigRootDir: import.meta.dirname.pathname,
66-
},
67-
},
68-
rules: {
69-
// Configuration scripts will not be in published package and are allowed to use devDependencies
70-
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
71-
// Build scripts should give verbose logging
72-
'no-console': 'off',
73-
// Rollup config files use default exports
74-
'import/no-default-export': 'off',
36+
settings: {
37+
react: {
38+
version: "detect",
39+
},
40+
},
41+
rules: {
42+
// The React components should use PascalCase
43+
"@typescript-eslint/naming-convention": [
44+
"error",
45+
{
46+
selector: "variable",
47+
format: ["camelCase", "PascalCase"],
7548
},
49+
],
50+
"react-refresh/only-export-components": [
51+
"error",
52+
{ allowConstantExport: true },
53+
],
54+
// "@typescript-eslint/strict-boolean-expressions": "off",
55+
// "no-alert": "off",
7656
},
57+
},
7758

78-
{
79-
files: ['**/*.js'],
80-
extends: [javascriptConfig],
59+
{
60+
files: ["vite.config.ts"],
61+
extends: [typescriptConfig],
62+
languageOptions: {
63+
parserOptions: {
64+
project: "./tsconfig.node.json",
65+
tsconfigRootDir: import.meta.dirname.pathname,
66+
},
8167
},
68+
rules: {
69+
// Configuration scripts will not be in published package and are allowed to use devDependencies
70+
"import/no-extraneous-dependencies": ["error", { devDependencies: true }],
71+
// Build scripts should give verbose logging
72+
"no-console": "off",
73+
// Rollup config files use default exports
74+
"import/no-default-export": "off",
75+
},
76+
},
77+
78+
{
79+
files: ["**/*.js"],
80+
extends: [javascriptConfig],
81+
},
8282
]);

0 commit comments

Comments
 (0)