Skip to content

Commit 8d08239

Browse files
committed
Update versions and config
1 parent f14fefc commit 8d08239

50 files changed

Lines changed: 222 additions & 194 deletions

Some content is hidden

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

.config/cspell/cspell.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"version": "0.2",
33
"enableGlobDot": true,
44
"useGitignore": true,
5-
"ignorePaths": ["**/node_modules/**", "LICENSE"],
5+
"gitignoreRoot": ".",
6+
"ignorePaths": ["LICENSE"],
67
"words": [
78
"csharpierrc",
89
"devcontainer",

.config/eslint/eslint.config.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
import { FlatCompat } from "@eslint/eslintrc";
21
import eslint from "@eslint/js";
32
import vitest from "@vitest/eslint-plugin";
43
import prettier from "eslint-config-prettier";
54
import { gitignore } from "eslint-flat-config-gitignore";
5+
import importPlugin from "eslint-plugin-import";
66
import nodePlugin from "eslint-plugin-n";
77
import simpleImportSort from "eslint-plugin-simple-import-sort";
88
import eslintPluginUnicorn from "eslint-plugin-unicorn";
99
import globals from "globals";
1010
import tsESLint from "typescript-eslint";
1111

12-
const compat = new FlatCompat({ baseDirectory: import.meta.dirname });
13-
1412
export default tsESLint.config(
1513
await gitignore(import.meta.dirname),
1614
{
@@ -31,13 +29,13 @@ export default tsESLint.config(
3129
files: ["**/*.test.{ts,tsx,cts,mts}"],
3230
extends: [vitest.configs.recommended],
3331
},
34-
...compat.plugins("import"),
3532
{
3633
files: ["**/*.{ts,tsx,cts,mts}"],
3734
plugins: {
3835
n: nodePlugin,
3936
"simple-import-sort": simpleImportSort,
4037
unicorn: eslintPluginUnicorn,
38+
import: importPlugin,
4139
},
4240
rules: {
4341
"n/no-unsupported-features/es-builtins": "error",

.config/eslint/plugins.d.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
declare module "eslint-plugin-simple-import-sort" {
1+
declare module "eslint-plugin-import" {
22
import type { ESLint } from "eslint";
3-
const simpleImportSort: ESLint.Plugin;
4-
export default simpleImportSort;
5-
}
6-
7-
declare module "eslint-plugin-unicorn" {
8-
import type { ESLint } from "eslint";
9-
const eslintPluginUnicorn: ESLint.Plugin;
10-
export default eslintPluginUnicorn;
3+
const eslintPluginImport: ESLint.Plugin;
4+
export default eslintPluginImport;
115
}

.config/eslint/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
"extends": "../typescript/tsconfig.node.json",
33
"compilerOptions": {
44
"noEmitOnError": true
5-
},
6-
"exclude": []
5+
}
76
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "@tsconfig/node22/tsconfig.json",
33
"compilerOptions": {
4-
"resolveJsonModule": true
4+
"resolveJsonModule": true,
5+
"module": "Node18"
56
}
67
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
packages:
2-
- "devcontainer-config-setup/**"
3-
- "!devcontainer-config-setup/**/dist/"
2+
- "devcontainer-config-setup/*"
3+
- "devcontainer-config-setup/setup/templates/*"

.devcontainer/.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
COMPOSE_PROJECT_NAME=devcontainer-config-setup
21
WORKSPACES=/workspaces
32
XDG_CONFIG_HOME=/home/dev/.config
43
XDG_CACHE_HOME=/home/dev/.cache

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
FROM mcr.microsoft.com/devcontainers/javascript-node:22
22

3-
RUN npm install --global pnpm@latest-9
3+
RUN npm install --global pnpm@latest-10

setup/templates/base/.devcontainer/docker-compose.yml renamed to .devcontainer/compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
init: true
99
volumes:
1010
- WORKSPACES:${WORKSPACES}
11-
- ..:${WORKSPACES}/${COMPOSE_PROJECT_NAME}
11+
- ..:${WORKSPACES}/devcontainer-config-setup
1212
- XDG_CONFIG_HOME:${XDG_CONFIG_HOME}
1313
- XDG_CACHE_HOME:${XDG_CACHE_HOME}
1414
- XDG_DATA_HOME:${XDG_DATA_HOME}

.devcontainer/devcontainer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// spell-checker:ignore esbenp azuretools dbaeumer dotnettools
22
{
33
"name": "devcontainer-config-setup",
4-
"dockerComposeFile": "docker-compose.yml",
4+
"dockerComposeFile": "compose.yaml",
55
"service": "devcontainer",
66
"remoteUser": "dev",
77
"overrideCommand": true,
88
"workspaceFolder": "/workspaces/devcontainer-config-setup",
99
"features": {
1010
"ghcr.io/devcontainer-config/features/user-init:2": {},
11-
"ghcr.io/devcontainer-config/features/dot-config:2": {},
11+
"ghcr.io/devcontainer-config/features/dot-config:3": {},
1212
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
1313
"ghcr.io/devcontainers/features/dotnet:2": { "version": "8.0" }
1414
},
@@ -52,6 +52,5 @@
5252
}
5353
}
5454
},
55-
"onCreateCommand": "pnpm install && pnpm restore",
56-
"postAttachCommand": "pnpm watch --detach"
55+
"onCreateCommand": "pnpm install && pnpm restore || true"
5756
}

0 commit comments

Comments
 (0)