Skip to content

Commit

Permalink
refactor repo
Browse files Browse the repository at this point in the history
  • Loading branch information
PixeledCode committed Jan 4, 2024
1 parent 2d51ef0 commit 1bdf99d
Show file tree
Hide file tree
Showing 14 changed files with 277 additions and 321 deletions.
55 changes: 35 additions & 20 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,36 @@
module.exports = {
root: true,
// This tells ESLint to load the config from the package `eslint-config-custom`
extends: ['custom'],
settings: {
next: {
rootDir: ['apps/*/'],
},
},
env: {
browser: true,
jest: true,
node: true,
},
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint'],
parserOptions: {
sourceType: 'module',
ecmaVersion: 'es2022',
},
};
root: true,
settings: {
next: {
rootDir: ['apps/*/'],
},
},
env: {
browser: true,
jest: true,
node: true,
},
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint'],
parserOptions: {
sourceType: 'module',
ecmaVersion: 'es2022',
},
extends: [
'turbo',
'prettier',
'eslint:recommended',
'plugin:react/jsx-runtime',
],

rules: {
'@next/next/no-img-element': 'off',
'@next/next/no-html-link-for-pages': 'off',
'react/jsx-key': 'off',
'react/display-name': 'off',
'react/react-in-jsx-scope': 'off',
'no-unused-vars': 'off',
'no-undef': 'off',
'no-redeclare': ['error', { builtinGlobals: false }],
},
}
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules
.pnp
Expand Down
8 changes: 0 additions & 8 deletions .prettierrc.js

This file was deleted.

34 changes: 34 additions & 0 deletions .prettierrc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/** @type {import('prettier').Config} */
module.exports = {
endOfLine: 'lf',
semi: true,
trailingComma: 'es5',
printWidth: 80,
tabWidth: 2,
useTabs: false,
singleQuote: true,
importOrder: [
'^(react/(.*)$)|^(react$)',
'^(next/(.*)$)|^(next$)',
'<THIRD_PARTY_MODULES>',
'',
'^types$',
'^@local/(.*)$',
'^@/config/(.*)$',
'^@/lib/(.*)$',
'^@/components/(.*)$',
'^@/styles/(.*)$',
'^[./]',
],
importOrderSeparation: false,
importOrderSortSpecifiers: true,
importOrderBuiltinModulesToTop: true,
importOrderParserPlugins: ['typescript', 'jsx', 'decorators-legacy'],
importOrderMergeDuplicateImports: true,
importOrderCombineTypeAndValueImports: true,
plugins: [
'@ianvs/prettier-plugin-sort-imports',
'prettier-plugin-tailwindcss',
],
tailwindFunctions: ['clsx', 'cn'],
}
103 changes: 51 additions & 52 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,54 +1,53 @@
{
"name": "turbo",
"version": "1.9.1",
"private": true,
"workspaces": [
"apps/*",
"examples/*",
"packages/*"
],
"scripts": {
"build": "turbo run build",
"postbuild": "turbo run postbuild",
"dev": "turbo run dev",
"lint": "turbo run lint --filter opub-ui",
"format": "prettier --write \"**/*.{ts,tsx,md,scss}\"",
"test": "turbo run test --filter opub-ui",
"test:watch": "turbo run test:watch",
"prepare": "husky install",
"clean": "rm -rf node_modules yarn.lock",
"new-component": "new-component",
"build:packages": "turbo run build --filter=create-opub-app --filter=opub-ui"
},
"devDependencies": {
"@changesets/cli": "^2.26.1",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.57.1",
"classnames": "^2.3.2",
"eslint-config-custom": "*",
"husky": "^8.0.3",
"lint-staged": "^13.2.0",
"new-component-opub": "git+https://github.com/CivicDataLab/new-component.git",
"prettier": "^2.8.4",
"sass": "^1.58.3",
"tsup": "^6.7.0",
"turbo": "^1.9.1",
"typescript": "^5.0.4"
},
"engines": {
"node": ">=14.0.0"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
"eslint --"
]
},
"dependencies": {
"eslint-plugin-turbo": "^1.10.12"
}
"name": "turbo",
"version": "1.9.1",
"private": true,
"workspaces": [
"apps/*",
"examples/*",
"packages/*"
],
"scripts": {
"build": "turbo run build",
"postbuild": "turbo run postbuild",
"dev": "turbo run dev",
"lint": "turbo run lint --filter opub-ui",
"format": "prettier --write \"**/*.{ts,tsx,md,scss}\"",
"test": "turbo run test --filter opub-ui",
"test:watch": "turbo run test:watch",
"prepare": "husky install",
"clean": "rm -rf node_modules yarn.lock",
"new-component": "new-component",
"build:packages": "turbo run build --filter=create-opub-app --filter=opub-ui",
"publish": "yarn changeset publish"
},
"devDependencies": {
"@changesets/cli": "^2.26.1",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.57.1",
"eslint-config-custom": "*",
"classnames": "^2.3.2",
"husky": "^8.0.3",
"lint-staged": "^13.2.0",
"new-component-opub": "git+https://github.com/CivicDataLab/new-component.git",
"prettier": "^2.8.4",
"sass": "^1.58.3",
"tsup": "^6.7.0",
"turbo": "^1.9.1",
"typescript": "^5.0.4"
},
"engines": {
"node": ">=14.0.0"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
"eslint --"
]
},
"dependencies": {}
}
Loading

1 comment on commit 1bdf99d

@vercel
Copy link

@vercel vercel bot commented on 1bdf99d Jan 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

opub-www – ./apps/www

opub-www.vercel.app
opub-www-git-main-civicdatalab.vercel.app
opub-www-civicdatalab.vercel.app

Please sign in to comment.