Skip to content

Commit

Permalink
Merge branch 'forms' of github.com:ASU/asu-unity-stack into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ctestama committed Jul 30, 2020
2 parents 804d61f + 974687d commit 8188efa
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 590 deletions.
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,8 @@
"socket.io": "^2.3.0",
"storybook-addon-xd-designs": "^5.5.0",
"style-loader": "^0.20.3",
"uglifyjs-webpack-plugin": "^1.3.0",
"webpack": "^4.41.0",
"webpack-cli": "^3.3.9",
"webpack-dev-middleware": "^3.7.0",
"webpack-dev-server": "^3.8.2",
"webpack-merge": "^4.2.1",
"webpack-node-externals": "^1.7.2",
"enzyme": "^3.10.0",
"enzyme-adapter-preact-pure": "^2.0.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/component-forms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"@asu-design-system/design-tokens": "^1.0.0",
"emotion": "^10.0.27",
"formik": "^2.1.5",
"preact": "^10.4.4"
"preact": "^10.4.4",
"prop-types": "^15.7.2"
},
"jest": {
"preset": "jest-preset-preact",
Expand Down
5 changes: 3 additions & 2 deletions packages/component-forms/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const TerserPlugin = require("terser-webpack-plugin");
module.exports = [];

const shared = {
context: path.join(__dirname, "src"),
entry: {
forms: "./index.js"
},
Expand Down Expand Up @@ -35,7 +36,7 @@ const shared = {
}

module.exports.push({
context: path.join(__dirname, "src"),
context: shared.context,
mode: "development",
entry: shared.entry,
output: {
Expand All @@ -51,7 +52,7 @@ module.exports.push({


module.exports.push({
context: path.join(__dirname, "src"),
context: shared.context,
mode: "production",
entry: shared.entry,
output: {
Expand Down
3 changes: 2 additions & 1 deletion packages/components-library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"dependencies": {
"@asu-design-system/design-tokens": "^1.0.0",
"emotion": "^10.0.27",
"preact": "^10.4.4"
"preact": "^10.4.4",
"prop-types": "^15.7.2"
},
"jest": {
"preset": "jest-preset-preact",
Expand Down
Loading

0 comments on commit 8188efa

Please sign in to comment.