Skip to content
Prev Previous commit
Next Next commit
fix test-typescript-patch.js
make the `gatsby-node.js` fix more simple.
  • Loading branch information
Larry1123 committed Sep 8, 2022
commit 856428a7bbd832e7c33d7fc1352076b861900ac7
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ exports.sourceNodes = async ({actions, createNodeId, createContentDigest}, opts)
}
});

const monorepoRoot = require.resolve(`@yarnpkg/monorepo/package.json`).replace(`/package.json`, ``);
const data = await execute([
require.resolve(`${monorepoRoot}/packages/yarnpkg-core/sources/Plugin.ts`),
require.resolve(path.resolve(packageDirectory, `yarnpkg-core/sources/Plugin.ts`)),
...indexList,
]);

Expand Down
15 changes: 9 additions & 6 deletions scripts/test-typescript-patch.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,17 @@ const compilerOptions = ts.parseJsonSourceFileConfigFileContent(
const compilerHost = ts.createCompilerHost(compilerOptions);
const program = ts.createProgram(compilerOptions.fileNames, compilerOptions, compilerHost);
const moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, compilerHost);
const rootSourceFile = program.getSourceFile(require.resolve(`@yarnpkg/core/sources/Project.ts`));

const yarnCorePkgDir = require.resolve(`@yarnpkg/core/package.json`).replace(`/package.json`, ``);
const fslibPkgDir = require.resolve(`@yarnpkg/fslib/package.json`).replace(`/package.json`, ``);
const rootSourceFile = program.getSourceFile(require.resolve(`${yarnCorePkgDir}/sources/Project.ts`));

const TESTS = [
[`@yarnpkg/core/sources/Configuration.ts`, `./Configuration`],
[`@yarnpkg/fslib/README.md`, `@yarnpkg/fslib/README.md`],
[`@yarnpkg/fslib/package.json`, `@yarnpkg/fslib/package.json`],
[`@yarnpkg/fslib/sources/ZipFS.ts`, `@yarnpkg/fslib/sources/ZipFS`],
[`@yarnpkg/fslib/sources/index.ts`, `@yarnpkg/fslib`],
[`${yarnCorePkgDir}/sources/Configuration.ts`, `./Configuration`],
[`${fslibPkgDir}/README.md`, `@yarnpkg/fslib/README.md`],
[`${fslibPkgDir}/package.json`, `@yarnpkg/fslib/package.json`],
[`${fslibPkgDir}/sources/ZipFS.ts`, `@yarnpkg/fslib/sources/ZipFS`],
[`${fslibPkgDir}/sources/index.ts`, `@yarnpkg/fslib`],
];

for (const [test, expected] of TESTS) {
Expand Down