Skip to content

Commit f2bba9c

Browse files
committed
Import version from package.json in Installations and Performance
1 parent 74844d4 commit f2bba9c

File tree

11 files changed

+21
-82
lines changed

11 files changed

+21
-82
lines changed

packages/installations/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"mocha": "6.1.4",
3333
"rollup": "1.11.0",
3434
"rollup-plugin-commonjs": "9.3.4",
35+
"rollup-plugin-json": "4.0.0",
3536
"rollup-plugin-node-resolve": "4.2.3",
36-
"rollup-plugin-replace": "2.2.0",
3737
"rollup-plugin-typescript2": "0.21.0",
3838
"rollup-plugin-uglify": "6.0.2",
3939
"sinon": "7.3.2",

packages/installations/rollup.config.js

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* limitations under the License.
1616
*/
1717

18+
import json from 'rollup-plugin-json';
1819
import typescriptPlugin from 'rollup-plugin-typescript2';
19-
import replace from 'rollup-plugin-replace';
2020
import pkg from './package.json';
2121
import typescript from 'typescript';
2222

@@ -25,15 +25,7 @@ const deps = Object.keys({ ...pkg.peerDependencies, ...pkg.dependencies });
2525
/**
2626
* ES5 Builds
2727
*/
28-
const es5BuildPlugins = [
29-
typescriptPlugin({ typescript }),
30-
replace({
31-
delimiters: ['__', '__'],
32-
values: {
33-
VERSION: JSON.stringify(pkg.version)
34-
}
35-
})
36-
];
28+
const es5BuildPlugins = [typescriptPlugin({ typescript }), json()];
3729

3830
const es5Builds = [
3931
{
@@ -59,12 +51,7 @@ const es2017BuildPlugins = [
5951
}
6052
}
6153
}),
62-
replace({
63-
delimiters: ['__', '__'],
64-
values: {
65-
VERSION: JSON.stringify(pkg.version)
66-
}
67-
})
54+
json({ preferConst: true })
6855
];
6956

7057
const es2017Builds = [

packages/installations/src/declarations.d.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.

packages/installations/src/util/constants.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
* limitations under the License.
1616
*/
1717

18+
import { version } from '../../package.json';
19+
1820
export const PENDING_TIMEOUT_MS = 10000;
1921

20-
export const PACKAGE_VERSION = `w:${__VERSION__}`;
22+
export const PACKAGE_VERSION = `w:${version}`;
2123
export const INTERNAL_AUTH_VERSION = 'FIS_v2';
2224

2325
export const INSTALLATIONS_API_URL =

packages/installations/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"compilerOptions": {
44
"lib": ["es2017", "dom"],
55
"downlevelIteration": true,
6+
"resolveJsonModule": true,
67

78
"strict": true,
89
"noUnusedLocals": true,

packages/performance/declarations.d.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.

packages/performance/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"chai": "4.2.0",
4141
"mocha": "6.1.4",
4242
"rollup": "1.11.0",
43-
"rollup-plugin-replace": "2.2.0",
43+
"rollup-plugin-json": "4.0.0",
4444
"rollup-plugin-typescript2": "0.21.0",
4545
"sinon": "7.3.2",
4646
"sinon-chai": "3.3.0",

packages/performance/rollup.config.js

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
import json from 'rollup-plugin-json';
1718
import typescriptPlugin from 'rollup-plugin-typescript2';
18-
import replace from 'rollup-plugin-replace';
1919
import typescript from 'typescript';
2020
import pkg from './package.json';
2121

@@ -26,17 +26,7 @@ const deps = Object.keys(
2626
/**
2727
* ES5 Builds
2828
*/
29-
const es5BuildPlugins = [
30-
typescriptPlugin({
31-
typescript
32-
}),
33-
replace({
34-
delimiters: ['__', '__'],
35-
values: {
36-
PERF_SDK_VERSION: JSON.stringify(pkg.version)
37-
}
38-
})
39-
];
29+
const es5BuildPlugins = [typescriptPlugin({ typescript }), json()];
4030

4131
const es5Builds = [
4232
{
@@ -63,12 +53,7 @@ const es2017BuildPlugins = [
6353
}
6454
}
6555
}),
66-
replace({
67-
delimiters: ['__', '__'],
68-
values: {
69-
PERF_SDK_VERSION: JSON.stringify(pkg.version)
70-
}
71-
})
56+
json({ preferConst: true })
7257
];
7358

7459
const es2017Builds = [

packages/performance/src/constants.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
export const SDK_VERSION = __PERF_SDK_VERSION__;
17+
import { version } from '../package.json';
18+
19+
export const SDK_VERSION = version;
1820
/** The prefix for start User Timing marks used for creating Traces. */
1921
export const TRACE_START_MARK_PREFIX = 'FB-PERF-TRACE-START';
2022
/** The prefix for stop User Timing marks used for creating Traces. */

packages/performance/src/services/perf_logger.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { Api, setupApi } from './api_service';
2525
import { SettingsService } from './settings_service';
2626
import { FirebaseApp } from '@firebase/app-types';
2727
import * as initializationService from './initialization_service';
28+
import { SDK_VERSION } from '../constants';
2829
import * as attributeUtils from '../utils/attributes_utils';
2930
import { createNetworkRequestEntry } from '../resources/network_request';
3031
import '../../test/setup';
@@ -83,7 +84,7 @@ describe('Performance Monitoring > perf_logger', () => {
8384
const START_TIME = 12345;
8485
const DURATION = 321;
8586
const EXPECTED_TRACE_MESSAGE = `{"application_info":{"google_app_id":"${APP_ID}",\
86-
"app_instance_id":"${IID}","web_app_info":{"sdk_version":"${__PERF_SDK_VERSION__}",\
87+
"app_instance_id":"${IID}","web_app_info":{"sdk_version":"${SDK_VERSION}",\
8788
"page_url":"${PAGE_URL}","service_worker_status":${SERVICE_WORKER_STATUS},\
8889
"visibility_state":${VISIBILITY_STATE},"effective_connection_type":${EFFECTIVE_CONNECTION_TYPE}},\
8990
"application_process_state":0},"trace_metric":{"name":"${TRACE_NAME}","is_auto":false,\
@@ -137,7 +138,7 @@ describe('Performance Monitoring > perf_logger', () => {
137138
1000
138139
);
139140
const EXPECTED_NETWORK_MESSAGE = `{"application_info":{"google_app_id":"${APP_ID}",\
140-
"app_instance_id":"${IID}","web_app_info":{"sdk_version":"${__PERF_SDK_VERSION__}",\
141+
"app_instance_id":"${IID}","web_app_info":{"sdk_version":"${SDK_VERSION}",\
141142
"page_url":"${PAGE_URL}","service_worker_status":${SERVICE_WORKER_STATUS},\
142143
"visibility_state":${VISIBILITY_STATE},"effective_connection_type":${EFFECTIVE_CONNECTION_TYPE}},\
143144
"application_process_state":0},\

packages/performance/tsconfig.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
"extends": "../../config/tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "dist",
5+
"resolveJsonModule": true,
56
"strict": true,
67
"noUnusedLocals": true,
78
"noUnusedParameters": true,
89
"noImplicitReturns": true,
910
"noFallthroughCasesInSwitch": true
1011
},
11-
"exclude": [
12-
"dist/**/*"
13-
]
14-
}
12+
"exclude": ["dist/**/*"]
13+
}

0 commit comments

Comments
 (0)