From bf0fc858c184115f993f6d550a202fcda0f68410 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Tue, 24 Sep 2019 09:55:50 -0700 Subject: [PATCH] Fix after merging latest baselining branch --- .../unittests/tsc/declarationEmit.ts | 20 +++++++++---------- ...gh-source-and-another-symlinked-package.js | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/testRunner/unittests/tsc/declarationEmit.ts b/src/testRunner/unittests/tsc/declarationEmit.ts index 75a40debb67..5ff85a92f34 100644 --- a/src/testRunner/unittests/tsc/declarationEmit.ts +++ b/src/testRunner/unittests/tsc/declarationEmit.ts @@ -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"] }); }); } diff --git a/tests/baselines/reference/tsc/declarationEmit/initial-build/when-same-version-is-referenced-through-source-and-another-symlinked-package.js b/tests/baselines/reference/tsc/declarationEmit/initial-build/when-same-version-is-referenced-through-source-and-another-symlinked-package.js index 5db17df5e98..910b9d1db3a 100644 --- a/tests/baselines/reference/tsc/declarationEmit/initial-build/when-same-version-is-referenced-through-source-and-another-symlinked-package.js +++ b/tests/baselines/reference/tsc/declarationEmit/initial-build/when-same-version-is-referenced-through-source-and-another-symlinked-package.js @@ -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 });