Skip to content

Commit d932c21

Browse files
committed
Inline more constants
1 parent 6780a97 commit d932c21

File tree

4 files changed

+40
-10
lines changed

4 files changed

+40
-10
lines changed

.config/rollup.base.config.mjs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,15 @@ const require = createRequire(import.meta.url)
3333

3434
const {
3535
CONSTANTS,
36+
INLINED_CYCLONEDX_CDXGEN_VERSION,
37+
INLINED_SOCKET_CLI_HOMEPAGE,
3638
INLINED_SOCKET_CLI_LEGACY_BUILD,
39+
INLINED_SOCKET_CLI_NAME,
3740
INLINED_SOCKET_CLI_PUBLISHED_BUILD,
3841
INLINED_SOCKET_CLI_SENTRY_BUILD,
3942
INLINED_SOCKET_CLI_VERSION,
4043
INLINED_SOCKET_CLI_VERSION_HASH,
44+
INLINED_SYNP_VERSION,
4145
LATEST,
4246
ROLLUP_ENTRY_SUFFIX,
4347
ROLLUP_EXTERNAL_SUFFIX,
@@ -291,12 +295,8 @@ export default function baseConfig(extendConfig = {}) {
291295
)
292296
],
293297
[
294-
INLINED_SOCKET_CLI_VERSION,
295-
() => JSON.stringify(getRootPkgJsonSync().version)
296-
],
297-
[
298-
INLINED_SOCKET_CLI_VERSION_HASH,
299-
() => JSON.stringify(getSocketCliVersionHash())
298+
INLINED_SOCKET_CLI_HOMEPAGE,
299+
() => JSON.stringify(getRootPkgJsonSync().homepage)
300300
],
301301
[
302302
INLINED_SOCKET_CLI_LEGACY_BUILD,
@@ -306,6 +306,10 @@ export default function baseConfig(extendConfig = {}) {
306306
!!constants.ENV[INLINED_SOCKET_CLI_LEGACY_BUILD]
307307
)
308308
],
309+
[
310+
INLINED_SOCKET_CLI_NAME,
311+
() => JSON.stringify(getRootPkgJsonSync().name)
312+
],
309313
[
310314
INLINED_SOCKET_CLI_PUBLISHED_BUILD,
311315
() =>
@@ -322,6 +326,14 @@ export default function baseConfig(extendConfig = {}) {
322326
!!constants.ENV[INLINED_SOCKET_CLI_SENTRY_BUILD]
323327
)
324328
],
329+
[
330+
INLINED_SOCKET_CLI_VERSION,
331+
() => JSON.stringify(getRootPkgJsonSync().version)
332+
],
333+
[
334+
INLINED_SOCKET_CLI_VERSION_HASH,
335+
() => JSON.stringify(getSocketCliVersionHash())
336+
],
325337
[
326338
INLINED_SYNP_VERSION,
327339
() => JSON.stringify(getRootPkgJsonSync().devDependencies['synp'])

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "socket",
33
"version": "0.14.59",
44
"description": "CLI tool for Socket.dev",
5-
"homepage": "http://github.com/SocketDev/socket-cli",
5+
"homepage": "https://github.com/SocketDev/socket-cli",
66
"license": "MIT",
77
"repository": {
88
"type": "git",

scripts/constants.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,16 @@ const {
1818
const WITH_SENTRY = 'with-sentry'
1919
const CLI = 'cli'
2020
const CONSTANTS = 'constants'
21+
const INLINED_CYCLONEDX_CDXGEN_VERSION = 'INLINED_CYCLONEDX_CDXGEN_VERSION'
22+
const INLINED_SOCKET_CLI_HOMEPAGE = 'INLINED_SOCKET_CLI_HOMEPAGE'
2123
const INLINED_SOCKET_CLI_LEGACY_BUILD = 'INLINED_SOCKET_CLI_LEGACY_BUILD'
24+
const INLINED_SOCKET_CLI_NAME = 'INLINED_SOCKET_CLI_NAME'
2225
const INLINED_SOCKET_CLI_PUBLISHED_BUILD = 'INLINED_SOCKET_CLI_PUBLISHED_BUILD'
2326
const INLINED_SOCKET_CLI_SENTRY_BUILD = 'INLINED_SOCKET_CLI_SENTRY_BUILD'
2427
const INLINED_SOCKET_CLI_TEST_DIST_BUILD = 'INLINED_SOCKET_CLI_TEST_DIST_BUILD'
28+
const INLINED_SOCKET_CLI_VERSION = 'INLINED_SOCKET_CLI_VERSION'
29+
const INLINED_SOCKET_CLI_VERSION_HASH = 'INLINED_SOCKET_CLI_VERSION'
30+
const INLINED_SYNP_VERSION = 'INLINED_SYNP_VERSION'
2531
const INSTRUMENT_WITH_SENTRY = `instrument-${WITH_SENTRY}`
2632
const MODULE_SYNC = 'module-sync'
2733
const REQUIRE = 'require'
@@ -104,10 +110,16 @@ const constants = createConstantsObject(
104110
CLI,
105111
CONSTANTS,
106112
ENV: undefined,
113+
INLINED_CYCLONEDX_CDXGEN_VERSION,
114+
INLINED_SOCKET_CLI_HOMEPAGE,
107115
INLINED_SOCKET_CLI_LEGACY_BUILD,
116+
INLINED_SOCKET_CLI_NAME,
108117
INLINED_SOCKET_CLI_PUBLISHED_BUILD,
109118
INLINED_SOCKET_CLI_SENTRY_BUILD,
110119
INLINED_SOCKET_CLI_TEST_DIST_BUILD,
120+
INLINED_SOCKET_CLI_VERSION,
121+
INLINED_SOCKET_CLI_VERSION_HASH,
122+
INLINED_SYNP_VERSION,
111123
INSTRUMENT_WITH_SENTRY,
112124
MODULE_SYNC,
113125
REQUIRE,
@@ -120,12 +132,12 @@ const constants = createConstantsObject(
120132
SOCKET,
121133
SOCKET_CLI_BIN_NAME,
122134
SOCKET_CLI_BIN_NAME_ALIAS,
123-
SOCKET_CLI_SENTRY_BIN_NAME_ALIAS,
124135
SOCKET_CLI_LEGACY_PACKAGE_NAME,
125136
SOCKET_CLI_NPM_BIN_NAME,
126137
SOCKET_CLI_NPX_BIN_NAME,
127138
SOCKET_CLI_PACKAGE_NAME,
128139
SOCKET_CLI_SENTRY_BIN_NAME,
140+
SOCKET_CLI_SENTRY_BIN_NAME_ALIAS,
129141
SOCKET_CLI_SENTRY_NPM_BIN_NAME,
130142
SOCKET_CLI_SENTRY_NPX_BIN_NAME,
131143
SOCKET_CLI_SENTRY_PACKAGE_NAME,

src/utils/sdk.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@ export async function setupSdk(
7474
}
7575
: undefined,
7676
baseUrl: apiBaseUrl,
77-
// Lazily access constants.rootPkgJsonPath.
78-
userAgent: createUserAgentFromPkgJson(require(constants.rootPkgJsonPath))
77+
userAgent: createUserAgentFromPkgJson({
78+
// The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_NAME']".
79+
name: process.env['INLINED_SOCKET_CLI_NAME'] as string,
80+
// The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
81+
version: process.env['INLINED_SOCKET_CLI_VERSION'] as string,
82+
// The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_HOMEPAGE']".
83+
homepage: process.env['INLINED_SOCKET_CLI_HOMEPAGE'] as string
84+
})
7985
})
8086
}

0 commit comments

Comments
 (0)