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

chore(frontend)!: migrate to esm #407

Merged
merged 2 commits into from
Feb 9, 2024
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
File renamed without changes.
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ jobs:
tag-prefix: "v"
# output-file: "UPDATELOG.md" # Since v1.4.3, using [email protected]
release-count: "10"
pre-changelog-generation: ".github/conventional-changelog/pre-changelog-generation.js"
config-file-path: ".github/conventional-changelog/config.js"
pre-changelog-generation: ".github/conventional-changelog/pre-changelog-generation.cjs"
config-file-path: ".github/conventional-changelog/config.cjs"
git-branch: "main"
env:
NYANPASU_VERSION: ${{ steps.update-version.outputs.version }}
Expand Down
2 changes: 1 addition & 1 deletion .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
"*.{js,cjs,.mjs,jsx}": ["prettier --write", "eslint --cache --fix"],
"*.{ts,tsx}": [
"prettier --write",
Expand Down
6 changes: 4 additions & 2 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
module.exports = {
import PostCssScss from "postcss-scss";

export default {
root: true,
defaultSeverity: "error",
plugins: [
Expand Down Expand Up @@ -48,7 +50,7 @@ module.exports = {
overrides: [
{
files: ["**/*.scss", "*.scss"],
customSyntax: require("postcss-scss"),
customSyntax: PostCssScss,
rules: {
"at-rule-no-unknown": null,
"import-notation": null,
Expand Down
2 changes: 1 addition & 1 deletion commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = { extends: ["@commitlint/config-conventional"] };
export default { extends: ["@commitlint/config-conventional"] };
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "clash-nyanpasu",
"version": "1.4.5",
"license": "GPL-3.0",
"type": "module",
"scripts": {
"dev": "tauri dev -f default-meta -c ./backend/tauri/tauri.conf.json",
"dev:diff": "tauri dev -f verge-dev -c ./backend/tauri/tauri.conf.json",
Expand Down Expand Up @@ -54,6 +55,11 @@
}
]
},
"pnpm": {
"overrides": {
"vite-plugin-monaco-editor": "npm:[email protected]"
}
},
"dependencies": {
"@dnd-kit/core": "6.1.0",
"@dnd-kit/sortable": "8.0.0",
Expand Down
107 changes: 12 additions & 95 deletions pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
plugins: {
// to edit target browsers: use "browserslist" field in package.json
"postcss-import": {},
Expand Down
Loading