Merge branch 'master' into feat/portable-app-extract-dir

# Conflicts:
#	packages/app-builder-lib/src/macPackager.ts
#	test/src/ignoreTest.ts

.changeset/purple-pans-attend.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix: App file walker including all node modules when a `node_modules/___` glob pattern is specified in `files` config (#6045)

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:14.16
+      - image: circleci/node:14.17@sha256:e1e0d976a089e059389ccc740cc51dacea9cfeea1e7d617243ba06b89ae1ead2
     steps:
       - checkout
       - restore_cache:

.github/issue-labeler.yml

@@ -8,8 +8,6 @@ bug:
   - ' bug '
 docker:
   - docker
-electron-updater:
-  - updater
 linux:
   - linux
   - ubuntu

.github/renovate.json5

@@ -0,0 +1,45 @@
+{
+  "extends": [
+    "config:base",
+    ":semanticCommitType(chore)",
+    ":label(renovate)",
+    ":prHourlyLimit2",
+    ":prConcurrentLimit10",
+    ":prNotPending",
+    "group:recommended",
+    "group:monorepos",
+    ":enableVulnerabilityAlerts"
+  ],
+  "npm": {
+    "extends": [
+      // ":automergePatch",
+      ":noUnscheduledUpdates",
+      ":maintainLockFilesWeekly",
+      "npm:unpublishSafe",
+      "helpers:disableTypesNodeMajor"
+    ],
+    "schedule": ["every weekend"],
+    "packageRules": [
+      {
+        "groupName": "ESLint and Prettier",
+        "matchPackageNames": ["eslint", "prettier"],
+        "matchPackagePatterns": ["^eslint-config-", "^eslint-plugin-"]
+      },
+    ]
+  },
+  "circleci": {
+    "enabled": true,
+    // "automerge": true,
+    // "automergeType": "branch",
+    "schedule": ["before 9am on Friday"],
+    "pinDigests": true,
+    "semanticCommitScope": "docker",
+    "semanticCommitType": "ci",
+    "packageRules": [
+      {
+        "groupName": "Node Docker digests in CircleCI",
+        "matchPackageNames": ["circleci/node", "node"]
+      }
+    ]
+  }
+}

.github/workflows/issue-labeler.yml

@@ -7,7 +7,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-    - uses: github/issue-labeler@v2.0
+    - uses: github/issue-labeler@v2.4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         configuration-path: .github/issue-labeler.yml

.github/workflows/label-manager.yml

@@ -5,7 +5,7 @@ jobs:
     name: DefaultLabelsActions
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1.0.0
+      - uses: actions/checkout@v2.3.4
       - uses: lannonbr/issue-label-manager-action@3.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr-release.yml

@@ -32,11 +32,13 @@ jobs:
       - name: install dependencies
         run: pnpm install
 
-      - name: create versions
+      - name: create versions PR & prepare publish
         uses: changesets/action@master
         with:
-          # version: pnpm ci:version
-          commit: 'chore: update versions'
-          title: 'chore: update versions'
+          version: pnpm ci:version
+          commit: 'chore(deploy): Bump versions'
+          title: 'chore(deploy): Bump versions'
+          publish: pnpm ci:publish
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/test.yaml

@@ -20,7 +20,7 @@ jobs:
         with:
           node-version: 14
       - name: Cache .pnpm-store
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -33,7 +33,7 @@ jobs:
       - run: pnpm lint
       - run: pnpm lint-deps
       - name: Cache ~/.cache/electron
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.cache/electron
           key: v-11.0.0-electron
@@ -52,7 +52,7 @@ jobs:
         with:
           node-version: 14
       - name: Cache .pnpm-store
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: $HOMEPATH/.pnpm-store
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -63,7 +63,7 @@ jobs:
       - run: pnpm install --frozen-lockfile
       - run: pnpm compile
       - name: Cache ~/.cache/electron
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: $HOMEPATH/.cache/electron
           key: v-11.0.0-windows-electron

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [](https://github.com/electron-userland/electron-builder/compare/v22.11.8...v) (2021-07-14)
+
+
+### Bug Fixes
+
+* **deploy:** consolidating versioning commands into package.json ([6066681](https://github.com/electron-userland/electron-builder/commit/6066681077c8ba730155751b83b4550add9b0dcf))
+* **deploy:** deactivate husky hooks for automatic versioning PR ([#6041](https://github.com/electron-userland/electron-builder/issues/6041)) ([0d4d305](https://github.com/electron-userland/electron-builder/commit/0d4d3056b440cc45a1f1a15ea4a27c688cb0e96e))
+* do not show MessageBox when app was killed (on not running) ([#6043](https://github.com/electron-userland/electron-builder/issues/6043)) ([0561674](https://github.com/electron-userland/electron-builder/commit/0561674b6c491ee1cfa0ba838f5c5d59ce205124))
+* **nsis:** generate uninstaller without elevating ([#5575](https://github.com/electron-userland/electron-builder/issues/5575)) ([#6013](https://github.com/electron-userland/electron-builder/issues/6013)) ([b00aea3](https://github.com/electron-userland/electron-builder/commit/b00aea32107cd379b8489f7abea493d16fe38197))
+* updating electron-osx-sign ([#6021](https://github.com/electron-userland/electron-builder/issues/6021)) ([6f63092](https://github.com/electron-userland/electron-builder/commit/6f630927ca949d8bdcde06e4eafaa63ce3636d5a)), closes [#6010](https://github.com/electron-userland/electron-builder/issues/6010) [#5190](https://github.com/electron-userland/electron-builder/issues/5190)
+* write blockmap file for mac zip archives ([#6023](https://github.com/electron-userland/electron-builder/issues/6023)) ([0447b24](https://github.com/electron-userland/electron-builder/commit/0447b2457beb03648f1e7e841cd0a8d12d7e4aea)), closes [#4299](https://github.com/electron-userland/electron-builder/issues/4299)
+
+
+
 **Here changelog only for previous major releases and without detailed explanations.**
 To see changes for current major release, please use [GiHub releases](https://github.com/electron-userland/electron-builder/releases).
 

README.md

@@ -62,7 +62,7 @@ See documentation on [electron.build](https://www.electron.build).
       "dist": "electron-builder"
     }
     ```
-    Then you can run `yarn dist` (to package in a distributable format (e.g. dmg, windows installer, deb package)) or `yarn pack` (only generates the package directory without really packaging it. This is useful for testing purposes).
+    Then you can run `yarn dist` (to package in a distributable format (e.g. dmg, windows installer, deb package)) or `yarn run pack` (only generates the package directory without really packaging it. This is useful for testing purposes).
 
     To ensure your native dependencies are always matched electron version, simply add script `"postinstall": "electron-builder install-app-deps"` to your `package.json`.
 

package.json

@@ -21,7 +21,9 @@
     "test-linux": "docker run --rm -ti -e UPDATE_SNAPSHOT=${UPDATE_SNAPSHOT:-false} -e TEST_FILES=\"${TEST_FILES:-HoistedNodeModuleTest}\" -v $(pwd):/project -v $(pwd)-node-modules:/project/node_modules -v $HOME/Library/Caches/electron:/root/.cache/electron -v $HOME/Library/Caches/electron-builder:/root/.cache/electron-builder electronuserland/builder:wine /bin/bash -c \"pnpm install && pnpm node ./test/out/helpers/runTests.js\"",
     "test-update": "UPDATE_SNAPSHOT=true pnpm test-all",
     "docker-images": "docker/build.sh",
-    "release": "pnpm compile && ./scripts/publish-packages.sh && pnpx --package conventional-changelog-cli conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s && git add CHANGELOG.md",
+    "ci:version": "pnpm changelog && changeset version",
+    "ci:publish": "pnpm compile && pnpm publish -r --filter ./packages --tag next --dry-run",
     "schema": "typescript-json-schema packages/app-builder-lib/tsconfig.json Configuration --out packages/app-builder-lib/scheme.json --noExtraProps --useTypeOfKeyword --strictNullChecks --required && node ./scripts/fix-schema.js",
     "jsdoc": "ts2jsdoc packages/builder-util-runtime packages/builder-util packages/app-builder-lib packages/electron-builder packages/electron-publish",
     "jsdoc2md": "node scripts/jsdoc2md.js",
@@ -37,30 +39,30 @@
   "///": "All dependencies for all packages (hoisted)",
   "////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
   "dependencies": {
-    "dmg-license": "~1.0.9"
+    "dmg-license": "1.0.9"
   },
   "devDependencies": {
-    "@babel/plugin-transform-modules-commonjs": "^7.14.5",
-    "@changesets/changelog-git": "^0.1.7",
-    "@changesets/cli": "^2.16.0",
-    "@typescript-eslint/eslint-plugin": "^4.28.1",
-    "@typescript-eslint/parser": "^4.28.1",
-    "conventional-changelog-cli": "^2.1.1",
-    "eslint": "^7.30.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "fs-extra": "^10.0.0",
-    "globby": "^11.0.4",
-    "husky": "~6.0.0",
-    "jest-cli": "^27.0.6",
-    "jsdoc-to-markdown": "^7.0.1",
-    "lint-staged": "^11.0.0",
-    "path-sort": "^0.1.0",
-    "prettier": "^2.3.2",
-    "source-map-support": "^0.5.19",
-    "ts-jsdoc": "^3.2.2",
-    "typescript": "~4.3.5",
-    "typescript-json-schema": "^0.50.1",
-    "v8-compile-cache": "^2.3.0"
+    "@babel/plugin-transform-modules-commonjs": "7.14.5",
+    "@changesets/changelog-git": "0.1.7",
+    "@changesets/cli": "2.16.0",
+    "@typescript-eslint/eslint-plugin": "4.28.4",
+    "@typescript-eslint/parser": "4.28.4",
+    "conventional-changelog-cli": "2.1.1",
+    "eslint": "7.30.0",
+    "eslint-config-prettier": "8.3.0",
+    "eslint-plugin-prettier": "3.4.0",
+    "fs-extra": "10.0.0",
+    "globby": "11.0.4",
+    "husky": "7.0.1",
+    "jest-cli": "27.0.6",
+    "jsdoc-to-markdown": "7.0.1",
+    "lint-staged": "11.0.1",
+    "path-sort": "0.1.0",
+    "prettier": "2.3.2",
+    "source-map-support": "0.5.19",
+    "ts-jsdoc": "3.2.2",
+    "typescript": "4.3.5",
+    "typescript-json-schema": "0.50.1",
+    "v8-compile-cache": "2.3.0"
   }
 }

packages/app-builder-lib/CHANGELOG.md

@@ -0,0 +1,10 @@
+# app-builder-lib
+
+## 22.11.9
+### Patch Changes
+
+- 1272afc5: Initial introduction of changset config
+- Updated dependencies [1272afc5]
+  - builder-util@22.11.9
+  - builder-util-runtime@8.7.8
+  - electron-publish@22.11.9

packages/app-builder-lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "app-builder-lib",
   "description": "electron-builder lib",
-  "version": "22.11.8",
+  "version": "22.11.9",
   "main": "out/index.js",
   "files": [
     "out",
@@ -74,32 +74,32 @@
   },
   "///": "babel in devDependencies for proton tests",
   "devDependencies": {
-    "@babel/core": "^7.14.6",
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
-    "@babel/plugin-proposal-decorators": "^7.14.2",
-    "@babel/plugin-proposal-do-expressions": "^7.14.0",
-    "@babel/plugin-proposal-export-default-from": "^7.12.13",
-    "@babel/plugin-proposal-export-namespace-from": "^7.14.2",
-    "@babel/plugin-proposal-function-bind": "^7.12.13",
-    "@babel/plugin-proposal-function-sent": "^7.12.13",
-    "@babel/plugin-proposal-json-strings": "^7.14.2",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2",
-    "@babel/plugin-proposal-numeric-separator": "^7.14.2",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.2",
-    "@babel/plugin-proposal-pipeline-operator": "^7.12.13",
-    "@babel/plugin-proposal-throw-expressions": "^7.12.13",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-syntax-import-meta": "^7.10.4",
-    "@babel/preset-env": "^7.14.7",
-    "@babel/preset-react": "^7.13.13",
-    "@types/debug": "^4.1.6",
-    "@types/ejs": "^3.0.6",
-    "@types/fs-extra": "^9.0.11",
-    "@types/hosted-git-info": "^3.0.1",
-    "@types/is-ci": "^3.0.0",
-    "@types/js-yaml": "^4.0.1",
-    "@types/semver": "^7.3.6",
+    "@babel/core": "7.14.6",
+    "@babel/plugin-proposal-class-properties": "7.14.5",
+    "@babel/plugin-proposal-decorators": "7.14.5",
+    "@babel/plugin-proposal-do-expressions": "7.14.5",
+    "@babel/plugin-proposal-export-default-from": "7.14.5",
+    "@babel/plugin-proposal-export-namespace-from": "7.14.5",
+    "@babel/plugin-proposal-function-bind": "7.14.5",
+    "@babel/plugin-proposal-function-sent": "7.14.5",
+    "@babel/plugin-proposal-json-strings": "7.14.5",
+    "@babel/plugin-proposal-logical-assignment-operators": "7.14.5",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.14.5",
+    "@babel/plugin-proposal-numeric-separator": "7.14.5",
+    "@babel/plugin-proposal-optional-chaining": "7.14.5",
+    "@babel/plugin-proposal-pipeline-operator": "7.14.5",
+    "@babel/plugin-proposal-throw-expressions": "7.14.5",
+    "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/plugin-syntax-import-meta": "7.10.4",
+    "@babel/preset-env": "7.14.7",
+    "@babel/preset-react": "7.14.5",
+    "@types/debug": "4.1.6",
+    "@types/ejs": "3.0.7",
+    "@types/fs-extra": "9.0.12",
+    "@types/hosted-git-info": "3.0.2",
+    "@types/is-ci": "3.0.0",
+    "@types/js-yaml": "4.0.2",
+    "@types/semver": "7.3.7",
     "dmg-builder": "workspace:*",
     "electron-builder-squirrel-windows": "workspace:*"
   },