Skip to content

fix(build): correctly compile source files against typings #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 17, 2016

Conversation

IgorMinar
Copy link
Contributor

It looks like previously we were grabbing typings from outside of the tmp/ directory.
If this ever worked, it worked only by accident.

if (this.options && this.options.vendorNpmFiles) {
vendorNpmFiles = vendorNpmFiles.concat(this.options.vendorNpmFiles);
}

var tsConfigCompilerOptions = JSON.parse(fs.readFileSync('src/tsconfig.json', 'utf-8')).compilerOptions;
// TODO(i): kill rootFilePaths in broccoli-typescript and use tsconfig.json#files instead
tsConfigCompilerOptions.rootFilePaths = JSON.parse(fs.readFileSync('src/tsconfig.json', 'utf-8')).files;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you load the json only once?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ha. yeah. this should really be a separate commit. I missed this change. thanks for pointing it out.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note; broccoli-typescript might be going away with the upgrade to broccoli 1.0.

@hansl
Copy link
Contributor

hansl commented Mar 17, 2016

Couple of nits, and we still need to talk about typings.

@hansl
Copy link
Contributor

hansl commented Mar 17, 2016

LGTM if you remove the declaration of sourceTree.

@IgorMinar IgorMinar force-pushed the build-typings branch 2 times, most recently from 8398d95 to 411a95a Compare March 17, 2016 23:22
and document why that it's used only for debugging
It looks like previously we were grabbing typings from outside of the tmp/ directory.
If this ever worked, it worked only by accident.
We need to preserve the paths to be the same during build as they are in source repo,
so that editor and build pipeline are aligned.
@@ -9,10 +9,16 @@
"moduleResolution": "node",
"noEmitOnError": true,
"noImplicitAny": false,
"outDir": "../dist/",
"//outDir": "this option is used only during manual invocation of tsc usually while debugging",
"outDir": "../dist-manual/",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep this as ../dist as this is for tooling, more than command line usage of tsc.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in a follow up commit.

@IgorMinar IgorMinar merged commit 19774b9 into angular:master Mar 17, 2016
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants