Merge pull request #1 from electron-userland/master

Merge Master

.circleci/config.yml

@@ -1,72 +1,78 @@
 version: 2
 
 jobs:
-    build:
-      docker:
-        - image: circleci/node:8.5.0
-      steps:
-        - checkout
-        - restore_cache:
-            keys:
-              - dependencies-{{ checksum "yarn.lock" }}
-        - restore_cache:
-            keys:
-              - v-1.7.8-electron
-        - run:
-            command: yarn
-        - run:
-            command: yarn pretest
-        - save_cache:
-            key: dependencies-{{ checksum "yarn.lock" }}
-            paths:
-              - node_modules
-        - run:
-            command: node ./test/out/helpers/downloadElectron.js
-        - save_cache:
-            key: v-1.7.8-electron
-            paths:
-              - ~/.cache/electron
+  build:
+    docker:
+      - image: circleci/node:12.16.3
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-sources.js" }}
+      - restore_cache:
+          keys:
+            - v-8.2.5-electron
+      - run:
+          command: YARN_CHECKSUM_BEHAVIOR=ignore node .yarn/releases/yarn-sources.js install
+      - run:
+          command: node .yarn/releases/yarn-sources.js pretest
+      - run:
+          command: cp .pnp.js .yarn/.pnp.js
+      - save_cache:
+          key: install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-sources.js" }}
+          paths:
+            - .yarn
+      - run:
+          command: node .yarn/releases/yarn-sources.js node ./test/out/helpers/downloadElectron.js
+      - save_cache:
+          key: v-8.2.5-electron
+          paths:
+            - ~/.cache/electron
 
-    test:
-      parallelism: 4
-      docker:
-        - image: electronuserland/builder:wine-mono
-          environment:
-            JEST_JUNIT_OUTPUT: ./test-reports/test.xml
-            TZ: Europe/Berlin
-      steps:
-        - checkout
-        - run:
-            name: "git-lfs"
-            command: |
-              mkdir -p /tmp/git-lfs
-              curl -L https://github.com/github/git-lfs/releases/download/v2.3.0/git-lfs-linux-amd64-2.3.0.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1
-              /tmp/git-lfs/git-lfs pull
-        - restore_cache:
-            keys:
-              - dependencies-{{ checksum "yarn.lock" }}
-        - restore_cache:
-            keys:
-              - v-1.7.8-electron
-        # because in the build job we use circleci docker image and circleci restores cache to original user home
-        - run:
-            command: |
-              mv /home/circleci/project/node_modules node_modules
-              mkdir -p ~/.cache
-              mv /home/circleci/.cache/electron ~/.cache/electron
-        - run:
-            # do not use yarn test because lint is done in the build job
-            command: |
-              yarn compile
-              node ./test/out/helpers/runTests.js
-        - store_test_results:
-            path: test-reports
+  test:
+    parallelism: 4
+    docker:
+      - image: electronuserland/builder:wine-mono
+        environment:
+          JEST_JUNIT_OUTPUT_DIR: /tmp/test-reports/test.xml
+          TZ: Europe/Berlin
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-sources.js" }}
+      - restore_cache:
+          keys:
+            - v-8.2.5-electron
+      # because in the build job we use circleci docker image and circleci restores cache to original user home
+      - run:
+          command: |
+            rm -rf .yarn
+            mv /home/circleci/project/.yarn .yarn
+            mv .yarn/.pnp.js .pnp.js
+            mkdir -p ~/.cache
+            mv /home/circleci/.cache/electron ~/.cache/electron
+      - run:
+          # do not use yarn test because lint is done in the build job
+          command: |
+            node .yarn/releases/yarn-sources.js compile
+            node .yarn/releases/yarn-sources.js node ./test/out/helpers/runTests.js
+      - store_test_results:
+          path: /tmp/test-reports
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - build
+      - build:
+          filters:
+            branches:
+              ignore:
+                - docs
       - test:
+          filters:
+            branches:
+              ignore:
+                - docs
           requires:
             - build

.editorconfig

@@ -1,11 +1,15 @@
-# .editorconfig for electron-builder
-#
-# More info inside CONTRIBUTING.md
-
-# For all files in this project:
-#  - 2-space soft tabs
-#  - Trim trailing whitespace
 [*]
 indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
+ij_javascript_use_double_quotes = true
+ij_typescript_use_double_quotes = true
+charset = utf-8
+
+ij_any_else_on_new_line = true
+ij_any_block_comment_at_first_column = false
+ij_any_line_comment_at_first_column = false
+ij_javascript_force_semicolon_style = true
+ij_javascript_use_semicolon_after_statement = false
+ij_typescript_force_semicolon_style = true
+ij_typescript_use_semicolon_after_statement = false

.eslintrc.js

@@ -0,0 +1,28 @@
+module.exports = {
+  root: true,
+  parser: "@typescript-eslint/parser",
+  plugins: [
+    "@typescript-eslint",
+  ],
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended",
+  ],
+  rules: {
+    semi: "off",
+    "@typescript-eslint/member-delimiter-style": ["error", {
+      multiline: {
+        delimiter: "none",
+      },
+    }],
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/no-use-before-define": "off",
+    "no-constant-condition": "off",
+    "@typescript-eslint/no-inferrable-types": "off",
+    "@typescript-eslint/explicit-function-return-type": ["off", {
+      // "allowExpressions": false,
+    }]
+  }
+}

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://www.electron.build/donate

.github/issue_template.md

@@ -1,11 +1,15 @@
 <!-- Which version of electron-builder are you using? -->
-<!-- Please always try to use latest version before report. -->
+<!-- Please always try to use latest version before reporting any issue. -->
 * **Version**: 
 
+<!-- Which version of electron are you using? -->
+<!-- Please verify if the error is electron related before reporting any issues. -->
+* **Electron Version**:
+* **Electron Type (current, beta, nightly)**:
 <!-- Which version of electron-updater are you using (if applicable)? -->
 
-<!-- What target are you building for? -->
+<!-- For which target are you building for? -->
 * **Target**: 
 
 <!-- Enter your issue details below this comment. -->
-<!-- If you want, you can donate to increase issue priority (https://www.electron.build/donate) -->
+<!-- If you want, you can donate to increase issue priority (https://www.electron.build/donate) -->

.github/stale.yml

@@ -0,0 +1,4 @@
+exemptLabels:
+  - bug
+  - feature
+staleLabel: backlog

.gitignore

@@ -1,38 +1,33 @@
-node_modules/
+/.vscode/
+/node_modules/
 *.log
 
-#**/out/**/*
-#!**/*js.snap
-
-dist/
-
 /.idea/compiler.xml
 /.idea/encodings.xml
 /.idea/workspace.xml
 /.idea/copyright/
 /.idea/deployment.xml
 /.idea/shelf/
 
-/docs/.idea/
-
 .DS_Store
 
-/packages/*/out/
-/out/
-# to not exclude .js.snap (jest snapshots)
-/test/out/**/*.js
-/test/out/**/*.map
+out/
 /test/test-report.xml
 
+/packages/dmg-builder/vendor/
 /packages/electron-builder/README.md
-/packages/electron-builder/scheme.json
+#/packages/app-builder-lib/scheme.json
 
 /scripts/jsdoc/out/
+/scripts/renderer/out/
 
 electron-builder-*.d.ts
 
-/_book/
-
-/scripts/renderer/out/
+/site/
+/docs/
 
-__publish.sh
+/.yarn/cache
+/.yarn/unplugged
+/.yarn/build-state.yml
+/.yarn/install-state.gz
+/.pnp.*