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

Commit

Permalink
Upgrade terra-core to terra-dev-site v7 (#3271)
Browse files Browse the repository at this point in the history
* setup

* update webpack

* updates

* un-break webpack config

* minor test updates

* clean up

* change log

* minor rendering difference for search field screen comparisons.

* changelog

* remove dev-site config

* used dev-site-v7

* fix build

* update screenshot

* more updates

* slightly different image rendering

* use released package
  • Loading branch information
mjhenkes authored Sep 1, 2021
1 parent 163be6b commit 2d0c452
Show file tree
Hide file tree
Showing 23 changed files with 29 additions and 101 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- npm run lint
- npm run jest
# These can't be built in parallel because the cache is a single object and you can't add to it in parallel
- npm run compile:prod -- --env.disableAggregateThemes --output-path $TRAVIS_BUILD_DIR/travis-build/default
- npm run compile:prod -- --output-path $TRAVIS_BUILD_DIR/travis-build/default
- npm run compile:lowlight -- --output-path $TRAVIS_BUILD_DIR/travis-build/lowlight
- npm run compile:fusion -- --output-path $TRAVIS_BUILD_DIR/travis-build/fusion
# Prime the docker cache
Expand Down
33 changes: 0 additions & 33 deletions dev-site-config/navigation.config.js

This file was deleted.

17 changes: 0 additions & 17 deletions dev-site-config/site.config.js

This file was deleted.

24 changes: 13 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"compile": "npm run compile:clean && npm run compile:build",
"compile:build": "lerna ls -a | sed 's/@cerner\\///g' | cut -d ' ' -f1 | xargs -I {} babel packages/{}/src --out-dir packages/{}/lib --copy-files",
"compile:clean": "rm -rf packages/**/lib",
"compile:prod": "rm -rf ./build; webpack -p",
"compile:lowlight": "rm -rf ./build; THEME=clinical-lowlight-theme webpack -p",
"compile:fusion": "rm -rf ./build; THEME=orion-fusion-theme webpack -p",
"compile:prod": "rm -rf ./build; webpack --mode=production",
"compile:lowlight": "rm -rf ./build; THEME=clinical-lowlight-theme webpack --mode=production",
"compile:fusion": "rm -rf ./build; THEME=orion-fusion-theme webpack --mode=production",
"danger": "danger ci",
"deploy": "webpack --config webpack.config -p && gh-pages -d build",
"deploy": "webpack --mode=production && gh-pages -d build",
"docs": "node scripts/root-readme-updater/index.js",
"docs:peerDependencies": "node scripts/peer-dependency-generator/index.js",
"heroku-postbuild": "npm install --only=dev && npm run compile:prod",
Expand All @@ -59,15 +59,15 @@
"prepare-for-release": "terra prepare-for-release",
"pretest": "npm run lint",
"postinstall": "link-parent-bin && npm run compile && npm run bootstrap:hoist",
"start": "webpack-dev-server",
"start:prod": "webpack-dev-server --env.disableHotReloading -p",
"start": "webpack serve",
"start:prod": "webpack serve --env disableHotReloading --mode=production",
"start-static": "npm run compile:prod && terra express-server --site ./build",
"start-heroku": "terra express-server --port $PORT --site './build' ",
"test": "npm run lint && npm run jest && npm run wdio",
"wdio-default": "terra wdio",
"wdio-lowlight": "terra wdio --themes clinical-lowlight-theme",
"wdio-fusion": "terra wdio --themes orion-fusion-theme",
"wdio": "npm run wdio-default && npm run wdio-lowlight && npm run wdio-fusion"
"wdio": "terra wdio --themes terra-default-theme clinical-lowlight-theme orion-fusion-theme"
},
"devDependencies": {
"@babel/cli": "^7.5.0",
Expand All @@ -82,6 +82,7 @@
"@cerner/stylelint-config-terra": "^4.0.0",
"@cerner/terra-aggregate-translations": "^2.0.1",
"@cerner/terra-cli": "^1.6.0",
"@cerner/terra-dev-site": "^7.0.0",
"@cerner/terra-functional-testing": "^2.1.0",
"@cerner/terra-open-source-scripts": "^1.0.1",
"@cerner/webpack-config-terra": "^1.3.0",
Expand All @@ -101,15 +102,16 @@
"postcss": "^8.2.1",
"react": "^16.8.5",
"react-dom": "^16.8.5",
"react-intl": "^2.9.0",
"react-test-renderer": "^16.5.2",
"regenerator-runtime": "^0.13.2",
"stylelint": "^13.0.0",
"terra-dev-site": "^6.37.0",
"terra-application": "^1.48.0",
"terra-disclosure-manager": "^4.9.0",
"terra-enzyme-intl": "^3.0.0",
"webpack": "^4.30.0",
"webpack-cli": "^3.3.2",
"webpack": "^5.28.0",
"webpack-cli": "^4.6.0",
"webpack-dev-server": "^3.3.1",
"webpack-merge": "^4.1.2"
"webpack-merge": "^5.1.4"
}
}
3 changes: 3 additions & 0 deletions packages/terra-docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Changed
* Update mdx notice test for terra-dev-site v7

## 1.5.0 - (July 6, 2021)

* Changed
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/terra-search-field/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Changed
* Updated wdio screenshots for minor rendering issue.

## 3.70.0 - (August 25, 2021)

* Changed
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 9 additions & 39 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,47 +1,17 @@
const path = require('path');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const {
TerraDevSite,
TerraDevSiteEntrypoints,
DirectorySwitcherPlugin,
LocalPackageAliasPlugin,
} = require('terra-dev-site');
} = require('@cerner/terra-dev-site');

const WebpackConfigTerra = require('@cerner/webpack-config-terra');

const coreConfig = (env = {}, argv = { p: false }) => {
const production = argv.p;
const processPath = process.cwd();
const rootPath = processPath.includes('packages') ? processPath.split('packages')[0] : processPath;

const i18nAlias = path.resolve(path.join(rootPath, 'packages', 'terra-i18n'));
return {
entry: TerraDevSiteEntrypoints,
plugins: [
new TerraDevSite({ env }),
],
resolve: {
plugins: [
new DirectorySwitcherPlugin({
shouldSwitch: !production,
rootDirectories: [
processPath,
path.resolve(processPath, 'packages', '*'),
],
}),
new LocalPackageAliasPlugin({
rootDirectories: [
processPath,
path.resolve(processPath, 'packages', '*'),
],
}),
],
alias: {
'terra-i18n': i18nAlias,
},
},
};
};
const coreConfig = (env = {}) => ({
plugins: [
new TerraDevSite({
defaultLocale: env.defaultLocale,
}),
],
});

const mergedConfig = (env, argv) => (
merge(WebpackConfigTerra(env, argv), coreConfig())
Expand Down

0 comments on commit 2d0c452

Please sign in to comment.