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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 13 commits into from Apr 27, 2018
Merged

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

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4adcc7c
Consume changes from terra-toolkit and terra-dev-sever
mjhenkes Apr 17, 2018
2e17aa3
run the right wdio command
mjhenkes Apr 17, 2018
0e08082
up the memory available, to webpack for prod
mjhenkes Apr 17, 2018
4bd77e5
update location to pull config from
mjhenkes Apr 18, 2018
9061f02
Merge branch 'master' into consume-new-terra-toolkit-terra-dev-server
mjhenkes Apr 18, 2018
77421cc
Hoist terra-framework. Hoist apparently doesn't work on out of sync v…
mjhenkes Apr 19, 2018
7b2994e
consume released terra-toolkit
mjhenkes Apr 20, 2018
7300a4b
Merge branch 'master' into consume-new-terra-toolkit-terra-dev-server
mjhenkes Apr 20, 2018
b7d6b72
Master merge
mjhenkes Apr 20, 2018
2adbd9e
Update package.json
mjhenkes Apr 24, 2018
74c980f
Merge branch 'master' into consume-new-terra-toolkit-terra-dev-server
mjhenkes Apr 25, 2018
23b417d
update packages to point to root wdio
mjhenkes Apr 26, 2018
e8f47d1
hoist
mjhenkes Apr 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Procfile
View file
Open in desktop
@@ -1 +1 @@
web: npm run start:express
web: npm run start-heroku
246 changes: 123 additions & 123 deletions generatedComponentConfig.js → dev-site-config/generatedComponentConfig.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions site.config.js → dev-site-config/site.config.js
View file
Open in desktop
@@ -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
27 changes: 9 additions & 18 deletions package.json
View file
Open in desktop
Expand Up @@ -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.

"clean:all": "lerna clean --yes && node scripts/clean-modules/index.js",
"clean:install": "npm run clean:all && npm install",
"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 webpack --config node_modules/terra-dev-site/config/webpack/webpack.config.js -p",
"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/config/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": "0.5.0",
"terra-toolkit": "^3.0.0",
"xfc": "^1.2.1"
}
}
4 changes: 2 additions & 2 deletions packages/terra-aggregator/package.json
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
"devDependencies": {
"terra-app-delegate": "^2.0.0",
"terra-base": "^3.0.0",
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand Down Expand Up @@ -56,6 +56,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-application-header-layout/package.json
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
"terra-base": "^3.0.0"
},
"devDependencies": {
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"dependencies": {
"classnames": "^2.2.5",
Expand All @@ -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...

}
}
4 changes: 2 additions & 2 deletions packages/terra-application-layout/package.json
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
"devDependencies": {
"terra-app-delegate": "^2.0.0",
"terra-base": "^3.0.0",
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand Down Expand Up @@ -63,6 +63,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-application-links/package.json
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
"homepage": "https://github.com/cerner/terra-framework#readme",
"devDependencies": {
"react-router-dom": "^4.2.2",
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand All @@ -49,6 +49,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-application-menu-layout/package.json
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
"terra-base": "^3.0.0"
},
"devDependencies": {
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"dependencies": {
"classnames": "^2.2.5",
Expand All @@ -45,6 +45,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-application-name/package.json
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
},
"homepage": "https://github.com/cerner/terra-framework#readme",
"devDependencies": {
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand All @@ -48,6 +48,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-application-utility/package.json
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
},
"homepage": "https://github.com/cerner/terra-framework#readme",
"devDependencies": {
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand Down Expand Up @@ -53,6 +53,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"
}
}
2 changes: 1 addition & 1 deletion packages/terra-disclosure-manager/package.json
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
"devDependencies": {
"terra-app-delegate": "^2.0.0",
"terra-base": "3.0.0",
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/terra-hookshot/package.json
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
},
"homepage": "https://github.com/cerner/terra-framework#readme",
"devDependencies": {
"terra-props-table": "^2.1.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand All @@ -50,6 +50,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-infinite-list/package.json
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
},
"homepage": "https://github.com/cerner/terra-framework#readme",
"devDependencies": {
"terra-props-table": "^2.1.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand All @@ -48,6 +48,6 @@
"props-table": "props-table ./src/InfiniteList.jsx --out-dir ./docs/props-table",
"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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-layout/package.json
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
},
"devDependencies": {
"react-router-dom": "^4.2.2",
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"dependencies": {
"classnames": "^2.2.5",
Expand All @@ -50,6 +50,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-modal-manager/package.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"redux": "^3.6.0",
"terra-app-delegate": "^2.0.0",
"terra-base": "^3.0.0",
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand Down Expand Up @@ -53,6 +53,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-navigation-layout/package.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"react": "^16.2.0",
"react-router-dom": "^4.2.2",
"terra-app-delegate": "^2.0.0",
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand Down Expand Up @@ -54,6 +54,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-navigation-side-menu/package.json
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
},
"homepage": "https://github.com/cerner/terra-framework#readme",
"devDependencies": {
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand All @@ -47,6 +47,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-popup/package.json
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
"homepage": "https://github.com/cerner/terra-framework#readme",
"devDependencies": {
"terra-app-delegate": "^2.0.0",
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand Down Expand Up @@ -54,6 +54,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-slide-panel-manager/package.json
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
},
"homepage": "https://github.com/cerner/terra-framework#readme",
"devDependencies": {
"terra-props-table": "^2.3.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand All @@ -47,6 +47,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"
}
}
7 changes: 3 additions & 4 deletions packages/terra-slide-panel/package.json
View file
Open in desktop
Expand Up @@ -24,14 +24,13 @@
"peerDependencies": {
"react": "^16.2.0",
"react-dom": "^16.2.0",
"terra-base": "^3.2.0",
"terra-props-table": "^2.0.0"
"terra-base": "^3.2.0"
},
"dependencies": {
"classnames": "^2.2.5",
"prop-types": "^15.5.8",
"terra-base": "^3.2.0",
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"scripts": {
"compile": "npm run compile:clean && npm run compile:build",
Expand All @@ -42,6 +41,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"
}
}
4 changes: 2 additions & 2 deletions packages/terra-theme-provider/package.json
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
},
"homepage": "https://github.com/cerner/terra-core#readme",
"devDependencies": {
"terra-props-table": "^2.0.0"
"terra-props-table": "^2.4.0"
},
"peerDependencies": {
"react": "^16.2.0",
Expand All @@ -44,6 +44,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"
}
}