diff --git a/.idea/dictionaries/develar.xml b/.idea/dictionaries/develar.xml index e534df15401..5bfc91828c7 100644 --- a/.idea/dictionaries/develar.xml +++ b/.idea/dictionaries/develar.xml @@ -230,6 +230,7 @@ nomacver noninteractive noupdate + npmignore npmrc nsis nsisdir diff --git a/packages/electron-builder/src/fileMatcher.ts b/packages/electron-builder/src/fileMatcher.ts index a4ed7c92e3a..2dc1ff48dad 100644 --- a/packages/electron-builder/src/fileMatcher.ts +++ b/packages/electron-builder/src/fileMatcher.ts @@ -4,8 +4,8 @@ import { copyDir, copyOrLinkFile, Filter, statOrNull } from "builder-util/out/fs import { mkdirs } from "fs-extra-p" import { Minimatch } from "minimatch" import * as path from "path" -import { Configuration, FileSet, PlatformSpecificBuildOptions } from "./index" import { Platform } from "./core" +import { Configuration, FileSet, PlatformSpecificBuildOptions } from "./index" import { PlatformPackager } from "./platformPackager" import { createFilter, hasMagic } from "./util/filter" @@ -150,7 +150,7 @@ export function getMainFileMatchers(appDir: string, destination: string, macroEx } patterns.push("!**/node_modules/*/{README.md,karma.conf.js,.coveralls.yml,readme.markdown,README,readme.md,readme,test,__tests__,tests,powered-test,example,examples}") - patterns.push(`!**/*.{iml,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj,cc,pdb}`) + patterns.push(`!**/*.{iml,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,suo,xproj,cc,pdb}`) patterns.push("!**/._*") patterns.push("!**/electron-builder.{yaml,yml,json,json5,toml}") //noinspection SpellCheckingInspection diff --git a/packages/electron-builder/src/util/AppFileWalker.ts b/packages/electron-builder/src/util/AppFileWalker.ts index 9cd6a2c23ae..32c978b5590 100644 --- a/packages/electron-builder/src/util/AppFileWalker.ts +++ b/packages/electron-builder/src/util/AppFileWalker.ts @@ -105,7 +105,7 @@ export class AppFileWalker implements FileConsumer { const dirs: Array = [] // our handler is async, but we should add sorted files, so, we add file to result not in the mapper, but after map const sortedFilePaths = await BluebirdPromise.map(childNames, name => { - if (excludedFiles.has(name) || name.endsWith(".h") || name.endsWith(".o") || name.endsWith(".obj") || name.endsWith(".cc") || name.endsWith(".pdb") || name.endsWith(".d.ts")) { + if (excludedFiles.has(name) || name.endsWith(".h") || name.endsWith(".o") || name.endsWith(".obj") || name.endsWith(".cc") || name.endsWith(".pdb") || name.endsWith(".d.ts") || name.endsWith(".suo") || name.endsWith(".npmignore") || name.endsWith(".sln")) { return null }