Skip to content

Commit c5776d5

Browse files
committed
Update gruntfile to handle unique 1ds version.
1 parent bccd721 commit c5776d5

2 files changed

Lines changed: 23 additions & 2 deletions

File tree

gruntfile.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module.exports = function (grunt) {
22

33
const versionPlaceholder = '"#version#"';
4+
const oneDsVersionPlaceholder = '"#1ds-version#"';
45

56
const aiCoreDefaultNameReplacements = [
67
];
@@ -323,7 +324,27 @@ module.exports = function (grunt) {
323324
var packageVersion = pkg['version'];
324325

325326
replaceCmds[key] = setVersionNumber(modulePath, packageVersion);
326-
replaceCmds[key + '-reverse'] = restoreVersionPlaceholder(modulePath, packageVersion);
327+
replaceCmds[key + '-reverse'] = restoreVersionPlaceholder(modulePath, packageVersion);
328+
329+
// For the core module, also replace #1ds-version# with the 1ds-core-js version
330+
if (key === "core") {
331+
var oneDsPkgPath = './shared/1ds-core-js/package.json';
332+
if (grunt.file.exists(oneDsPkgPath)) {
333+
var oneDsVersion = grunt.file.readJSON(oneDsPkgPath)['version'];
334+
var oneDsExpected = _createRegEx(oneDsVersionPlaceholder);
335+
replaceCmds[key].options.replacements.push({
336+
pattern: oneDsExpected,
337+
replacement: "'" + oneDsVersion + "'"
338+
});
339+
replaceCmds[key + '-reverse'].options.replacements.push({
340+
pattern: _createRegEx("'" + oneDsVersion + "'"),
341+
replacement: oneDsVersionPlaceholder
342+
},{
343+
pattern: _createRegEx('"' + oneDsVersion + '"'),
344+
replacement: oneDsVersionPlaceholder
345+
});
346+
}
347+
}
327348
}
328349
}
329350

shared/AppInsightsCore/src/ext/extUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { IEventProperty, IExtendedTelemetryItem } from "../interfaces/ext/DataMo
1616
import { newGuid } from "../utils/CoreUtils";
1717
import { isReactNative } from "../utils/EnvUtils";
1818

19-
export const Version = "#version#";
19+
export const Version = "#1ds-version#";
2020
export const FullVersionString = "1DS-Web-JS-" + Version;
2121

2222
const ObjHasOwnProperty = Object.prototype.hasOwnProperty;

0 commit comments

Comments
 (0)