Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

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

Merged
merged 13 commits into from Apr 27, 2018
Merged
2 changes: 1 addition & 1 deletion Procfile
@@ -1 +1 @@
web: npm run start:express
web: npm run start-heroku

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions site.config.js → dev-site-config/site.config.js
@@ -1,20 +1,14 @@
import homeReadMe from './README.md';
import homeReadMe from '../README.md';
import componentConfig from './generatedComponentConfig';

const siteConfig = {
/* The component configuration path. */
componentConfig,

/* The logo to display as the placeholder. */
placeholderSrc: 'https://github.com/cerner/terra-core/raw/master/terra.png',

/* The markdown content to display on the home page. */
readMeContent: homeReadMe,

appConfig: {
/* The logo for the site header. */
logoSrc: 'https://github.com/cerner/terra-core/raw/master/terra.png',

/* The title for the site header. */
title: 'Terra Framework',

Expand Down
25 changes: 8 additions & 17 deletions package.json
Expand Up @@ -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).

"danger": "danger",
"deploy": "npm run compile:prod && gh-pages -d build",
"dependency-markdown": "node scripts/dependency-markdown-generator/DependencyMarkdownGenerator.js",
"generate-config": "generate-config",
"generate-config": "generate-config -o 'dev-site-config'",
"heroku-prebuild": "npm install rimraf && npm install -g lerna@2.1.2 && lerna init",
"heroku-postbuild": "npm install --only=dev && npm run compile:prod",
"jest": "jest",
Expand All @@ -64,11 +64,11 @@
"postinstall:project": "link-parent-bin && npm run compile && npm run bootstrap",
"publish": "npm whoami && check-installed-dependencies && npm run compile && npm test && lerna publish",
"postpublish": "npm run dependency-markdown && git add --all && git commit -m 'Updated DEPENDENCIES.md files'",
"start": "webpack-dev-server --progress",
"start": "tt:serve",
"start:build": "npm run generate-config && npm run start",
"start:express": "node scripts/express/app.js",
"test": "jest && wdio",
"wdio": "wdio"
"start-heroku": "tt:serve-static --site build ",
"test": "jest && npm run wdio",
"wdio": "wdio node_modules/terra-dev-site/src/wdio/wdio.conf.js"
},
"devDependencies": {
"babel-cli": "^6.24.1",
Expand All @@ -88,11 +88,9 @@
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-react": "^6.9.0",
"express": "^4.16.3",
"gh-pages": "^0.12.0",
"glob": "^7.1.1",
"identity-obj-proxy": "^3.0.0",
"ip": "^1.1.5",
"jest": "^21.0.2",
"lerna": "^2.8.0",
"link-parent-bin": "^0.1.3",
Expand All @@ -110,15 +108,8 @@
"stylelint-order": "^0.7.0",
"stylelint-scss": "^2.0.0",
"stylelint-suitcss": "^1.0.0",
"terra-dev-site": "0.3.0",
"terra-i18n": "^2.1.0",
"terra-i18n-plugin": "^2.0.0",
"terra-toolkit": "^2.9.0",
"wdio-mocha-framework": "^0.5.11",
"wdio-visual-regression-service": "^0.8.0",
"webdriverio": "4.9.9",
"webpack": "^3.6.0",
"webpack-dev-server": "2.7.1",
"terra-dev-site": "git://github.com/cerner/terra-dev-site.git#webpack4",
"terra-toolkit": "git://github.com/cerner/terra-toolkit.git#webpack4",
"xfc": "^1.2.1"
}
}
11 changes: 0 additions & 11 deletions scripts/express/README.md

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/express/app.js

This file was deleted.

451 changes: 0 additions & 451 deletions themeable-variables.json

This file was deleted.

49 changes: 0 additions & 49 deletions wdio.conf.js

This file was deleted.

35 changes: 0 additions & 35 deletions webpack.config.js

This file was deleted.

18 changes: 0 additions & 18 deletions webpack.prod.config.js

This file was deleted.