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.

Sign up for GitHub

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

Jump to bottom

Package updates, electron config updates (v24) #165

Merged
merged 10 commits into from Jul 6, 2023
Merged

Package updates, electron config updates (v24) #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0a3e169
Updating all packages and fixing linting errors
SimonSimCity Jun 28, 2023
660947a
Update to new signing process (electron v24)
SimonSimCity Jul 3, 2023
b8eddd7
Electron - enable dark-mode support
SimonSimCity Jul 3, 2023
084596f
Electron - Allow validation of signing
SimonSimCity Jul 3, 2023
5a06b0e
Electron - Linux - Add support for mime-type to desktop file
SimonSimCity Jul 3, 2023
1ed2f75
Replace @vitest/coverage-c8 by @vitest/coverage-v8
SimonSimCity Jul 3, 2023
b1f7a56
Fix config and dependencies for nuxt-electron
SimonSimCity Jul 3, 2023
f492f60
Add electron-env to linter to ensure it will pass, added note for users
SimonSimCity Jul 3, 2023
4d13ed9
Remove unnecessary import
SimonSimCity Jul 3, 2023
9522a6c
Merge branch 'main' into package-updates
SimonSimCity Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions components/track/TrackList.vue
View file
Open in desktop
Expand Up @@ -19,11 +19,13 @@ const showDropDownForTrack: Ref<null | string> = ref(null);

const isTrackTypeKnown = () => {
const firstType = props.tracks?.[0]?.subtype;
return props.tracks?.every(
(track: TrackModel) =>
track.subtype === firstType ||
(track.subtype === "song" && firstType === "singsong") ||
(track.subtype === "singsong" && firstType === "song")
return (
props.tracks?.every(
(track: TrackModel) =>
track.subtype === firstType ||
(track.subtype === "song" && firstType === "singsong") ||
(track.subtype === "singsong" && firstType === "song")
) || false
);
};

Expand Down
4 changes: 3 additions & 1 deletion electron-builder.yml
View file
Open in desktop
@@ -1,6 +1,5 @@
appId: org.brunstad.bmm
productName: BMM alpha
afterSign: "electron-builder-notarize"
protocols:
- name: Custom BMM
schemes: ["bmm"]
Expand All @@ -9,6 +8,8 @@ mac:
entitlements: build/entitlements.mac.plist
icon: resources/app.icns
hardenedRuntime: true
darkModeSupport: true
gatekeeperAssess: true
target:
- target: dmg
arch: x64
Expand All @@ -24,6 +25,7 @@ linux:
Keywords: audio;bcc;bmm;brunstad;christian;church;edification;faith;media;music;sermon
SingleMainWindow: true
StartupWMClass: bmm-web
MimeType: x-scheme-handler/bmm
target:
- AppImage
- deb
Expand Down
8 changes: 8 additions & 0 deletions nuxt.config.ts
View file
Open in desktop
Expand Up @@ -57,4 +57,12 @@ export default defineNuxtConfig({
colorMode: {
classSuffix: "",
},
// TODO: Option is marked as invalid if env ELECTRON is not enabled, because this enables the module which allows the configuration.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if I understand this

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nuxt generates types, specially those for the valid nuxt-config. If the module nuxt-electron is loaded, the config property electron is allowed. If its not added (when the env ELECTRON is falsy), this property is not valid. Means when running pnpm dev, your ide will show it as wrong, same as when running nuxi typecheck. You need to set the env ELECTRON as truthy for the types to match. See f492f60, where this comment was added.

electron: {
build: [
{
entry: "electron/main.ts",
},
],
},
});
57 changes: 29 additions & 28 deletions package.json
View file
Open in desktop
Expand Up @@ -14,55 +14,56 @@
"preview": "cross-env PORT=9001 nuxt preview",
"coverage": "vitest run --coverage",
"e2e": "cypress open",
"lint": "stylelint \"**/*.{vue,scss}\" && prettier . --check && eslint --ext ts,js,vue,json . && nuxi typecheck",
"lint": "stylelint \"**/*.{vue,scss}\" && prettier . --check && eslint --ext ts,js,vue,json . && ELECTRON=true nuxi typecheck",
"test": "vitest",
"postinstall": "nuxt prepare"
},
"dependencies": {
"@auth0/auth0-vue": "^2.2.0",
"@bcc-code/bmm-sdk-fetch": "^7.0.0",
"@headlessui/vue": "^1.7.13",
"@headlessui/vue": "^1.7.14",
"@microsoft/applicationinsights-web": "^3.0.2",
"@pinia/nuxt": "^0.4.9",
"class-variance-authority": "^0.5.2",
"@pinia/nuxt": "^0.4.11",
"class-variance-authority": "^0.6.1",
"cross-env": "^7.0.3",
"pinia": "^2.1.4",
"tailwind-scrollbar-hide": "^1.1.7"
},
"devDependencies": {
"@intlify/eslint-plugin-vue-i18n": "^2.0.0",
"@nuxt/devtools": "^0.4.1",
"@nuxt/kit": "^3.4.3",
"@nuxt/devtools": "^0.6.4",
"@nuxt/kit": "^3.6.1",
"@nuxtjs/color-mode": "^3.3.0",
"@nuxtjs/eslint-config-typescript": "^12.0.0",
"@nuxtjs/i18n": "8.0.0-beta.10",
"@nuxtjs/tailwindcss": "^6.6.6",
"@vitest/coverage-c8": "^0.30.1",
"@vue/test-utils": "^2.3.2",
"@nuxtjs/tailwindcss": "^6.8.0",
"@vitest/coverage-v8": "^0.32.3",
"@vue/test-utils": "^2.4.0",
"chalk": "^5.2.0",
"cypress": "^12.10.0",
"electron": "^24.1.2",
"cypress": "^12.16.0",
"electron": "^25.2.0",
"electron-builder": "^24.4.0",
"electron-builder-notarize": "^1.5.1",
"eslint": "^8.39.0",
"eslint": "^8.43.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-vitest": "^0.2.3",
"glob": "^10.2.4",
"happy-dom": "^9.9.2",
"eslint-plugin-vitest": "^0.2.6",
"glob": "^10.3.1",
"happy-dom": "^9.20.3",
"log-symbols": "^5.1.0",
"nuxt": "^3.5.0",
"nuxt-electron": "^0.4.5",
"nuxt-typed-router": "^3.2.0",
"nuxt-vitest": "^0.7.0",
"prettier": "^2.8.7",
"prettier-plugin-tailwindcss": "^0.2.7",
"stylelint": "^15.5.0",
"stylelint-config-recommended-scss": "^10.0.0",
"nuxt": "^3.6.1",
"nuxt-electron": "^0.5.0",
"nuxt-typed-router": "^3.2.3",
"nuxt-vitest": "^0.8.6",
"prettier": "^2.8.8",
"prettier-plugin-tailwindcss": "^0.3.0",
"stylelint": "^15.9.0",
"stylelint-config-recommended-scss": "^12.0.0",
"stylelint-config-recommended-vue": "^1.4.0",
"vite-electron-plugin": "^0.8.2",
"vite-plugin-electron-renderer": "^0.14.1",
"vitest": "^0.30.1",
"vue-tsc": "^1.6.0"
"typescript": "~5.0.4",
"vite-plugin-electron": "^0.12.0",
"vite-plugin-electron-renderer": "^0.14.5",
"vitest": "^0.32.2",
"vue-tsc": "^1.8.3"
}
}