Skip to content

Commit

Permalink
1.3.0
Browse files Browse the repository at this point in the history
Merge pull request #168 from CMSgov/staging
  • Loading branch information
sawyerh authored Oct 16, 2017
2 parents f787dff + e5ac220 commit 2fa5761
Show file tree
Hide file tree
Showing 57 changed files with 814 additions and 1,276 deletions.
7 changes: 3 additions & 4 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
"publish": {
"allowBranch": "master",
"ignore": [
"packages/themes/*",
"packages/eslint-config-design-system",
"packages/stylelint-config-design-system"
"eslint-config-design-system",
"stylelint-config-design-system"
]
}
},
"packages": [
"packages/*",
"packages/themes/*"
],
"version": "1.2.0"
"version": "1.3.0"
}
22 changes: 15 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,13 @@
"bytes": "^3.0.0",
"cli-table": "^0.3.1",
"colors": "^1.1.2",
"core-js": "^2.5.1",
"cssnano": "^3.10.0",
"cssstats": "^3.1.0",
"del": "^3.0.0",
"ejs": "^2.5.7",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.1",
"eslint": "^4.8.0",
"eslint-config-nava": "^2.1.0",
"front-matter": "^2.2.0",
Expand All @@ -55,9 +58,9 @@
"gulp-sourcemaps": "^2.6.1",
"gulp-stylelint": "^5.0.0",
"gulp-util": "^3.0.8",
"jest": "^21.1.0",
"jest": "^21.2.1",
"kss": "^3.0.0-beta.18",
"lerna": "^2.2.0",
"lerna": "^2.4.0",
"lodash": "^4.17.4",
"marked": "^0.3.6",
"mkdir-recursive": "^0.3.0",
Expand All @@ -67,17 +70,17 @@
"postcss-import": "^11.0.0",
"postcss-url": "^7.1.2",
"prismjs": "^1.8.1",
"react": "^15.6.2",
"react-docgen": "^2.18.0",
"react-dom": "^15.6.2",
"react-hot-loader": "3.0.0-beta.7",
"react": "^16.0.0",
"react-docgen": "^2.19.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0",
"recast": "^0.12.6",
"run-sequence": "^2.2.0",
"stylelint": "^8.1.1",
"through2": "^2.0.3",
"tota11y": "^0.1.6",
"vinyl-source-stream": "^1.1.0",
"webpack": "^3.6.0",
"webpack": "^3.7.1",
"webpack-dev-middleware": "^1.12.0",
"webpack-hot-middleware": "^2.19.1",
"yargs": "^9.0.1",
Expand All @@ -87,10 +90,15 @@
"node": ">=4.5.0"
},
"jest": {
"setupFiles": [
"<rootDir>/tools/jest/polyfills.js",
"<rootDir>/tools/jest/setupEnzyme.js"
],
"testPathIgnorePatterns": [
"<rootDir>/examples/",
"<rootDir>/node_modules/",
"<rootDir>/packages/*/node_modules/",
"<rootDir>/packages/themes/*/node_modules/",
"<rootDir>/packages/generator-cmsgov/generators/app/templates/"
]
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/dist/components/Alert/Alert.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/core/dist/components/Button/Button.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/dist/components/ChoiceList/Choice.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/dist/components/ChoiceList/Select.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/dist/components/TextField/TextField.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2fa5761

Please sign in to comment.