mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2025-12-24 20:26:24 +00:00
Qualify CJS-only module imports
This commit is contained in:
@@ -7,15 +7,14 @@ const { join } = require('node:path');
|
||||
const pMap = require('p-map');
|
||||
const prettier = require('prettier');
|
||||
|
||||
const { default: packageJson } = require('./packageJson.js');
|
||||
|
||||
// During development, you might use local versions of dependencies which are missing
|
||||
// acknowledgment files. In this case we'll skip rebuilding the acknowledgment files.
|
||||
// Enable this flag to throw an error.
|
||||
const REQUIRE_SIGNAL_LIB_FILES = Boolean(process.env.REQUIRE_SIGNAL_LIB_FILES);
|
||||
|
||||
const {
|
||||
dependencies = {},
|
||||
optionalDependencies = {},
|
||||
} = require('../package.json');
|
||||
const { dependencies = {}, optionalDependencies = {} } = packageJson;
|
||||
|
||||
const SIGNAL_LIBS = ['@signalapp/libsignal-client', '@signalapp/ringrtc'];
|
||||
|
||||
|
||||
15
scripts/packageJson.js
Normal file
15
scripts/packageJson.js
Normal file
@@ -0,0 +1,15 @@
|
||||
// Copyright 2025 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
const { readFileSync } = require('node:fs');
|
||||
const { join } = require('node:path');
|
||||
|
||||
const PACKAGE_JSON_PATH = join(__dirname, '..', 'package.json');
|
||||
|
||||
const json = JSON.parse(readFileSync(PACKAGE_JSON_PATH, 'utf8'));
|
||||
|
||||
exports.default = json;
|
||||
exports.name = json.name;
|
||||
exports.version = json.version;
|
||||
exports.productName = json.productName;
|
||||
exports.build = json.build;
|
||||
@@ -4,11 +4,8 @@
|
||||
const fs = require('node:fs');
|
||||
const _ = require('lodash');
|
||||
const { execSync } = require('node:child_process');
|
||||
|
||||
const packageJson = require('../package.json');
|
||||
const { isAdhoc } = require('../ts/util/version.js');
|
||||
|
||||
const { version } = packageJson;
|
||||
const { default: packageJson, version } = require('./packageJson.js');
|
||||
|
||||
// You might be wondering why this file is necessary. It comes down to our desire to allow
|
||||
// side-by-side installation of production and adhoc builds. Electron-Builder uses
|
||||
|
||||
@@ -4,10 +4,8 @@
|
||||
const fs = require('node:fs');
|
||||
const _ = require('lodash');
|
||||
|
||||
const packageJson = require('../package.json');
|
||||
const { isAlpha } = require('../ts/util/version.js');
|
||||
|
||||
const { version } = packageJson;
|
||||
const { default: packageJson, version } = require('./packageJson.js');
|
||||
|
||||
// You might be wondering why this file is necessary. It comes down to our desire to allow
|
||||
// side-by-side installation of production and alpha builds. Electron-Builder uses
|
||||
|
||||
@@ -4,10 +4,8 @@
|
||||
const fs = require('node:fs');
|
||||
const _ = require('lodash');
|
||||
|
||||
const packageJson = require('../package.json');
|
||||
const { isAxolotl } = require('../ts/util/version.js');
|
||||
|
||||
const { version } = packageJson;
|
||||
const { default: packageJson, version } = require('./packageJson.js');
|
||||
|
||||
// You might be wondering why this file is necessary. It comes down to our desire to allow
|
||||
// side-by-side installation of production and alpha builds. Electron-Builder uses
|
||||
|
||||
@@ -4,10 +4,8 @@
|
||||
const fs = require('node:fs');
|
||||
const _ = require('lodash');
|
||||
|
||||
const packageJson = require('../package.json');
|
||||
const { isBeta } = require('../ts/util/version.js');
|
||||
|
||||
const { version } = packageJson;
|
||||
const { default: packageJson, version } = require('./packageJson.js');
|
||||
|
||||
// You might be wondering why this file is necessary. It comes down to our desire to allow
|
||||
// side-by-side installation of production and beta builds. Electron-Builder uses
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
// Copyright 2022 Signal Messenger, LLC
|
||||
// Copyright 2021 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
const fs = require('node:fs');
|
||||
const _ = require('lodash');
|
||||
|
||||
const packageJson = require('../package.json');
|
||||
const { isAlpha } = require('../ts/util/version.js');
|
||||
|
||||
const { version } = packageJson;
|
||||
const { default: packageJson, version } = require('./packageJson.js');
|
||||
|
||||
// You might be wondering why this file is necessary. It comes down to our desire to allow
|
||||
// side-by-side installation of production and staging builds. Electron-Builder uses
|
||||
|
||||
@@ -5,6 +5,10 @@ const fs = require('node:fs');
|
||||
const { execSync } = require('node:child_process');
|
||||
|
||||
const _ = require('lodash');
|
||||
const {
|
||||
default: packageJson,
|
||||
version: currentVersion,
|
||||
} = require('./packageJson.js');
|
||||
|
||||
const release = process.argv[2];
|
||||
if (release !== 'alpha' && release !== 'axolotl' && release !== 'adhoc') {
|
||||
@@ -14,10 +18,6 @@ if (release !== 'alpha' && release !== 'axolotl' && release !== 'adhoc') {
|
||||
|
||||
const { generateTaggedVersion } = require('../ts/util/version.js');
|
||||
|
||||
const packageJson = require('../package.json');
|
||||
|
||||
const { version: currentVersion } = packageJson;
|
||||
|
||||
const shortSha = execSync('git rev-parse --short HEAD')
|
||||
.toString('utf8')
|
||||
.replace(/[\n\r]/g, '');
|
||||
|
||||
Reference in New Issue
Block a user