Skip to content

Commit 24d8c60

Browse files
updating the regex to recognize multiple directories after the src to be public and removing the updating rush common versions step (Azure#21259)
1 parent 81a5fb4 commit 24d8c60

File tree

1 file changed

+2
-29
lines changed

1 file changed

+2
-29
lines changed

eng/tools/dependency-testing/index.js

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ async function readAndReplaceSourceReferences(filePath, packageName) {
281281
'path.resolve(path.join(process.cwd(),"..","..", "assets"'
282282
);
283283
// Regex for internal references = /* ["']+[../]*src[/][a-z]+["'] */
284-
let internalrefs = testAssetsContent.match(/[\"\']+[..//]*src[//][a-zA-Z]+[\"\']+/g);
284+
let internalrefs = testAssetsContent.match(/[\"\']+[..//]*src[//][a-zA-Z/]+[\"\']+/g);
285285
let writeContent = "";
286286
if (internalrefs) {
287287
console.log("internal refs = ");
@@ -357,32 +357,6 @@ async function updateRushConfig(repoRoot, targetPackage, testFolder) {
357357
await packageUtils.writePackageJson(rushPath, rushSpec);
358358
}
359359

360-
async function updateCommonVersions(repoRoot, allowedVersionList) {
361-
const commonVersionsConfig = await packageUtils.getRushCommonVersions(repoRoot);
362-
let allowedAlternativeVersions = commonVersionsConfig["allowedAlternativeVersions"];
363-
console.dir(allowedVersionList);
364-
console.dir(allowedAlternativeVersions);
365-
for (const package in allowedVersionList) {
366-
console.log(package);
367-
console.log(allowedVersionList[package]);
368-
if (allowedVersionList[package] && !allowedAlternativeVersions[package]) {
369-
allowedAlternativeVersions[package] = [allowedVersionList[package]];
370-
} else if (
371-
allowedVersionList[package] &&
372-
!allowedAlternativeVersions[package].includes(allowedVersionList[package])
373-
) {
374-
allowedAlternativeVersions[package].push(allowedVersionList[package]);
375-
}
376-
}
377-
console.dir(allowedAlternativeVersions);
378-
let newConfig = commonVersionsConfig;
379-
newConfig["allowedAlternativeVersions"] = allowedAlternativeVersions;
380-
const commonVersionsPath = path.resolve(
381-
path.join(repoRoot, "/common/config/rush/common-versions.json")
382-
);
383-
console.log(newConfig);
384-
await packageUtils.writePackageJson(commonVersionsPath, newConfig);
385-
}
386360

387361
async function getPackageFromRush(repoRoot, packageName) {
388362
const rushSpec = await packageUtils.getRushSpec(repoRoot);
@@ -410,7 +384,7 @@ async function main(argv) {
410384
const packageJsonLocation = path.join(targetPackagePath, "package.json");
411385

412386
const packageJsonContents = await packageUtils.readFileJson(packageJsonLocation);
413-
const allowedVersionList = await insertPackageJson(
387+
await insertPackageJson(
414388
repoRoot,
415389
packageJsonContents,
416390
targetPackagePath,
@@ -426,7 +400,6 @@ async function main(argv) {
426400
await replaceSourceReferences(targetPackagePath, targetPackage.packageName, testFolder);
427401
await insertMochaReporter(targetPackagePath, repoRoot, testFolder);
428402
await updateRushConfig(repoRoot, targetPackage, testFolder);
429-
await updateCommonVersions(repoRoot, allowedVersionList);
430403
outputTestPath(targetPackage.projectFolder, sourceDir, testFolder);
431404
}
432405
main(argv);

0 commit comments

Comments
 (0)