Skip to content
This repository has been archived by the owner on Nov 13, 2021. It is now read-only.

Commit

Permalink
chore(deploy): enabling auto publish and running prettier (electron-u…
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaietta authored Jul 24, 2021
1 parent 45fc0a0 commit 878671d
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 26 deletions.
17 changes: 17 additions & 0 deletions .changeset/ten-queens-sip.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
"app-builder-lib": patch
"builder-util-runtime": patch
"@electron-builder/test": patch
"builder-util": patch
"dmg-builder": patch
"electron-builder": patch
"electron-builder-squirrel-windows": patch
"electron-forge-maker-appimage": patch
"electron-forge-maker-nsis": patch
"electron-forge-maker-nsis-web": patch
"electron-forge-maker-snap": patch
"electron-publish": patch
"electron-updater": patch
---

Updating patch number as many deps were updated as parted of RenovateBot integration
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"docker-images": "docker/build.sh",
"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",
"ci:publish": "pnpm compile && pnpm publish -r --filter ./packages --tag next",
"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",
Expand Down
10 changes: 5 additions & 5 deletions packages/app-builder-lib/scheme.json
Original file line number Diff line number Diff line change
Expand Up @@ -6496,11 +6496,11 @@
"description": "Whether to remove `scripts` field from `package.json` files.",
"type": "boolean"
},
"removePackageKeywords": {
"default": true,
"description": "Whether to remove `keywords` field from `package.json` files.",
"type": "boolean"
},
"removePackageKeywords": {
"default": true,
"description": "Whether to remove `keywords` field from `package.json` files.",
"type": "boolean"
},
"rpm": {
"anyOf": [
{
Expand Down
16 changes: 9 additions & 7 deletions packages/app-builder-lib/src/macPackager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,17 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
let binaries = options.binaries || undefined
if (binaries) {
// Accept absolute paths for external binaries, else resolve relative paths from the artifact's app Contents path.
const userDefinedBinaries = await Promise.all(binaries.map(async (destination) => {
if (await statOrNull(destination)) {
return destination
}
return path.resolve(appPath, destination)
}))
const userDefinedBinaries = await Promise.all(
binaries.map(async destination => {
if (await statOrNull(destination)) {
return destination
}
return path.resolve(appPath, destination)
})
)
// Insert at front to prioritize signing. We still sort by depth next
binaries = userDefinedBinaries.concat(binaries)
log.info('Signing addtional user-defined binaries: ' + JSON.stringify(userDefinedBinaries, null, 1))
log.info("Signing addtional user-defined binaries: " + JSON.stringify(userDefinedBinaries, null, 1))
}

const signOptions: any = {
Expand Down
10 changes: 5 additions & 5 deletions packages/app-builder-lib/src/util/yarn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ export function getGypEnv(frameworkInfo: DesktopFrameworkInfo, platform: NodeJS.
}
}

function checkYarnBerry () {
const npmUserAgent = process.env["npm_config_user_agent"] || ''
const regex = /yarn\/(\d+)\./gm;
function checkYarnBerry() {
const npmUserAgent = process.env["npm_config_user_agent"] || ""
const regex = /yarn\/(\d+)\./gm

const yarnVersionMatch = regex.exec(npmUserAgent);
const yarnVersionMatch = regex.exec(npmUserAgent)
const yarnMajorVersion = Number(yarnVersionMatch?.[1] ?? 0)
return yarnMajorVersion >= 2;
return yarnMajorVersion >= 2
}

function installDependencies(appDir: string, options: RebuildOptions): Promise<any> {
Expand Down
6 changes: 3 additions & 3 deletions packages/electron-updater/src/BaseUpdater.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import fs from 'fs';
import path from 'path';
import fs from "fs"
import path from "path"
import { AllPublishOptions } from "builder-util-runtime"
import { AppAdapter } from "./AppAdapter"
import { AppUpdater, DownloadExecutorTask } from "./AppUpdater"
Expand Down Expand Up @@ -63,7 +63,7 @@ export abstract class BaseUpdater extends AppUpdater {
const accessTestPath = path.join(path.dirname(process.execPath), `access-${Math.floor(Math.random() * 100)}.tmp`)
fs.writeFileSync(accessTestPath, " ")
fs.rmSync(accessTestPath)
} catch(err) {
} catch (err) {
// Require admin rights if needed
installPathRequiresElevation = true
}
Expand Down
7 changes: 2 additions & 5 deletions test/src/BuildTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -367,11 +367,8 @@ test.ifDevOrLinuxCi(
files: [
// test ignore pattern for node_modules defined as file set filter
{
filter: [
"!node_modules/napi-build-utils/napi-build-utils-1.0.0.tgz",
"!node_modules/node-abi/*"
]
}
filter: ["!node_modules/napi-build-utils/napi-build-utils-1.0.0.tgz", "!node_modules/node-abi/*"],
},
],
},
},
Expand Down

0 comments on commit 878671d

Please sign in to comment.