Skip to content

Commit bf0fc85

Browse files
committed
Fix after merging latest baselining branch
1 parent bd7d370 commit bf0fc85

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

src/testRunner/unittests/tsc/declarationEmit.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace ts {
2424
export declare function actionCreatorFactory(prefix?: string | null): ActionCreatorFactory;
2525
export default actionCreatorFactory;`;
2626
return loadProjectFromFiles({
27-
"/plugin-two/index.d.ts": utils.dedent`
27+
"/src/plugin-two/index.d.ts": utils.dedent`
2828
declare const _default: {
2929
features: {
3030
featureOne: {
@@ -46,28 +46,28 @@ namespace ts {
4646
};
4747
};
4848
export default _default;`,
49-
"/plugin-two/node_modules/typescript-fsa/package.json": fsaPackageJson,
50-
"/plugin-two/node_modules/typescript-fsa/index.d.ts": fsaIndex,
51-
"/plugin-one/tsconfig.json": utils.dedent`
49+
"/src/plugin-two/node_modules/typescript-fsa/package.json": fsaPackageJson,
50+
"/src/plugin-two/node_modules/typescript-fsa/index.d.ts": fsaIndex,
51+
"/src/plugin-one/tsconfig.json": utils.dedent`
5252
{
5353
"compilerOptions": {
5454
"target": "es5",
5555
"declaration": true,
5656
},
5757
}`,
58-
"/plugin-one/index.ts": utils.dedent`
58+
"/src/plugin-one/index.ts": utils.dedent`
5959
import pluginTwo from "plugin-two"; // include this to add reference to symlink`,
60-
"/plugin-one/action.ts": utils.dedent`
60+
"/src/plugin-one/action.ts": utils.dedent`
6161
import { actionCreatorFactory } from "typescript-fsa"; // Include version of shared lib
6262
const action = actionCreatorFactory("somekey");
6363
const featureOne = action<{ route: string }>("feature-one");
6464
export const actions = { featureOne };`,
65-
"/plugin-one/node_modules/typescript-fsa/package.json": fsaPackageJson,
66-
"/plugin-one/node_modules/typescript-fsa/index.d.ts": fsaIndex,
67-
"/plugin-one/node_modules/plugin-two": new vfs.Symlink("/plugin-two"),
65+
"/src/plugin-one/node_modules/typescript-fsa/package.json": fsaPackageJson,
66+
"/src/plugin-one/node_modules/typescript-fsa/index.d.ts": fsaIndex,
67+
"/src/plugin-one/node_modules/plugin-two": new vfs.Symlink("/src/plugin-two"),
6868
});
6969
},
70-
commandLineArgs: ["-p", "plugin-one", "--listFiles"]
70+
commandLineArgs: ["-p", "src/plugin-one", "--listFiles"]
7171
});
7272
});
7373
}

tests/baselines/reference/tsc/declarationEmit/initial-build/when-same-version-is-referenced-through-source-and-another-symlinked-package.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
//// [/lib/initial-buildOutput.txt]
2-
/lib/tsc -p plugin-one --listFiles
2+
/lib/tsc -p src/plugin-one --listFiles
33
/lib/lib.d.ts
4-
/plugin-one/node_modules/typescript-fsa/index.d.ts
5-
/plugin-one/action.ts
6-
/plugin-two/node_modules/typescript-fsa/index.d.ts -> /plugin-one/node_modules/typescript-fsa/index.d.ts
7-
/plugin-two/index.d.ts
8-
/plugin-one/index.ts
4+
/src/plugin-one/node_modules/typescript-fsa/index.d.ts
5+
/src/plugin-one/action.ts
6+
/src/plugin-one/node_modules/plugin-two/node_modules/typescript-fsa/index.d.ts -> /src/plugin-one/node_modules/typescript-fsa/index.d.ts
7+
/src/plugin-one/node_modules/plugin-two/index.d.ts
8+
/src/plugin-one/index.ts
99
exitCode:: 0
1010

1111

12-
//// [/plugin-one/action.d.ts]
12+
//// [/src/plugin-one/action.d.ts]
1313
export declare const actions: {
1414
featureOne: import("typescript-fsa").ActionCreator<{
1515
route: string;
1616
}>;
1717
};
1818

1919

20-
//// [/plugin-one/action.js]
20+
//// [/src/plugin-one/action.js]
2121
"use strict";
2222
Object.defineProperty(exports, "__esModule", { value: true });
2323
var typescript_fsa_1 = require("typescript-fsa"); // Include version of shared lib
@@ -26,11 +26,11 @@ var featureOne = action("feature-one");
2626
exports.actions = { featureOne: featureOne };
2727

2828

29-
//// [/plugin-one/index.d.ts]
29+
//// [/src/plugin-one/index.d.ts]
3030
export {};
3131

3232

33-
//// [/plugin-one/index.js]
33+
//// [/src/plugin-one/index.js]
3434
"use strict";
3535
Object.defineProperty(exports, "__esModule", { value: true });
3636

0 commit comments

Comments
 (0)