Skip to content
Merged

Node 24 #11107

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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22
24
2 changes: 1 addition & 1 deletion config/content-security-policy.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import builder from 'content-security-policy-builder';
import { FeatureFlags } from './feature-flags';
import { type FeatureFlags } from './feature-flags.ts';

const SELF = "'self'";

Expand Down
2 changes: 1 addition & 1 deletion config/notify-webpack-plugin.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Originally from https://github.com/joshhunt/notify-webpack-plugin/, converted to TypeScript

import { Compiler, Stats } from 'webpack';
import { type Compiler, type Stats } from 'webpack';

import chalk from 'chalk';

Expand Down
15 changes: 8 additions & 7 deletions config/webpack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@ import TerserPlugin from 'terser-webpack-plugin';
import 'webpack-dev-server';
import { InjectManifest } from 'workbox-webpack-plugin';
import zlib from 'zlib';
import csp from './content-security-policy';
import { makeFeatureFlags } from './feature-flags';
import csp from './content-security-policy.ts';
import { makeFeatureFlags } from './feature-flags.ts';

import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';

import { StatsWriterPlugin } from 'webpack-stats-plugin';
import NotifyPlugin from './notify-webpack-plugin';
import NotifyPlugin from './notify-webpack-plugin.ts';

const ASSET_NAME_PATTERN = 'static/[name]-[contenthash:6][ext]';

import packageJson from '../package.json';
import createWebAppManifest from './manifest-webapp';
import packageJson from '../package.json' with { type: 'json' };
import createWebAppManifest from './manifest-webapp.ts';

import cssnano from 'cssnano';
import sortMediaQueries from 'postcss-sort-media-queries';

import splash from '../icons/splash.json';
import splash from '../icons/splash.json' with { type: 'json' };

// https://stackoverflow.com/questions/69584268/what-is-the-type-of-the-webpack-config-function-when-it-comes-to-typescript
type CLIValues = boolean | string;
Expand Down Expand Up @@ -113,7 +113,7 @@ export default (env: Env) => {
host: process.env.DOCKER ? '0.0.0.0' : 'localhost',
allowedHosts: 'all',
server: {
type: 'spdy',
type: 'https',
options: {
key: fs.readFileSync('key.pem'), // Private keys in PEM format.
cert: fs.readFileSync('cert.pem'), // Cert chains in PEM format.
Expand Down Expand Up @@ -552,6 +552,7 @@ export default (env: Env) => {
format: 'html',
outputDir: 'sonda-report',
open: false,
deep: true,
sources: true,
gzip: false,
brotli: false,
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
webpack:
container_name: dim-webpack
image: node:18
image: node:24
ports:
- 8080:8080
working_dir: /usr/src/app
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"fix:json": "jsonsort src/locale",
"fix:stylelint": "pnpm lint:stylelint --fix",
"fix:prettier": "prettier \"src/**/*.{js,ts,tsx,cjs,mjs,cts,mts,scss}\" --write",
"bundle": "webpack --config ./config/webpack.ts",
"bundle": "webpack --config ./config/webpack.ts --disable-interpret",
"build:release": "pnpm -s bundle --env=release --node-env=production",
"build:beta": "pnpm -s bundle --env=beta --node-env=production",
"build:pr": "pnpm -s bundle --env=pr --node-env=production",
"build:dev": "pnpm -s bundle --env=dev",
"i18n": "i18next-scanner --config ./i18next-scanner.config.cjs",
"start": "pnpm run --reporter-hide-prefix --stream '/^(watch:i18n|devserver)$/'",
"devserver": "nodemon --delay 2 --watch config/webpack.ts --watch config/feature-flags.ts --watch config/content-security-policy.ts --watch pnpm-lock.yaml -e ts,js,json,lock --exec \"pnpm install --frozen-lockfile --prefer-offline && webpack serve --config ./config/webpack.ts --env=dev || pnpm touch\"",
"devserver": "nodemon --delay 2 --watch config/webpack.ts --watch config/feature-flags.ts --watch config/content-security-policy.ts --watch pnpm-lock.yaml -e ts,js,json,lock --exec \"pnpm install --frozen-lockfile --prefer-offline && webpack serve --disable-interpret --config ./config/webpack.ts --env=dev || pnpm touch\"",
"touch": "node -e \"require('fs').utimes('config/webpack.ts', new Date(), new Date(), () => {})\"",
"watch:i18n": "nodemon --watch config/i18n.json --exec \"pnpm i18n\"",
"syntax": "find dist -name \"*.js\" | xargs -n 1 node --check",
Expand Down Expand Up @@ -206,6 +206,7 @@
"@textcomplete/utils": "^0.1.13",
"bungie-api-ts": "^5.10.0",
"caniuse-lite": "^1.0.30001757",
"chalk": "^5.6.0",
"clsx": "^2.1.1",
"comlink": "^4.4.2",
"core-js": "^3.47.0",
Expand Down
4 changes: 3 additions & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.