Skip to content

Commit 9a49973

Browse files
mmermerkayammermerkaya
authored
Import package version from package.json (#1764)
1 parent 38cb158 commit 9a49973

File tree

16 files changed

+43
-63
lines changed

16 files changed

+43
-63
lines changed

‎packages/app/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"rollup": "1.11.0",
5353
"rollup-plugin-replace": "2.2.0",
5454
"rollup-plugin-typescript2": "0.21.0",
55+
"rollup-plugin-json": "4.0.0",
5556
"sinon": "7.3.2",
5657
"source-map-loader": "0.2.4",
5758
"ts-loader": "5.4.5",
@@ -67,7 +68,7 @@
6768
"bugs": {
6869
"url": "https://github.com/firebase/firebase-js-sdk/issues"
6970
},
70-
"typings": "dist/index.d.ts",
71+
"typings": "dist/app/index.d.ts",
7172
"nyc": {
7273
"extension": [
7374
".ts"

‎packages/app/rollup.config.js

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
*/
1717

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

23-
import firebasePkg from '../firebase/package.json';
24-
2523
const deps = Object.keys(
2624
Object.assign({}, pkg.peerDependencies, pkg.dependencies)
2725
);
@@ -33,12 +31,7 @@ const es5BuildPlugins = [
3331
typescriptPlugin({
3432
typescript
3533
}),
36-
replace({
37-
delimiters: ['${', '}'],
38-
values: {
39-
JSCORE_VERSION: firebasePkg.version
40-
}
41-
})
34+
json()
4235
];
4336

4437
const es5Builds = [
@@ -98,11 +91,8 @@ const es2017BuildPlugins = [
9891
}
9992
}
10093
}),
101-
replace({
102-
delimiters: ['${', '}'],
103-
values: {
104-
JSCORE_VERSION: firebasePkg.version
105-
}
94+
json({
95+
preferConst: true
10696
})
10797
];
10898

‎packages/app/src/firebaseNamespaceCore.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import { FirebaseAppImpl } from './firebaseApp';
3434
import { error, AppError } from './errors';
3535
import { FirebaseAppLiteImpl } from './lite/firebaseAppLite';
3636
import { DEFAULT_ENTRY_NAME } from './constants';
37+
import { version } from '../../firebase/package.json';
3738

3839
function contains(obj: object, key: string) {
3940
return Object.prototype.hasOwnProperty.call(obj, key);
@@ -62,7 +63,7 @@ export function createFirebaseNamespaceCore(
6263
initializeApp: initializeApp,
6364
app: app as any,
6465
apps: null as any,
65-
SDK_VERSION: '${JSCORE_VERSION}',
66+
SDK_VERSION: version,
6667
INTERNAL: {
6768
registerService,
6869
removeApp,

‎packages/app/src/lite/firebaseNamespaceLite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { createFirebaseNamespaceCore } from '../firebaseNamespaceCore';
2828
export function createFirebaseNamespaceLite(): FirebaseNamespace {
2929
const namespace = createFirebaseNamespaceCore(FirebaseAppLiteImpl);
3030

31-
namespace.SDK_VERSION = '${JSCORE_VERSION}_LITE';
31+
namespace.SDK_VERSION = `${namespace.SDK_VERSION}_LITE`;
3232

3333
const registerService = (namespace as _FirebaseNamespace).INTERNAL
3434
.registerService;

‎packages/app/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"extends": "../../config/tsconfig.base.json",
33
"compilerOptions": {
4-
"outDir": "dist"
4+
"outDir": "dist",
5+
"resolveJsonModule": true
56
},
67
"exclude": [
78
"dist/**/*"

‎packages/installations/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"main": "dist/index.cjs.js",
55
"module": "dist/index.esm.js",
66
"esm2017": "dist/index.esm2017.js",
7-
"types": "dist/index.d.ts",
7+
"types": "dist/src/index.d.ts",
88
"author": "Firebase <[email protected]> (https://firebase.google.com/)",
99
"license": "Apache-2.0",
1010
"scripts": {
@@ -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 & 10 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,12 +25,7 @@ const deps = Object.keys({ ...pkg.peerDependencies, ...pkg.dependencies });
2525
/**
2626
* ES5 Builds
2727
*/
28-
const es5BuildPlugins = [
29-
typescriptPlugin({ typescript }),
30-
replace({
31-
__VERSION__: pkg.version
32-
})
33-
];
28+
const es5BuildPlugins = [typescriptPlugin({ typescript }), json()];
3429

3530
const es5Builds = [
3631
{
@@ -56,9 +51,7 @@ const es2017BuildPlugins = [
5651
}
5752
}
5853
}),
59-
replace({
60-
__VERSION__: pkg.version
61-
})
54+
json({ preferConst: true })
6255
];
6356

6457
const es2017Builds = [

‎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__'; // Will be replaced by Rollup
22+
export const PACKAGE_VERSION = `w:${version}`;
2123
export const INTERNAL_AUTH_VERSION = 'FIS_v2';
2224

2325
export const INSTALLATIONS_API_URL =

‎packages/installations/test-app/rollup.config.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
import typescriptPlugin from 'rollup-plugin-typescript2';
1919
import resolve from 'rollup-plugin-node-resolve';
2020
import commonjs from 'rollup-plugin-commonjs';
21-
import replace from 'rollup-plugin-replace';
21+
import json from 'rollup-plugin-json';
2222
import { uglify } from 'rollup-plugin-uglify';
23-
import pkg from '../package.json';
2423
import typescript from 'typescript';
2524

2625
/**
@@ -40,9 +39,7 @@ export default [
4039
typescript,
4140
tsconfigOverride: { compilerOptions: { declaration: false } }
4241
}),
43-
replace({
44-
__VERSION__: pkg.version
45-
}),
42+
json(),
4643
resolve(),
4744
commonjs(),
4845
uglify()

‎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/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: 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: 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+
}

‎yarn.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12027,6 +12027,13 @@ [email protected]:
1202712027
dependencies:
1202812028
fs-extra "^5.0.0"
1202912029

12030+
[email protected]:
12031+
version "4.0.0"
12032+
resolved "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
12033+
integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
12034+
dependencies:
12035+
rollup-pluginutils "^2.5.0"
12036+
1203012037
[email protected]:
1203112038
version "0.8.1"
1203212039
resolved "https://registry.npmjs.org/rollup-plugin-license/-/rollup-plugin-license-0.8.1.tgz#cdcfee2a32f27790e5019a2a7abd9234476ac589"
@@ -12102,7 +12109,7 @@ [email protected], rollup-pluginutils@^2.0.1:
1210212109
estree-walker "^0.6.0"
1210312110
micromatch "^3.1.10"
1210412111

12105-
rollup-pluginutils@^2.6.0:
12112+
rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0:
1210612113
version "2.6.0"
1210712114
resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz#203706edd43dfafeaebc355d7351119402fc83ad"
1210812115
integrity sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ==

0 commit comments

Comments
 (0)