Skip to content
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

feat: add teamcity & browserstack support #185

Merged
merged 2 commits into from
Jun 26, 2018

Conversation

brandonocasey
Copy link
Contributor

@brandonocasey brandonocasey commented Jun 25, 2018

No description provided.

const StaticMiddlewareFactory = function(config) {
console.log(`**** Dev server started at http://${config.listenAddress}:${config.port}/ *****`);
console.log(`**** Karma static file server enabled in project root *****`);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

small change here, config.port would be wrong if the port is in-use and has to be incremented.

const serve = serveStatic(
config.basePath,
{index: ['index.html', 'index.htm']}
);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We should server the basePath, rather than trying to determine our own.

@brandonocasey brandonocasey force-pushed the feat/teamcity-browserstack branch from eae31ab to 11802cf Compare June 25, 2018 20:01
const StaticMiddlewareFactory = function(config) {
console.log(`**** Dev server started at http://${config.listenAddress}:${config.port}/ *****`);
Copy link
Member

Choose a reason for hiding this comment

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

is this info being printed elsewhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The karma server prints it when it starts up. Oftentimes the address we were printing here is the address we were passed. This means that when port 9999 is in use and get incremented by karma to 10000. we still print 9999.

Copy link
Member

Choose a reason for hiding this comment

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

cool.

@brandonocasey brandonocasey force-pushed the feat/teamcity-browserstack branch from 307ac4f to 2ef0dea Compare June 25, 2018 21:11
@@ -305,16 +305,14 @@ module.exports = class extends Generator {

const file = constants.LICENSE_FILES[this.config.get('license')];

if (!file) {
return;
if (file) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixes a bug where un-licensed would cause the package.json not to be copied.


/* General Globals */
const moduleName = '<%= moduleName %>';
const pluginName = '<%= pluginName %>';
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mostly I added all the main variables at the top of the file, so that users won't have to dig into the actual builds unless they really need to.

usePhantomJS: false
};
/* browsers to run on teamcity */
const teamcityLaunchers = {
Copy link
Member

Choose a reason for hiding this comment

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

this seems a confusing name given that these browsers are set up to work with browserstack.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah it is maybe we should split it into teamcityLaunchers, and browserstackLaunchers

Copy link
Member

Choose a reason for hiding this comment

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

yeah, I would just call these browserstackLaunchers and just use it in TC usecase below or something.

@gkatsev
Copy link
Member

gkatsev commented Jun 26, 2018

Also, would've been nice if the rollup changes, karma changes, and the fix for package.json were all in separate PRs.

@brandonocasey
Copy link
Contributor Author

I will split up the prs

@brandonocasey brandonocasey force-pushed the feat/teamcity-browserstack branch from 24b6939 to dc8cbd7 Compare June 26, 2018 20:04
@brandonocasey brandonocasey merged commit 9dd44de into master Jun 26, 2018
@gkatsev gkatsev deleted the feat/teamcity-browserstack branch June 26, 2018 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants