Skip to content

Commit 321d470

Browse files
authored
fix!: remove rollup, extraneous types and migrate to ESM-only (#352)
* fix!: remove `rollup`, extraneous types and migrate to ESM-only * wip
1 parent c94ea92 commit 321d470

File tree

8 files changed

+29
-185
lines changed

8 files changed

+29
-185
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@ jobs:
5757
run: npm install
5858
- name: Check Types
5959
run: npm run test:types
60+
are_the_types_wrong:
61+
name: Are the types wrong?
62+
runs-on: ubuntu-latest
63+
steps:
64+
- uses: actions/checkout@v6
65+
- name: Setup Node.js
66+
uses: actions/setup-node@v6
67+
with:
68+
node-version: "lts/*"
69+
- name: Install Packages
70+
run: npm install
71+
- name: Check validity of type definitions
72+
run: npm run lint:types
6073
jsr_test:
6174
name: Verify JSR Publish
6275
runs-on: ubuntu-latest

jsr.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"name": "@eslint/css",
33
"version": "0.14.1",
44
"exports": {
5-
".": "./dist/esm/index.js"
5+
".": "./dist/index.js"
66
},
77
"publish": {
88
"include": [
9-
"dist/esm",
9+
"dist",
1010
"README.md",
1111
"jsr.json",
1212
"LICENSE"

package.json

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,15 @@
44
"description": "CSS linting plugin for ESLint",
55
"author": "Nicholas C. Zakas",
66
"type": "module",
7-
"main": "dist/esm/index.js",
8-
"types": "dist/esm/index.d.ts",
7+
"main": "dist/index.js",
8+
"types": "dist/index.d.ts",
99
"exports": {
1010
".": {
11-
"require": {
12-
"types": "./dist/cjs/index.d.cts",
13-
"default": "./dist/cjs/index.cjs"
14-
},
15-
"import": {
16-
"types": "./dist/esm/index.d.ts",
17-
"default": "./dist/esm/index.js"
18-
}
11+
"types": "./dist/index.d.ts",
12+
"default": "./dist/index.js"
1913
},
2014
"./types": {
21-
"require": {
22-
"types": "./dist/cjs/types.cts"
23-
},
24-
"import": {
25-
"types": "./dist/esm/types.d.ts"
26-
}
15+
"types": "./dist/types.d.ts"
2716
}
2817
},
2918
"files": [
@@ -40,11 +29,8 @@
4029
"eslint --fix",
4130
"prettier --write"
4231
],
43-
"README.md": [
44-
"npm run build:update-rules-docs"
45-
],
4632
"!(*.js)": "prettier --write --ignore-unknown",
47-
"{src/rules/*.js,tools/update-rules-docs.js}": [
33+
"{src/rules/*.js,tools/update-rules-docs.js,README.md}": [
4834
"npm run build:update-rules-docs",
4935
"git add README.md"
5036
]
@@ -58,21 +44,21 @@
5844
},
5945
"homepage": "https://github.com/eslint/css#readme",
6046
"scripts": {
61-
"build:dedupe-types": "node tools/dedupe-types.js dist/cjs/index.cjs dist/esm/index.js",
62-
"build:cts": "node -e \"fs.copyFileSync('dist/esm/index.d.ts', 'dist/cjs/index.d.cts')\" && node tools/update-cts.js dist/cjs/types.cts dist/cjs/index.d.cts",
47+
"build": "npm run build:rules && npm run build:types && npm run build:update-rules-docs",
48+
"build:baseline": "node tools/generate-baseline.js",
6349
"build:rules": "node tools/build-rules.js",
64-
"build": "npm run build:rules && rollup -c && npm run build:dedupe-types && tsc -p tsconfig.esm.json && npm run build:cts",
50+
"build:types": "tsc",
6551
"build:update-rules-docs": "node tools/update-rules-docs.js",
66-
"build:baseline": "node tools/generate-baseline.js",
6752
"prepare": "npm run build",
6853
"pretest": "npm run build",
6954
"lint": "eslint",
7055
"lint:fix": "eslint --fix",
56+
"lint:types": "attw --pack --profile esm-only",
7157
"fmt": "prettier --write .",
7258
"fmt:check": "prettier --check .",
7359
"test": "mocha \"tests/**/*.test.js\"",
7460
"test:coverage": "c8 npm test",
75-
"test:jsr": "npx jsr@latest publish --dry-run",
61+
"test:jsr": "npx -y jsr@latest publish --dry-run",
7662
"test:types": "npm run build && tsc -p tests/types/tsconfig.json"
7763
},
7864
"keywords": [
@@ -89,6 +75,7 @@
8975
"@eslint/plugin-kit": "^0.5.1"
9076
},
9177
"devDependencies": {
78+
"@arethetypeswrong/cli": "^0.18.2",
9279
"@eslint/json": "^0.14.0",
9380
"c8": "^10.1.3",
9481
"dedent": "^1.5.3",
@@ -101,9 +88,6 @@
10188
"mdn-data": "^2.26.0",
10289
"mocha": "^11.0.0",
10390
"prettier": "^3.7.3",
104-
"rollup": "^4.52.3",
105-
"rollup-plugin-copy": "^3.5.0",
106-
"rollup-plugin-delete": "^3.0.1",
10791
"tailwind-csstree": "^0.1.0",
10892
"typescript": "^5.9.2",
10993
"web-features": "^3.13.0",

rollup.config.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

tools/dedupe-types.js

Lines changed: 0 additions & 87 deletions
This file was deleted.

tools/update-cts.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

tsconfig.esm.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

tsconfig.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
2-
"files": ["src/index.js"],
2+
"include": ["src/**/*.js", "src/**/*.ts"],
33
"compilerOptions": {
44
"declaration": true,
5-
"emitDeclarationOnly": true,
65
"allowJs": true,
76
"checkJs": true,
8-
"outDir": "dist/esm",
7+
"outDir": "dist",
98
"skipLibCheck": true,
109
"target": "ES2022",
1110
"lib": ["ES2022"],

0 commit comments

Comments
 (0)