microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 16:38:05 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix after merging latest baselining branch

Browse Source
This commit is contained in:
Sheetal Nandi 2019-09-24 09:55:50 -07:00
parent bd7d370fc8
commit bf0fc858c1
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/testRunner/unittests/tsc/declarationEmit.ts
View File

@ -24,7 +24,7 @@ namespace ts {
export declare function actionCreatorFactory(prefix?: string | null): ActionCreatorFactory;
export default actionCreatorFactory;`;
return loadProjectFromFiles({
"/plugin-two/index.d.ts": utils.dedent`
"/src/plugin-two/index.d.ts": utils.dedent`
declare const _default: {
features: {
featureOne: {
@ -46,28 +46,28 @@ namespace ts {
};
};
export default _default;`,
"/plugin-two/node_modules/typescript-fsa/package.json": fsaPackageJson,
"/plugin-two/node_modules/typescript-fsa/index.d.ts": fsaIndex,
"/plugin-one/tsconfig.json": utils.dedent`
"/src/plugin-two/node_modules/typescript-fsa/package.json": fsaPackageJson,
"/src/plugin-two/node_modules/typescript-fsa/index.d.ts": fsaIndex,
"/src/plugin-one/tsconfig.json": utils.dedent`
{
"compilerOptions": {
"target": "es5",
"declaration": true,
},
}`,
"/plugin-one/index.ts": utils.dedent`
"/src/plugin-one/index.ts": utils.dedent`
import pluginTwo from "plugin-two"; // include this to add reference to symlink`,
"/plugin-one/action.ts": utils.dedent`
"/src/plugin-one/action.ts": utils.dedent`
import { actionCreatorFactory } from "typescript-fsa"; // Include version of shared lib
const action = actionCreatorFactory("somekey");
const featureOne = action<{ route: string }>("feature-one");
export const actions = { featureOne };`,
"/plugin-one/node_modules/typescript-fsa/package.json": fsaPackageJson,
"/plugin-one/node_modules/typescript-fsa/index.d.ts": fsaIndex,
"/plugin-one/node_modules/plugin-two": new vfs.Symlink("/plugin-two"),
"/src/plugin-one/node_modules/typescript-fsa/package.json": fsaPackageJson,
"/src/plugin-one/node_modules/typescript-fsa/index.d.ts": fsaIndex,
"/src/plugin-one/node_modules/plugin-two": new vfs.Symlink("/src/plugin-two"),
});
},
commandLineArgs: ["-p", "plugin-one", "--listFiles"]
commandLineArgs: ["-p", "src/plugin-one", "--listFiles"]
});
});
}

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

@ -1,15 +1,15 @@
//// [/lib/initial-buildOutput.txt]
/lib/tsc -p plugin-one --listFiles
/lib/tsc -p src/plugin-one --listFiles
/lib/lib.d.ts
/plugin-one/node_modules/typescript-fsa/index.d.ts
/plugin-one/action.ts
/plugin-two/node_modules/typescript-fsa/index.d.ts -> /plugin-one/node_modules/typescript-fsa/index.d.ts
/plugin-two/index.d.ts
/plugin-one/index.ts
/src/plugin-one/node_modules/typescript-fsa/index.d.ts
/src/plugin-one/action.ts
/src/plugin-one/node_modules/plugin-two/node_modules/typescript-fsa/index.d.ts -> /src/plugin-one/node_modules/typescript-fsa/index.d.ts
/src/plugin-one/node_modules/plugin-two/index.d.ts
/src/plugin-one/index.ts
exitCode:: 0
//// [/plugin-one/action.d.ts]
//// [/src/plugin-one/action.d.ts]
export declare const actions: {
featureOne: import("typescript-fsa").ActionCreator<{
route: string;
@ -17,7 +17,7 @@ export declare const actions: {
};
//// [/plugin-one/action.js]
//// [/src/plugin-one/action.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var typescript_fsa_1 = require("typescript-fsa"); // Include version of shared lib
@ -26,11 +26,11 @@ var featureOne = action("feature-one");
exports.actions = { featureOne: featureOne };
//// [/plugin-one/index.d.ts]
//// [/src/plugin-one/index.d.ts]
export {};
//// [/plugin-one/index.js]
//// [/src/plugin-one/index.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });