Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies, esbuild 0.25.0, eslint 9 #146

Merged
merged 6 commits into from
Feb 13, 2025
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
11 changes: 11 additions & 0 deletions .changeset/rare-elephants-speak.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@jgoz/esbuild-plugin-livereload': patch
'@jgoz/esbuild-plugin-typecheck': patch
'@jgoz/esbuild-plugin-html': patch
'@jgoz/esbuild-plugin-sass': patch
'@jgoz/esbuild-overlay': patch
'@jgoz/jest-esbuild': patch
'esbd': patch
---

Support esbuild 0.25.0
3 changes: 0 additions & 3 deletions .eslintignore

This file was deleted.

14 changes: 0 additions & 14 deletions .eslintrc

This file was deleted.

7 changes: 6 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [18, 20]
node-version: [20, 22]
name: Build & Test (Node v${{ matrix.node-version }})
runs-on: ubuntu-latest
timeout-minutes: 15
Expand Down Expand Up @@ -48,6 +48,11 @@ jobs:
env:
CHOKIDAR_USEPOLLING: '1'
TSC_WATCHFILE: 'DynamicPriorityPolling'
- uses: actions/upload-artifact@v4
if: failure()
with:
name: test-output-${{ matrix.node-version }}
path: '**/test-results/**/*.png'

release:
needs: [build]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/playwright:v1.48.1-jammy
FROM mcr.microsoft.com/playwright:v1.50.1-jammy

RUN apt-get update && \
# Install node18
Expand Down
29 changes: 29 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import globals from 'globals';
import { configs } from '@awesome-code-style/eslint-config';

export default [
{
ignores: ['**/fixture/**/*', '**/dist/**/*', '**/lib/**/*'],
},
...configs.default,
configs.disableTypeChecked,
{
files: ['**/bundle.js'],
languageOptions: {
globals: {
...globals.node,
},
},
rules: {
'@typescript-eslint/no-var-requires': 'off',
},
},
{
files: ['**/*.config.ts'],
languageOptions: {
globals: {
...globals.node,
},
},
},
];
31 changes: 16 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,27 @@
"url": "https://github.com/jgoz/esbuild-plugins/issues"
},
"volta": {
"node": "20.13.1"
"node": "20.18.3"
},
"devDependencies": {
"@awesome-code-style/eslint-config": "^5.1.0",
"@awesome-code-style/prettier-config": "^5.0.0",
"@changesets/cli": "^2.27.9",
"@awesome-code-style/eslint-config": "^6.0.1",
"@awesome-code-style/prettier-config": "^5.0.1",
"@changesets/cli": "^2.27.12",
"@tsconfig/node16": "^16.1.3",
"@typescript-eslint/eslint-plugin": "^7.10.0",
"@typescript-eslint/parser": "^7.10.0",
"esbuild": "^0.24.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-simple-import-sort": "^12.1.0",
"eslint-plugin-unused-imports": "^3.2.0",
"@typescript-eslint/eslint-plugin": "^8.24.0",
"@typescript-eslint/parser": "^8.24.0",
"esbuild": "^0.25.0",
"eslint": "^9.20.1",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-unused-imports": "^4.1.4",
"execa": "^5.0.0",
"prettier": "^3.2.5",
"tslib": "^2.8.0",
"globals": "^15.15.0",
"prettier": "^3.5.1",
"tslib": "^2.8.1",
"typedoc": "^0.25.13",
"typescript": "^5.6.3"
"typescript": "^5.7.3"
},
"pnpm": {
"overrides": {
Expand Down
10 changes: 0 additions & 10 deletions packages/esbd/.eslintrc.js

This file was deleted.

13 changes: 13 additions & 0 deletions packages/esbd/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { configs } from '@awesome-code-style/eslint-config';

export default [
{
ignores: ['**/fixture/**/*', '**/dist/**/*', '**/lib/**/*'],
},
...configs.default,
...configs.typeChecked,
{
files: ['**/*.js', '**/*.cjs', '**/*.mjs', '**/*.jsx', '**/*.config.ts'],
...configs.disableTypeChecked,
},
];
25 changes: 13 additions & 12 deletions packages/esbd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,32 @@
"esbuild": "0.17.x || 0.18.x || 0.19.x || 0.20.x || 0.21.x || 0.22.x || 0.23.x || 0.24.x"
},
"devDependencies": {
"@playwright/test": "^1.48.1",
"@awesome-code-style/eslint-config": "^6.0.1",
"@playwright/test": "^1.50.1",
"@types/js-beautify": "^1.14.3",
"@types/pretty-time": "^1.1.5",
"@types/serve-static": "1.15.7",
"@types/wait-on": "^5.3.4",
"cleye": "^1.3.2",
"esbuild": "^0.24.0",
"cleye": "^1.3.4",
"esbuild": "^0.25.0",
"execa": "^5.0.0",
"get-port": "^5.0.0",
"io-spin": "^0.4.1",
"js-beautify": "^1.15.1",
"js-beautify": "^1.15.3",
"memfs": "^3.5.3",
"node-graceful": "^3.1.0",
"parse5": "^7.2.0",
"parse5": "^7.2.1",
"picocolors": "^1.1.1",
"pretty-bytes": "^5.6.0",
"pretty-time": "^1.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"serve-static": "^1.16.2",
"tslib": "^2.8.0",
"typescript": "^5.6.3",
"vite": "^5.4.10",
"vitest": "^2.1.3",
"wait-on": "^7.2.0"
"tslib": "^2.8.1",
"typescript": "^5.7.3",
"vite": "^6.1.0",
"vitest": "^3.0.5",
"wait-on": "^8.0.2"
},
"scripts": {
"docs": "../../scripts/markdown-interpolate.mjs README.md && prettier --write README.md",
Expand Down
3 changes: 2 additions & 1 deletion packages/esbd/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import nodeDev from './esbd-node-dev';
import serve from './esbd-serve';
import { createLogger, LOG_LEVELS, LogLevelType } from './log';

// eslint-disable-next-line @typescript-eslint/no-require-imports
const version = require('../package.json').version;

function updateConfig(config: EsbdConfig, logLevel: LogLevel): ResolvedEsbdConfig {
Expand All @@ -36,7 +37,7 @@ function getSingleConfigResult(
const config = Array.isArray(configResult)
? configResult.length === 1
? configResult[0]
: predicates.map(predicate => configResult.find(predicate)).filter(Boolean)[0]
: predicates.map(predicate => configResult.find(predicate)).find(Boolean)
: configResult;

if (!config) {
Expand Down
1 change: 1 addition & 0 deletions packages/esbd/src/esbd-build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export default async function esbdBuildMulti(
) {
if (options.check) {
const TypecheckRunner: typeof TypecheckRunnerCls =
// eslint-disable-next-line @typescript-eslint/no-require-imports
require('@jgoz/esbuild-plugin-typecheck').TypecheckRunner;

const checks = new Map<string, TypecheckRunnerCls>();
Expand Down
1 change: 1 addition & 0 deletions packages/esbd/src/esbd-node-dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export default async function esbdNodeDev(

if (check) {
const TypecheckRunner: typeof TypecheckRunnerCls =
// eslint-disable-next-line @typescript-eslint/no-require-imports
require('@jgoz/esbuild-plugin-typecheck').TypecheckRunner;

const runner = new TypecheckRunner({
Expand Down
1 change: 1 addition & 0 deletions packages/esbd/src/esbd-serve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ export default async function esbdServe(

if (check) {
const TypecheckRunner: typeof TypecheckRunnerCls =
// eslint-disable-next-line @typescript-eslint/no-require-imports
require('@jgoz/esbuild-plugin-typecheck').TypecheckRunner;

const runner = new TypecheckRunner({
Expand Down
2 changes: 1 addition & 1 deletion packages/esbd/test/config/node-dev-test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/consistent-indexed-object-style */
/* eslint-disable no-empty-pattern */
import { test as base } from '@playwright/test';
import { EventEmitter } from 'events';
Expand Down Expand Up @@ -47,6 +46,7 @@ const test = base.extend<ServerTestFixtures>({
}),
);
}

await use(writeFiles);
},

Expand Down
2 changes: 1 addition & 1 deletion packages/esbd/test/config/serve-test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/consistent-indexed-object-style */
/* eslint-disable no-empty-pattern */
import { test as base } from '@playwright/test';
import { EventEmitter } from 'events';
Expand Down Expand Up @@ -46,6 +45,7 @@ const test = base.extend<ServerTestFixtures>({
}),
);
}

await use(writeFiles);
},

Expand Down
35 changes: 21 additions & 14 deletions packages/esbd/test/esbd-serve.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ test('serves content from entry point', async ({ page, port, startServer }) => {
</html>
`,
'src/entry.tsx': `
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import { App } from './app';
ReactDOM.render(<App />, document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById('root'))
root.render(<App />);
`,
'src/app.tsx': `
export function App() {
Expand Down Expand Up @@ -54,9 +55,10 @@ test('can disable index rewriting', async ({ page, port, startServer }) => {
</html>
`,
'src/entry.tsx': `
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import { App } from './app';
ReactDOM.render(<App />, document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById('root'))
root.render(<App />);
`,
'src/app.tsx': `
export function App() {
Expand Down Expand Up @@ -91,9 +93,10 @@ test('reloads page on file update if livereload enabled', async ({ page, port, s
</html>
`,
'src/entry.tsx': `
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import { App } from './app';
ReactDOM.render(<App />, document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById('root'))
root.render(<App />);
`,
'src/app.tsx': `
export function App() {
Expand Down Expand Up @@ -144,9 +147,10 @@ test('can serve from publicPath', async ({ page, port, startServer }) => {
</html>
`,
'src/entry.tsx': `
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import { App } from './app';
ReactDOM.render(<App />, document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById('root'))
root.render(<App />);
`,
'src/app.tsx': `
import cat from '../img/cat.png';
Expand Down Expand Up @@ -189,9 +193,10 @@ test('can disable index rewriting with publicPath', async ({ page, port, startSe
</html>
`,
'src/entry.tsx': `
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import { App } from './app';
ReactDOM.render(<App />, document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById('root'))
root.render(<App />);
`,
'src/app.tsx': `
import cat from '../img/cat.png';
Expand Down Expand Up @@ -235,9 +240,10 @@ test('can serve static files from a given directory', async ({ page, port, start
</html>
`,
'src/entry.tsx': `
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import { App } from './app';
ReactDOM.render(<App />, document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById('root'))
root.render(<App />);
`,
'src/app.tsx': `
export function App() {
Expand Down Expand Up @@ -274,10 +280,11 @@ test('page replaces stylesheets without reloading', async ({ page, port, startSe
</html>
`,
'src/entry.tsx': `
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import './style.css';
function App() { return <div>Hello world</div>; }
ReactDOM.render(<App />, document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById('root'))
root.render(<App />);
`,
'src/style.css': `
body { background: white; }
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions packages/esbuild-overlay/.eslintrc.js

This file was deleted.

13 changes: 13 additions & 0 deletions packages/esbuild-overlay/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { configs } from '@awesome-code-style/eslint-config';

export default [
{
ignores: ['**/fixture/**/*', '**/dist/**/*', '**/lib/**/*'],
},
...configs.default,
...configs.typeChecked,
{
files: ['**/*.js', '**/*.cjs', '**/*.mjs', '**/*.jsx', '**/*.config.ts'],
...configs.disableTypeChecked,
},
];
Loading
Loading