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

Consume changes from terra-toolkit and terra-dev-sever #156

Merged
merged 13 commits into from Apr 27, 2018

Conversation

mjhenkes
Copy link
Contributor

Summary

This PR pull's in the new terra-toolkit changes and terra-dev-site changes.
More deletions than additions. :)

Thanks for contributing to Terra.
@cerner/terra

@mjhenkes mjhenkes self-assigned this Apr 17, 2018
@mjhenkes mjhenkes added the Small label Apr 17, 2018
@mjhenkes mjhenkes had a problem deploying to terra-framework-deploye-pr-156 April 17, 2018 17:01 Failure
@mjhenkes mjhenkes changed the title Consume changes from terra-toolkit and terra-dev-sever [DO NOT MERGE] Consume changes from terra-toolkit and terra-dev-sever Apr 17, 2018
@mjhenkes mjhenkes had a problem deploying to terra-framework-deploye-pr-156 April 17, 2018 17:21 Failure
@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 17, 2018 18:24 Inactive
package.json Outdated
@@ -44,11 +44,11 @@
"clean:obsolete-snapshots": "npm test -- -u",
"compile": "npm run compile:src",
"compile:src": "lerna run compile",
"compile:prod": "NODE_ENV=production node --max_old_space_size=2500 node_modules/webpack/bin/webpack.js --config webpack.prod.config.js -p",
"compile:prod": "NODE_ENV=production node --max_old_space_size=3000 node_modules/webpack/bin/webpack.js --config node_modules/terra-dev-site/src/webpack/webpack.config.js -p",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Anyone have a good idea for aliasing out this file to something more friendly without having to include a webpack config locally?
node_modules/terra-dev-site/src/webpack/webpack.config.js

Copy link
Contributor

Choose a reason for hiding this comment

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

maybe provide a terra-dev-site script that will wrap webpack such that it takes args ?.
Thinking

compile:prod: 'NODE_ENV=production node --max_old_space_size=3000 tds-prode'

which maps to

tds-prod.js which calls

shelljs(webpack.js --config ../../src/webpack/webpack.config.js -p)

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually should we be using the servestatic script here by chance?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've thought about wrapping, but I want to avoid wrapping webpack because i don't want ot duplicate all the different webpack config options that exist (there are a ton).

Serve static could be used, but creating the artifacts is a by-product of running the server and there are cases where we just want the build output (deploying to gh-pages).

@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 18, 2018 13:19 Inactive
@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 18, 2018 16:20 Inactive
…ersions of components? thus my update of props table.
@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 19, 2018 19:47 Inactive
@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 20, 2018 00:02 Inactive
@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 20, 2018 16:29 Inactive
@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 20, 2018 17:39 Inactive
@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 24, 2018 13:35 Inactive
package.json Outdated
@@ -38,17 +38,17 @@
}
},
"scripts": {
"bootstrap": "lerna bootstrap",
"bootstrap": "lerna bootstrap --hoist",
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd hold of on using the --hoist flag until we can verify it works with the theme repos. Right now, I know it works with terra-ui, but I wasn't able to get it working the cerner-consumer-theme repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good, but we should pause this PR until we can verify --hoist works. It significantly lowers the memory footprint of the dev site.

@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 25, 2018 18:49 Inactive
@mjhenkes mjhenkes temporarily deployed to terra-framework-deploye-pr-156 April 26, 2018 00:57 Inactive
@@ -46,6 +46,6 @@
"lint:scss": "stylelint src/**/*.scss",
"test": "npm run test:jest && npm run test:wdio",
"test:jest": "jest ./tests/jest/* --config ../../jestconfig.json",
"test:wdio": "wdio ../../wdio.conf.js"
"test:wdio": "../../node_modules/.bin/wdio ../../node_modules/terra-dev-site/config/wdio/wdio.conf.js"
Copy link
Contributor

Choose a reason for hiding this comment

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

We should make this change in the generator

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed, but the downside is that it's different between core and framework because core uses it's own wdio config and framework uses the default.

Copy link
Contributor

Choose a reason for hiding this comment

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

😞 yeah...

@mjhenkes mjhenkes changed the title [DO NOT MERGE] Consume changes from terra-toolkit and terra-dev-sever Consume changes from terra-toolkit and terra-dev-sever Apr 27, 2018
@mjhenkes mjhenkes merged commit d3534d6 into master Apr 27, 2018
@mjhenkes mjhenkes deleted the consume-new-terra-toolkit-terra-dev-server branch April 27, 2018 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants