fix: detect electron-compile in the dev deps

develar · develar · commit 0b8bff419750 · 2017-03-21T18:54:33.000+01:00
diff --git a/packages/electron-builder-util/src/util.ts b/packages/electron-builder-util/src/util.ts
@@ -212,7 +212,7 @@ export function getCacheDirectory(): string {
   const localappdata = process.env.LOCALAPPDATA
   if (process.platform === "win32" && localappdata != null) {
     // https://github.com/electron-userland/electron-builder/issues/1164
-    if (localappdata.includes("\\Windows\\System32\\") || process.env.USERNAME === "SYSTEM") {
+    if (localappdata.toLowerCase().includes("\\windows\\system32\\") || (process.env.USERNAME || "").toLowerCase() === "system") {
       return path.join(tmpdir(), "electron-builder-cache")
     }
     return path.join(localappdata, "electron-builder", "cache")
diff --git a/packages/electron-builder/src/appInfo.ts b/packages/electron-builder/src/appInfo.ts
@@ -48,11 +48,7 @@ export class AppInfo {
   }
 
   get id(): string {
-    let appId = (<any>this.config)["app-bundle-id"]
-    if (appId != null) {
-      warn("app-bundle-id is deprecated, please use appId")
-    }
-
+    let appId
     if (this.config.appId != null) {
       appId = this.config.appId
     }
@@ -61,7 +57,7 @@ export class AppInfo {
       return `com.electron.${this.metadata.name!.toLowerCase()}`
     }
 
-    if (appId === "your.id" || isEmptyOrSpaces(appId)) {
+    if (appId != null && (appId === "your.id" || isEmptyOrSpaces(appId))) {
       const incorrectAppId = appId
       appId = generateDefaultAppId()
       warn(`Do not use "${incorrectAppId}" as appId, "${appId}" will be used instead`)
diff --git a/packages/electron-builder/src/fileTransformer.ts b/packages/electron-builder/src/fileTransformer.ts
@@ -1,18 +1,32 @@
 import { debug } from "electron-builder-util"
 import { deepAssign } from "electron-builder-util/out/deepAssign"
-import { warn } from "electron-builder-util/out/log"
+import { log, warn } from "electron-builder-util/out/log"
 import { readJson } from "fs-extra-p"
 import mime from "mime"
 import * as path from "path"
+import { BuildInfo } from "./packagerApi"
 import { PlatformPackager } from "./platformPackager"
 
 export type FileTransformer = (path: string) => Promise<null | string | Buffer> | null | string | Buffer
 
-export async function createTransformer(projectDir: string, srcDir: string, packager: PlatformPackager<any>): Promise<FileTransformer> {
-  const devDeps = packager.info.devMetadata.dependencies
-  const deps = packager.info.metadata.dependencies
-  const useElectronCompile = (devDeps != null && ("electron-compile" in devDeps)) || (deps != null && ("electron-compile" in deps))
+function isElectronCompileUsed(info: BuildInfo): boolean {
+  const depList = [(<any>info.metadata).devDependencies, info.metadata.dependencies]
+  if (info.isTwoPackageJsonProjectLayoutUsed) {
+    depList.push((<any>info.devMetadata).devDependencies)
+    depList.push(info.devMetadata.dependencies)
+  }
+  
+  for (const deps of depList) {
+    if (deps != null && "electron-compile" in deps) {
+      log("electron-compile detected — files will be compiled")
+      return true
+    }
+  }
   
+  return false
+}
+
+export async function createTransformer(projectDir: string, srcDir: string, packager: PlatformPackager<any>): Promise<FileTransformer> {
   const extraMetadata = packager.packagerOptions.extraMetadata
   const mainPackageJson = path.join(srcDir, "package.json")
   
@@ -30,7 +44,7 @@ export async function createTransformer(projectDir: string, srcDir: string, pack
     }
   }
   
-  return useElectronCompile ? await createElectronCompileTransformer(projectDir, defaultTransformer) : defaultTransformer
+  return isElectronCompileUsed(packager.info) ? await createElectronCompileTransformer(projectDir, defaultTransformer) : defaultTransformer
 }
 
 async function createElectronCompileTransformer(projectDir: string, defaultTransformer: FileTransformer) {
@@ -60,7 +74,11 @@ async function createElectronCompileTransformer(projectDir: string, defaultTrans
 
     const cache = compilerHost.cachesForCompilers.get(compiler)
     const result = await cache.getOrFetch(file, (file: string, hashInfo: any) => compilerHost.compileUncached(file, hashInfo, compiler))
-    return result.code || result.binaryData
+    const code = result.code
+    if (type === "application/javascript" && code != null && (code.includes("require('electron-compile')") || code.includes('require("electron-compile")'))) {
+      warn("electron-compile should be not used in the production code")
+    }
+    return code || result.binaryData
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ export function getCacheDirectory(): string {`
`212`	`212`	`const localappdata = process.env.LOCALAPPDATA`
`213`	`213`	`if (process.platform === "win32" && localappdata != null) {`
`214`	`214`	`// https://github.com/electron-userland/electron-builder/issues/1164`
`215`		`- if (localappdata.includes("\\Windows\\System32\\") \|\| process.env.USERNAME === "SYSTEM") {`
	`215`	`+ if (localappdata.toLowerCase().includes("\\windows\\system32\\") \|\| (process.env.USERNAME \|\| "").toLowerCase() === "system") {`
`216`	`216`	`return path.join(tmpdir(), "electron-builder-cache")`
`217`	`217`	`}`
`218`	`218`	`return path.join(localappdata, "electron-builder", "cache")`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,7 @@ export class AppInfo {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`get id(): string {`
`51`		`- let appId = (<any>this.config)["app-bundle-id"]`
`52`		`- if (appId != null) {`
`53`		`- warn("app-bundle-id is deprecated, please use appId")`
`54`		`- }`
`55`		`-`
	`51`	`+ let appId`
`56`	`52`	`if (this.config.appId != null) {`
`57`	`53`	`appId = this.config.appId`
`58`	`54`	`}`
`@@ -61,7 +57,7 @@ export class AppInfo {`
`61`	`57`	return `com.electron.${this.metadata.name!.toLowerCase()}`
`62`	`58`	`}`
`63`	`59`
`64`		`- if (appId === "your.id" \|\| isEmptyOrSpaces(appId)) {`
	`60`	`+ if (appId != null && (appId === "your.id" \|\| isEmptyOrSpaces(appId))) {`
`65`	`61`	`const incorrectAppId = appId`
`66`	`62`	`appId = generateDefaultAppId()`
`67`	`63`	warn(`Do not use "${incorrectAppId}" as appId, "${appId}" will be used instead`)