Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: linking CLI version output with package.json #6097

Merged
merged 14 commits into from
Jul 29, 2021
Merged

fix: linking CLI version output with package.json #6097

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1316217
fix: Importing package.json `version` directly so that the value does…
mmaietta Jul 25, 2021
3f8e5cd
docs(changeset): Synchronizing CLI and package.json versions. Updatin…
mmaietta Jul 25, 2021
0edb15e
tmp
mmaietta Jul 25, 2021
1205cc6
Using changeset publish
mmaietta Jul 26, 2021
5c7b801
adding zulip confirmation bot when publishing to npm
mmaietta Jul 26, 2021
25e6d98
reducing dependency update noise from renovatebot to check for update…
mmaietta Jul 26, 2021
c3b3b4a
moving json module resolution to base config
mmaietta Jul 28, 2021
5b3fa39
Merge commit '68df5a8b9fa5b95721359db6f1955ca137e48fe7' into fix/prop…
mmaietta Jul 28, 2021
d71dcbf
separating versions
mmaietta Jul 28, 2021
026bb49
Merge branch 'master' into fix/proper-cli-version-tag
mmaietta Jul 28, 2021
c5fc5ad
removing json module integration
mmaietta Jul 29, 2021
f288211
Writing script to automatically update the package version on generat…
mmaietta Jul 29, 2021
b45cd28
hiding email
mmaietta Jul 29, 2021
aa173f0
undoing lockfile changes
mmaietta Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
separating versions
  • Loading branch information
@mmaietta
mmaietta committed Jul 28, 2021
commit d71dcbf06bb37b27a8202a503ba063193e871bce
4 changes: 2 additions & 2 deletions packages/electron-builder/src/cli/install-app-deps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /usr/bin/env node

import { PACKAGE_VERSION } from "app-builder-lib/out/version"
import { version as VERSION } from "../../package.json"
import { log, use, getArchCliNames } from "builder-util"
import { printErrorAndExit } from "builder-util/out/promise"
import { computeDefaultAppDirectory, getConfig } from "app-builder-lib/out/util/config"
Expand Down Expand Up @@ -36,7 +36,7 @@ export function configureInstallAppDepsCommand(yargs: yargs.Argv): yargs.Argv {
/** @internal */
export async function installAppDeps(args: any) {
try {
log.info({ version: PACKAGE_VERSION }, "electron-builder")
log.info({ version: VERSION }, "electron-builder")
} catch (e) {
// error in dev mode without babel
if (!(e instanceof ReferenceError)) {
Expand Down
3 changes: 2 additions & 1 deletion packages/electron-builder/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "../tsconfig-base.json",
"compilerOptions": {
"outDir": "out",
"rootDir": "src"
"rootDir": "."
},
"references": [
{
Expand All @@ -24,6 +24,7 @@
"access": "public"
},
"include": [
"./package.json",
"src/**/*.ts",
"../../typings/*.d.ts"
],
Expand Down