Merge branch 'master' into v2

nklayman · nklayman · commit f6977c37d2b4 · 2020-05-30T20:25:37.000-07:00
diff --git a/.github/workflows/label-sponsors.yml b/.github/workflows/label-sponsors.yml
@@ -0,0 +1,14 @@
+name: Label sponsors
+on:
+  pull_request:
+    types: [opened]
+  issues:
+    types: [opened]
+jobs:
+  build:
+    name: is-sponsor-label
+    runs-on: ubuntu-latest
+    steps:
+      - uses: JasonEtco/is-sponsor-label-action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/nodeCI.yml b/.github/workflows/nodeCI.yml
@@ -28,7 +28,6 @@ jobs:
       id: yarn-cache
       run: echo "::set-output name=dir::$(yarn cache dir)"
     - name: Yarn cache
-      if: runner.os != 'Windows'
       uses: actions/cache@v1
       with:
         path: ${{ steps.yarn-cache.outputs.dir }}
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Vue CLI Plugin Electron Builder
 
-Instantly add Electron to your Vue.js app, with the help of [Electron Builder](https://www.electron.build/).
+A Vue Cli 3/4 plugin for Electron with no required configuration that uses [Electron Builder](https://www.electron.build/).
 
 Build status: [![Build status](https://github.com/nklayman/vue-cli-plugin-electron-builder/workflows/Node%20CI/badge.svg)](https://github.com/nklayman/vue-cli-plugin-electron-builder/actions)
 
@@ -42,6 +42,12 @@ To see more documentation, [visit our website](https://nklayman.github.io/vue-cl
 
 ## Supporters
 
-| [![Andrew LeTourneau](https://avatars2.githubusercontent.com/u/2807807?s=64&v=4)](https://github.com/centerorbit) |
-| ----------------------------------------------------------------------------------------------------------------- |
-| [Andrew LeTourneau](https://github.com/centerorbit)                                                               |
+| [![Yves Hoppe](https://avatars1.githubusercontent.com/u/897638?s=64&v=4)](https://github.com/yvesh) | [![Andrew LeTourneau](https://avatars2.githubusercontent.com/u/2807807?s=64&v=4)](https://github.com/centerorbit) | [![Mitch Dennet](https://avatars2.githubusercontent.com/u/16268619?s=64&v=4)](https://github.com/mitchdennett) | [![Kasen IO](https://avatars0.githubusercontent.com/u/52365539?s=64)](https://kasen.io) | [![Ivorzk](https://avatars2.githubusercontent.com/u/7390138?s=64)](https://github.com/Ivorzk) | [![Eric Schirtzinger](https://avatars2.githubusercontent.com/u/24927782?s=64)](https://github.com/eschirtz) | [![Alec Armbruster](https://avatars2.githubusercontent.com/u/35377827?s=64)](https://github.com/alectrocute) |
+| --------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
+| [Yves Hoppe](https://github.com/yvesh)                                                              | [Andrew LeTourneau](https://github.com/centerorbit)                                                               | [Mitch Dennet](https://github.com/mitchdennett)                                                                | [Kasen IO](https://kasen.io)                                                            | [Ivorzk](https://github.com/Ivorzk)                                                           | [Eric Schirtzinger](https://github.com/eschirtz)                                                            | [Alec Armbruster](https://github.com/alectrocute)                                                            |
+
+## Past Supporters
+
+| [<img src="https://avatars2.githubusercontent.com/u/46167401?s=64&v=4" width="64">](https://github.com/Mary-Tyler-Moore) |
+| ------------------------------------------------------------------------------------------------------------------------ |
+| [Mary-Tyler-Moore](https://github.com/Mary-Tyler-Moore)                                                                  |
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -1,6 +1,7 @@
 module.exports = {
   title: 'Vue CLI Plugin Electron Builder',
-  description: 'Instantly Add Electron to Your Vue.js App',
+  description:
+    'A Vue CLI 3/4 plugin for Electron with no required configuration.',
   base: '/vue-cli-plugin-electron-builder/',
   ga: 'UA-134189455-2',
   head: [
diff --git a/docs/guide/recipes.md b/docs/guide/recipes.md
@@ -264,7 +264,7 @@ app.on('activate', () => {
 
 // Replace
 if (win === null) {
-  createWindw()
+  createWindow()
 }
 // With
 if (win === null) {
diff --git a/index.js b/index.js
@@ -268,12 +268,14 @@ module.exports = (api, options) => {
       removeArg('--dashboard', 1, rawArgs)
       removeArg('--debug', 1, rawArgs)
       removeArg('--headless', 1, rawArgs)
+      removeArg('--https', 1, rawArgs)
 
       // Run the serve command
       const server = await api.service.run('serve', {
         _: [],
         // Use dashboard if called from ui
-        dashboard: args.dashboard
+        dashboard: args.dashboard,
+        https: args.https
       })
       const outputDir = pluginOptions.outputDir || 'dist_electron'
 
diff --git a/lib/createProtocol.js b/lib/createProtocol.js
@@ -12,7 +12,7 @@ export default scheme => {
 
       readFile(path.join(__dirname, pathName), (error, data) => {
         if (error) {
-          console.error(`Failed to register ${scheme} protocol`, error)
+          console.error(`Failed to read ${pathName} on ${scheme} protocol`, error)
         }
         const extension = path.extname(pathName).toLowerCase()
         let mimeType = ''
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue-cli-plugin-electron-builder",
-  "version": "2.0.0-beta.6",
-  "description": "Instantly Add Electron to Your Vue.js App",
+  "version": "1.4.6",
+  "description": "A Vue Cli 3 plugin for Electron with no required configuration",
   "main": "index.js",
   "homepage": "https://nklayman.github.io/vue-cli-plugin-electron-builder/",
   "funding": "https://github.com/sponsors/nklayman",
diff --git a/ui.js b/ui.js
@@ -39,6 +39,20 @@ module.exports = api => {
   api.describeTask({
     match: /vue-cli-service electron:serve/,
     description: 'Serve your app, launch electron',
-    link: 'https://nklayman.github.io/vue-cli-plugin-electron-builder/'
+    link: 'https://nklayman.github.io/vue-cli-plugin-electron-builder/',
+    prompts: [
+      {
+        name: 'noSandbox',
+        type: 'confirm',
+        default: false,
+        description: 'Disable sandbox (--no-sandbox)',
+        link: 'https://github.com/electron/electron/issues/18265'
+      }
+    ],
+    onBeforeRun: ({ answers, args }) => {
+      // Args
+      if (answers.noSandbox) args.push('--no-sandbox')
+    }
+
   })
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ app.on('activate', () => {`
`264`	`264`
`265`	`265`	`// Replace`
`266`	`266`	`if (win === null) {`
`267`		`- createWindw()`
	`267`	`+ createWindow()`
`268`	`268`	`}`
`269`	`269`	`// With`
`270`	`270`	`if (win === null) {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export default scheme => {`
`12`	`12`
`13`	`13`	`readFile(path.join(__dirname, pathName), (error, data) => {`
`14`	`14`	`if (error) {`
`15`		- console.error(`Failed to register ${scheme} protocol`, error)
	`15`	+ console.error(`Failed to read ${pathName} on ${scheme} protocol`, error)
`16`	`16`	`}`
`17`	`17`	`const extension = path.extname(pathName).toLowerCase()`
`18`	`18`	`let mimeType = ''`