Skip to content

Commit

Permalink
Merge pull request #5 from webdeveric/dev
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
webdeveric authored Jul 4, 2024
2 parents fed7fd4 + e422aca commit 8fa3254
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 60 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
- uses: pnpm/action-setup@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
Expand All @@ -24,6 +24,8 @@ jobs:
run: pnpm lint
- name: Type checking
run: pnpm typecheck
- name: Spell checking
run: pnpm spellcheck
- name: Testing
run: pnpm test
- name: Building
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
22
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"packageManager": "[email protected]+sha256.bd91cddc9b205c94b5bf0380cec8fc8e4b1dde7b8c5191732f3d4e73848e860e",
"scripts": {
"lint": "eslint ./*.{js,mjs,cjs,ts,mts,cts} ./src --ext .ts,.tsx,.js --fix",
"spellcheck": "cspell --no-progress \"./{.github,src}/**/*.{js,json}\" \"./*.{md,js}\" \"./package.json\"",
"spellcheck": "cspell \"./{.github,src,typings}/**/*\" \"./*.{md,js,mjs,cjs,ts,mts,cts,json}\"",
"format": "prettier --write .",
"web-ext": "web-ext build",
"postweb-ext": "web-ext lint",
Expand All @@ -40,7 +40,6 @@
"coverage": "vitest run --coverage",
"typecheck": "tsc --noEmit",
"version": "sync-package-version ./src/manifest.json | xargs git add",
"preinstall": "npx --yes check-package-manager --info",
"prepare": "husky"
},
"lint-staged": {
Expand All @@ -57,11 +56,13 @@
"extends @webdeveric/browserslist-config/web-extensions"
],
"dependencies": {
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-dom": "npm:types-react-dom@rc",
"@types/react": "npm:types-react@rc",
"@types/webextension-polyfill": "^0.10.7",
"@webdeveric/utils": "^0.32.0",
"classnames": "^2.5.1"
"classnames": "^2.5.1",
"react-dom": "19.0.0-rc-9c6806964f-20240703",
"react": "19.0.0-rc-9c6806964f-20240703"
},
"devDependencies": {
"@swc/core": "^1.6.7",
Expand Down Expand Up @@ -92,8 +93,6 @@
"postcss-loader": "^8.1.1",
"postcss-nested": "^6.0.1",
"prettier": "^3.3.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"swc-loader": "^0.2.6",
"typescript": "^5.5.3",
"vitest": "^1.6.0",
Expand Down
70 changes: 36 additions & 34 deletions pnpm-lock.yaml

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

14 changes: 0 additions & 14 deletions web-ext-config.js

This file was deleted.

17 changes: 17 additions & 0 deletions web-ext-config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { join } from 'node:path';
import { fileURLToPath } from 'node:url';

const dirname = fileURLToPath(new URL('.', import.meta.url));

export default {
verbose: true,
sourceDir: join(dirname, 'dist'),
artifactsDir: join(dirname, 'build'),
build: {
overwriteDest: true,
},
run: {
startUrl: ['about:devtools-toolbox?id=%40prevent-shortcut-takeover&type=extension'],
},
ignoreFiles: ['pnpm-lock.yaml'],
};
6 changes: 3 additions & 3 deletions webpack.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import WebExtPlugin from 'web-ext-plugin';
import webpack from 'webpack';
import WebpackAssetsManifest from 'webpack-assets-manifest';

import manifest from './src/manifest.json' assert { type: 'json' };
import tsconfig from './tsconfig.json' assert { type: 'json' };
import webExtConfig from './web-ext-config.js';
import manifest from './src/manifest.json' with { type: 'json' };
import tsconfig from './tsconfig.json' with { type: 'json' };
import webExtConfig from './web-ext-config.mjs';

const dirname = fileURLToPath(new URL('.', import.meta.url));
const runnerDebug = process.env.RUNNER_DEBUG === '1';
Expand Down

0 comments on commit 8fa3254

Please sign in to comment.