Skip to content

Commit

Permalink
Merge pull request #22 from Luzin7/dev
Browse files Browse the repository at this point in the history
v1.6.x
  • Loading branch information
Luzin7 authored Jul 1, 2024
2 parents bac5678 + 55e1570 commit ceedef8
Show file tree
Hide file tree
Showing 19 changed files with 512 additions and 334 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# confectus

## 1.6.0

### Minor Changes

- Update Eslint configurations to v9.x.

## 1.5.0

### Minor Changes

- Fix eslint configuration for Next.js and react using Javascript and Typescript.

## 1.4.6

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "module",
"author": "Luan Victor de Souza Dutra",
"main": "./dist/main.js",
"version": "1.4.6",
"version": "1.6.0",
"license": "MIT",
"keywords": [
"JavaScript",
Expand Down
50 changes: 25 additions & 25 deletions src/configs/depedenciesInstallerSetup/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ export const backendDependeciesSetup: SettingsProps = {
},
eslint: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'backend',
'linters',
'eslint',
'javascript',
'.eslintrc.json',
'eslint.config.mjs',
],
},
dependencies: null,
Expand All @@ -51,13 +51,13 @@ export const backendDependeciesSetup: SettingsProps = {
},
eslintts: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'backend',
'linters',
'eslint',
'typescript',
'.eslintrc.json',
'eslint.config.mjs',
],
},

Expand Down Expand Up @@ -107,13 +107,13 @@ export const backendDependeciesSetup: SettingsProps = {
export const frontendDependeciesSetup: SettingsProps = {
eslintts: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'frontend',
'linters',
'typescript',
'eslint',
'.eslintrc.json',
'eslint.config.mjs',
],
},
dependencies: null,
Expand All @@ -122,94 +122,94 @@ export const frontendDependeciesSetup: SettingsProps = {
},
eslintjs: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'frontend',
'linters',
'javascript',
'eslint',
'.eslintrc.json',
'eslint.config.mjs',
],
},
dependencies: null,
devDependencies: 'eslint eslint-plugin-prettier prettier',
},
eslintreact: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'frontend',
'linters',
'react',
'eslint',
'javascript',
'.eslintrc.json',
'eslint.config.mjs',
],
},
dependencies: null,
devDependencies:
'eslint@8.56.0 eslint-plugin-react eslint-plugin-react-hooks prettier eslint-config-prettier eslint-plugin-prettier eslint-plugin-jsx-a11y eslint-config-standard',
'eslint eslint-plugin-react eslint-plugin-react-hooks prettier eslint-config-prettier eslint-plugin-prettier eslint-plugin-jsx-a11y eslint-config-standard',
},
eslintreactts: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'frontend',
'linters',
'react',
'eslint',
'typescript',
'.eslintrc.json',
'eslint.config.mjs',
],
},

dependencies: null,
devDependencies:
'eslint@8.56.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-plugin-react eslint-plugin-react-hooks prettier eslint-config-prettier eslint-plugin-prettier eslint-plugin-jsx-a11y eslint-config-standard',
'eslint @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint-plugin-react eslint-plugin-react-hooks prettier eslint-config-prettier eslint-plugin-prettier eslint-plugin-jsx-a11y eslint-config-standard',
},
eslintnext: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'frontend',
'linters',
'next',
'eslint',
'javascript',
'.eslintrc.json',
'eslint.config.mjs',
],
},
dependencies: null,
devDependencies:
'eslint@8.56.0 eslint-plugin-react eslint-plugin-react-hooks prettier eslint-config-prettier eslint-plugin-prettier eslint-plugin-jsx-a11y eslint-config-standard',
'eslint eslint-plugin-react eslint-plugin-react-hooks prettier eslint-config-prettier eslint-plugin-prettier eslint-plugin-jsx-a11y eslint-config-standard',
},
eslintnextts: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'frontend',
'linters',
'next',
'eslint',
'typescript',
'.eslintrc.json',
'eslint.config.mjs',
],
},

