@eslint-umbrella/presets 1.1.2 → 1.1.3

package/.github/workflows/ci.yml

@@ -1,22 +1,48 @@
-name: ci
+name: CI
 
 on:
-  pull_request:
-    branches: [develop, maestro]
   push:
-    branches: [develop, maestro]
+    branches:
+      - "**"
+  pull_request:
+    branches:
+      - "**"
+  workflow_dispatch:
+
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
 
 permissions:
   contents: read
 
 jobs:
   lint:
+    name: Lint (Node ${{ matrix.node-version }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node-version: [20, 22]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: ${{ matrix.node-version }}
           cache: npm
-      - run: npm ci --ignore-scripts --prefer-offline
-      - run: npm run lint:ci
+
+      - name: Install dependencies
+        run: |
+          node -v
+          npm -v
+          npm config list
+          npm ci
+
+      - name: Run lint (CI)
+        run: npm run lint:ci
+
+      - name: Run tests
+        run: npm test

package/.github/workflows/{release.yml → publish.yml}

@@ -2,12 +2,13 @@ name: release
 
 on:
   push:
-    branches: [maestro]
+    branches: [master]
   workflow_dispatch: {}
 
 permissions:
+  id-token: write
   contents: write
-  pull-requests: write 
+  pull-requests: write
 
 jobs:
   lint:
@@ -18,13 +19,13 @@ jobs:
         with:
           node-version: 20
           cache: npm
-      - run: npm ci --ignore-scripts --prefer-offline
+      - run: npm ci
       - run: npm run lint:ci
+      - run: npm test
 
   release:
     needs: lint
     runs-on: ubuntu-latest
-    environment: maestro
     steps:
       - uses: actions/checkout@v4
         with:
@@ -35,20 +36,10 @@ jobs:
           node-version: 20
           cache: npm
           registry-url: https://registry.npmjs.org
-          always-auth: true
 
-      - run: npm ci --ignore-scripts --prefer-offline
+      - run: npm i -g npm@^11.5.1
 
-      - name: Configure npm auth (userconfig)
-        run: |
-          echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > "$NPM_CONFIG_USERCONFIG"
-          echo "@eslint-umbrella:registry=https://registry.npmjs.org/" >> "$NPM_CONFIG_USERCONFIG"
-          echo "Configured auth in $NPM_CONFIG_USERCONFIG"
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: npm ping
-        run: npm ping
+      - run: npm ci
 
       - uses: changesets/action@v1
         with:
@@ -57,5 +48,4 @@ jobs:
           createGithubReleases: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_CONFIG_PROVENANCE: true

package/CHANGELOG.md

@@ -1,10 +1,17 @@
 # @eslint-umbrella/presets
 
+## 1.1.3
+
+### Patch Changes
+
+- some fixes
+
 ## 1.1.2
 
 ### Patch Changes
 
-- 22a0301: something
+- e43ff12: something
+- dwd
 
 ## 1.1.1
 

package/package.json

@@ -1,11 +1,21 @@
 {
   "name": "@eslint-umbrella/presets",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "type": "module",
-  "description": "Pinned ESLint flat config presets for React, Next.js, Express, NestJS, React Native, React-PDF, and base/test",
+  "description": "Batteries-included ESLint flat config presets for React, Next.js, Express, NestJS, React Native, React-PDF, and TypeScript",
+  "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Papitoulini/eslint-umbrella.git"
+  },
+  "homepage": "https://github.com/Papitoulini/eslint-umbrella#readme",
+  "bugs": {
+    "url": "https://github.com/Papitoulini/eslint-umbrella/issues"
+  },
+  "sideEffects": false,
   "exports": {
     ".": "./src/index.js",
     "./base": "./src/base.js",
@@ -17,38 +27,38 @@
     "./react-native": "./src/react-native.js",
     "./react-pdf": "./src/react-pdf.js"
   },
-  "sideEffects": false,
   "scripts": {
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "lint:ci": "eslint . --max-warnings=0",
+    "test": "node --test",
     "changeset": "changeset",
     "version-packages": "changeset version && npm i --package-lock-only --ignore-scripts",
     "release": "changeset publish"
   },
-  "license": "MIT",
   "dependencies": {
+    "@eslint/js": "^9.39.2",
     "@next/eslint-plugin-next": "14.2.14",
-    "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-react": "7.37.1",
-    "eslint-plugin-react-hooks": "5.1.0",
-    "eslint-plugin-react-refresh": "0.4.12",
-    "eslint-plugin-security": "3.0.1",
-    "eslint-plugin-unused-imports": "4.1.4",
-    "globals": "^16.4.0",
-    "typescript": "5.6.3",
-    "typescript-eslint": "8.8.1",
+    "@stylistic/eslint-plugin": "^5.7.1",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-promise": "^7.2.1",
-    "@stylistic/eslint-plugin": "^5.3.1",
-    "@eslint/js": "^9.35.0",
-    "eslint-plugin-react-native": "^5.0.0"
-  },
-  "devDependencies": {
-    "@changesets/cli": "^2.29.7",
-    "eslint": "^9.35.0",
-    "nodemon": "^3.1.10"
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^5.1.0",
+    "eslint-plugin-react-native": "^5.0.0",
+    "eslint-plugin-react-refresh": "^0.4.12",
+    "eslint-plugin-security": "^3.0.1",
+    "eslint-plugin-unused-imports": "^4.1.4",
+    "globals": "^16.5.0",
+    "typescript": "5.6.3",
+    "typescript-eslint": "^8.8.1"
   },
   "peerDependencies": {
     "eslint": "^9.0.0"
+  },
+  "devDependencies": {
+    "@changesets/cli": "^2.29.7",
+    "eslint": "^9.39.2",
+    "@types/node": "^20.0.0",
+    "undici-types": "^7.16.0"
   }
 }

package/readme.md

@@ -187,6 +187,14 @@ export default [
 
 > Do **not** delete pending `.changeset/*.md`; the version step consumes them automatically.
 
+
+## 🔁 Publish flow (develop → master)
+
+1. Ensure `develop` is green and up to date.
+2. Open a PR from `develop` into `master`.
+3. Run the release steps above in the PR branch (or let CI handle it).
+4. Merge the PR after approvals; `master` is the published source of truth.
+
 ---
 
 ## 🤝 Contributing

package/src/base-typechecked.js

@@ -142,6 +142,14 @@ export default function baseTypeChecked(project = ["tsconfig.json"]) {
 					"error",
 					{ checksVoidReturn: { attributes: false } }
 				],
+				"@typescript-eslint/no-unused-expressions": [
+					"error",
+					{
+						allowShortCircuit: false,
+						allowTernary: false,
+						allowTaggedTemplates: false
+					}
+				],
 				"@typescript-eslint/no-unnecessary-condition": [
 					"warn",
 					{ allowConstantLoopConditions: true }

package/tests/fixtures/nest.ts

@@ -0,0 +1,5 @@
+export class ExampleService {
+	getValue(): number {
+		return 1;
+	}
+}

package/tests/fixtures/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "strict": true,
+    "noEmit": true
+  },
+  "include": ["**/*.ts", "**/*.tsx"]
+}

package/tests/fixtures/typechecked.ts

@@ -0,0 +1,6 @@
+export const value = 1;
+
+export async function getValue(): Promise<number> {
+	await Promise.resolve();
+	return value;
+}

package/tests/presets.test.js

@@ -0,0 +1,132 @@
+import assert from "node:assert/strict";
+import path from "node:path";
+import test from "node:test";
+import { fileURLToPath } from "node:url";
+
+import { ESLint } from "eslint";
+
+import {
+	base,
+	baseTypeChecked,
+	express,
+	nest,
+	nestTypeChecked,
+	next,
+	react,
+	reactNative,
+	reactPdf
+} from "../src/index.js";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const fixturesDir = path.join(__dirname, "fixtures");
+const tsconfigPath = path.join(fixturesDir, "tsconfig.json");
+
+const formatMessages = messages =>
+	messages
+		.map(message => `${message.ruleId ?? "unknown"}: ${message.message}`)
+		.join("\n");
+
+const withTsconfigRoot = (config, tsconfigRootDir) => [
+	...config,
+	{ languageOptions: { parserOptions: { tsconfigRootDir } } }
+];
+
+async function lintText(config, code, { filename, cwd = process.cwd() } = {}) {
+	const eslint = new ESLint({
+		cwd,
+		overrideConfigFile: null,
+		overrideConfig: config,
+		ignore: false
+	});
+
+	const results = await eslint.lintText(code, { filePath: path.join(cwd, filename) });
+	const errors = results.flatMap(result => result.messages.filter(message => message.severity === 2));
+
+	assert.equal(
+		errors.length,
+		0,
+		errors.length ? `Unexpected ESLint errors:\n${formatMessages(errors)}` : undefined
+	);
+}
+
+test("base preset lints a simple module", async () => {
+	await lintText(
+		base(),
+		"const value = 1; export default value;",
+		{ filename: "base.js" }
+	);
+});
+
+test("react preset lints JSX", async () => {
+	await lintText(
+		react(),
+		"const App = () => <div />; export default App;",
+		{ filename: "component.jsx" }
+	);
+});
+
+test("next preset lints a page component", async () => {
+	await lintText(
+		next(),
+		"export default function Page() { return <div />; }",
+		{ filename: "page.jsx" }
+	);
+});
+
+test("express preset lints a basic app", async () => {
+	await lintText(
+		express(),
+		"import express from \"express\"; const app = express(); app.get(\"/\", (req, res) => { res.send(\"ok\"); }); export default app;",
+		{ filename: "server.js" }
+	);
+});
+
+test("nest preset lints a service class", async () => {
+	await lintText(
+		nest(),
+		"export class ExampleService { getValue() { return 1; } }",
+		{ filename: "service.ts" }
+	);
+});
+
+test("react-native preset lints a component", async () => {
+	await lintText(
+		reactNative(),
+		"import { StyleSheet, View } from \"react-native\"; const styles = StyleSheet.create({ container: { flex: 1 } }); const App = () => <View style={styles.container} />; export default App;",
+		{ filename: "app.jsx" }
+	);
+});
+
+test("react-pdf preset lints a hook-based component", async () => {
+	await lintText(
+		reactPdf(),
+		"import { useEffect } from \"react\"; export default function Doc() { useEffect(() => {}, []); return null; }",
+		{ filename: "doc.jsx" }
+	);
+});
+
+test("base type-checked preset lints TS", async () => {
+	await lintText(
+		withTsconfigRoot(baseTypeChecked([tsconfigPath]), fixturesDir),
+		[
+			"export type Id = string;",
+			"export interface User { id: Id }",
+			"export const user: User = { id: '1' };"
+		].join("\n"),
+		{ filename: "typechecked.ts", cwd: fixturesDir }
+	);
+});
+
+test("nest type-checked preset lints TS", async () => {
+	await lintText(
+		withTsconfigRoot(nestTypeChecked([tsconfigPath]), fixturesDir),
+		[
+			"export class ExampleService {",
+			"\tgetValue(): number {",
+			"\t\treturn 1;",
+			"\t}",
+			"}"
+		].join("\n"),
+		{ filename: "nest.ts", cwd: fixturesDir }
+	);
+});