Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions .eslintrc.cjs

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
- name: Install dependencies
run: pnpm install

- name: Lint
run: pnpm run lint

- name: Build
run: pnpm run build

- name: Lint
run: pnpm run lint
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ node_modules
dist
dist-ssr
*.local
.eslintcache

# Editor directories and files
.vscode/*
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
pnpm-lock.yaml
pnpm-workspace.yaml
dist
CHANGELOG*.md
50 changes: 50 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { createRequire } from 'module';
import pluginJs from '@eslint/js';
import configPrettier from 'eslint-config-prettier';
import pluginImportX from 'eslint-plugin-import-x';
import globals from 'globals';
import { config, configs as configsTs, parser } from 'typescript-eslint';

const pkg = createRequire(import.meta.url)('./package.json');

export default config(
{
files: ['**/*.{js,mjs,cjs,jsx,ts,cts,mts,tsx,vue}'],
languageOptions: { parser },
},
pluginJs.configs.recommended,
...configsTs.recommended,
configPrettier,
pluginImportX.flatConfigs.recommended,
pluginImportX.flatConfigs.typescript,
{
settings: {
'import-x/resolver': { typescript: true, node: true },
'import-x/internal-regex': RegExp(`^${pkg.name}.*`),
},
rules: {
'import-x/order': ['error', { alphabetize: { order: 'asc' } }],
'import-x/no-deprecated': ['warn'],
},
},

// Node scripts
{
files: [
'eslint.config.js',
'rollup*.config.js',
'scripts/**',
'./*.{js,ts}',
'packages/*/*.js',
],
languageOptions: { globals: globals.node },
rules: {
'no-restricted-globals': 'off',
'no-console': 'off',
},
},

{
ignores: ['**/dist/', '**/temp/', '**/coverage/', '.idea/'],
},
);
27 changes: 15 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,41 @@
"dev": "pnpm -r --parallel run dev",
"build": "pnpm -r run build",
"build:docker": "pnpm -r --stream run build:docker",
"clean": "rimraf --glob packages/*/dist temp .eslintcache",
"format": "prettier . --write --ignore-unknown",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore",
"lint": "eslint --cache .",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
"release": "node scripts/release.js",
"postinstall": "simple-git-hooks"
},
"devDependencies": {
"@types/node": "^20.10.6",
"@typescript-eslint/eslint-plugin": "^6.16.0",
"@typescript-eslint/parser": "^6.16.0",
"@eslint/js": "^9.10.0",
"@types/node": "^20.16.5",
"conventional-changelog-cli": "^5.0.0",
"eslint": "^8.56.0",
"eslint": "^9.10.0",
"eslint-config-prettier": "^9.1.0",
"eslint-define-config": "^2.1.0",
"eslint-plugin-prettier": "^5.1.2",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import-x": "^4.2.1",
"execa": "^9.3.1",
"globals": "^15.9.0",
"just-pnpm": "^1.0.2",
"lint-staged": "^15.2.0",
"lint-staged": "^15.2.10",
"minimist": "^1.2.8",
"picocolors": "^1.1.0",
"prettier": "^3.1.1",
"prettier": "^3.3.3",
"prompts": "^2.4.2",
"rimraf": "^6.0.1",
"semver": "^7.6.3",
"simple-git-hooks": "^2.11.1",
"typescript": "^5.5.4"
"typescript": "~5.5.4",
"typescript-eslint": "^8.5.0"
},
"simple-git-hooks": {
"pre-commit": "pnpm lint-staged"
},
"lint-staged": {
"*.{vue,js,jsx,cjs,mjs,ts,tsx,cts,mts}": [
"eslint --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix"
"*.{js,mjs,cjs,jsx,ts,cts,mts,tsx,vue}": [
"eslint --fix"
],
"*": [
"prettier --write --ignore-unknown"
Expand Down
5 changes: 2 additions & 3 deletions packages/playground/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import './style.css';
import viteLogo from '/vite.svg';
import { isCallable } from '@coldrun/monorepo-typescript-shared';
import { setupCounter } from './counter.ts';
import typescriptLogo from './typescript.svg';
import { isCallable } from '@coldrun/monorepo-typescript-shared';

document.querySelector<HTMLDivElement>('#app')!.innerHTML = `
<div>
<a href="https://vitejs.dev" target="_blank">
<img src="${viteLogo}" class="logo" alt="Vite logo" />
<img src="/vite.svg" class="logo" alt="Vite logo" />
</a>
<a href="https://www.typescriptlang.org/" target="_blank">
<img src="${typescriptLogo}" class="logo vanilla" alt="TypeScript logo" />
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite';
import { resolve } from 'path';
import { defineConfig } from 'vite';
import dts from 'vite-plugin-dts';

export default defineConfig({
Expand Down
Loading