dependencies: null,
devDependencies:
'eslint@8.56.0 eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-jsx-a11y @typescript-eslint/eslint-plugin @typescript-eslint/parser prettier eslint-config-prettier eslint-plugin-prettier eslint-config-standard',
'eslint eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-jsx-a11y @typescript-eslint/eslint-plugin @typescript-eslint/parser prettier eslint-config-prettier eslint-plugin-prettier eslint-config-standard',
},
eslintvue: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'frontend',
'linters',
'vue',
'eslint',
'javascript',
'.eslintrc.json',
'eslint.config.mjs',
],
},
dependencies: null,
Expand All @@ -218,20 +218,20 @@ export const frontendDependeciesSetup: SettingsProps = {
},
eslintvuets: {
configFiles: {
configFileName: '.eslintrc.json',
configFileName: 'eslint.config.mjs',
configFilePath: [
'frontend',
'linters',
'vue',
'eslint',
'typescript',
'.eslintrc.json',
'eslint.config.mjs',
],
},

dependencies: null,
devDependencies:
'eslint-config-prettier eslint@8.56.0 @typescript-eslint/[email protected] @typescript-eslint/[email protected] @vue/[email protected] [email protected] [email protected] [email protected]',
'eslint-config-prettier eslint @typescript-eslint/[email protected] @typescript-eslint/[email protected] @vue/[email protected] [email protected] [email protected] [email protected]',
},
biome: {
configFiles: {
Expand Down
58 changes: 49 additions & 9 deletions src/templates/backend/linters/eslint/typescript/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,19 +1,59 @@
import globals from 'globals';

import { FlatCompat } from '@eslint/eslintrc';
import pluginJs from '@eslint/js';
import path from 'path';
import { fileURLToPath } from 'url';
import js from '@eslint/js';
import typescriptEslint from '@typescript-eslint/eslint-plugin';
import tsParser from '@typescript-eslint/parser';
import globals from 'globals';
import path from 'node:path';
import { fileURLToPath } from 'node:url';

// mimic CommonJS variables -- not needed if using CommonJS
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: pluginJs.configs.recommended,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default [
{ languageOptions: { globals: { ...globals.browser, ...globals.node } } },
...compat.extends('standard-with-typescript'),
...compat.extends(
'standard',
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
),
{
plugins: {
'@typescript-eslint': typescriptEslint,
},

languageOptions: {
globals: {
...globals.node,
},

parser: tsParser,
ecmaVersion: 'latest',
sourceType: 'module',
},

settings: {
'import/parsers': {
'@typescript-eslint/parser': ['.ts', '.tsx', '.d.ts'],
},
},

rules: {
'no-useless-constructor': 'off',
'prettier/prettier': [
'error',
{
printWidth: 80,
tabWidth: 2,
singleQuote: true,
trailingComma: 'all',
arrowParens: 'always',
semi: true,
},
],
},
},
];
8 changes: 5 additions & 3 deletions src/templates/backend/typescript/tests/vitest/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"compilerOptions": {
"target": "es2018",
"module": "commonjs",
"lib": ["es2018"],
"target": "ESNext",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"lib": ["ES2018", "ESNext"],
"strict": true,
"allowSyntheticDefaultImports": true,
"experimentalDecorators": true,
"esModuleInterop": true,
"skipLibCheck": true,
Expand Down
11 changes: 9 additions & 2 deletions src/templates/backend/typescript/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "ESNext",
"target": "ESNext",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"lib": ["ES2018", "ESNext"],
Expand All @@ -15,7 +15,14 @@
"resolveJsonModule": true,
"baseUrl": "./src",
"paths": {
"@/*": ["./*"]
"@shared/*": ["./shared/*"],
"@infra/*": ["./infra/*"],
"@config/*": ["./config/*"],
"@@types/*": ["./@types/*"],
"@constants/*": ["./constants/*"],
"@modules/*": ["./modules/*"],
"@providers/*": ["./providers/*"],
"@test/*": ["./test/*"]
}
},
"include": ["src/**/*.ts"],
Expand Down
4 changes: 2 additions & 2 deletions src/templates/frontend/linters/biome/biome.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://biomejs.dev/schemas/1.6.3/schema.json",
"$schema": "https://biomejs.dev/schemas/1.8.3/schema.json",
"organizeImports": {
"enabled": false
"enabled": true
},
"linter": {
"enabled": true,
Expand Down

This file was deleted.

Loading

0 comments on commit ceedef8

Please sign in to comment.