Skip to content

Commit

Permalink
Merge pull request #272 from dnbexperience/develop
Browse files Browse the repository at this point in the history
release of v4.15.0
  • Loading branch information
tujoworker authored Sep 12, 2019
2 parents 831d69a + e83ba2b commit af79671
Show file tree
Hide file tree
Showing 66 changed files with 3,592 additions and 5,593 deletions.
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@
"release": {
"analyzeCommits": "simple-commit-message"
},
"engines": {
"node": ">=10.6.0",
"yarn": ">=1.7.0"
},
"volta": {
"node": "10.6.0",
"yarn": "1.17.3"
}
}
}
41 changes: 0 additions & 41 deletions packages/dnb-design-system-portal/package-scripts.js

This file was deleted.

58 changes: 29 additions & 29 deletions packages/dnb-design-system-portal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"version": "1.0.0",
"main": "index.js",
"scripts": {
"build": "yarn make-ui-lib-pages",
"build": "yarn build-portal",
"build-ci": "yarn build-portal:version && yarn make-ui-lib-pages && yarn build-portal --prefix-paths && yarn commit-new-pages",
"build-portal": "yarn clean && gatsby build",
"build-portal:version": "babel-node ./scripts/version.js --new-version",
Expand Down Expand Up @@ -45,30 +45,30 @@
},
"dependencies": {
"dnb-ui-lib": "*",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-router-dom": "^5.0.1"
},
"devDependencies": {
"@babel/core": "^7.5.5",
"@babel/node": "^7.5.5",
"@babel/core": "^7.6.0",
"@babel/node": "^7.6.1",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-proposal-export-default-from": "^7.5.2",
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/preset-env": "^7.5.5",
"@babel/preset-env": "^7.6.0",
"@babel/preset-react": "^7.0.0",
"@mdx-js/mdx": "^1.3.1",
"@mdx-js/react": "^1.3.1",
"@mdx-js/mdx": "^1.4.4",
"@mdx-js/react": "^1.4.4",
"babel-jest": "^24.9.0",
"babel-plugin-emotion": "^10.0.16",
"babel-plugin-emotion": "^10.0.17",
"camelcase": "^5.3.1",
"ci-info": "^2.0.0",
"classnames": "^2.2.6",
"clean-html": "^1.5.0",
"cross-env": "^5.2.0",
"cross-env": "^5.2.1",
"del": "^5.1.0",
"emotion": "^10.0.14",
"emotion": "^10.0.17",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",
"enzyme-to-json": "^3.4.0",
Expand All @@ -79,29 +79,29 @@
"eslint-plugin-react-hooks": "^2.0.1",
"front-matter": "^3.0.2",
"fs-extra": "^8.1.0",
"gatsby": "^2.13.80",
"gatsby-link": "^2.2.8",
"gatsby-plugin-catch-links": "^2.1.5",
"gatsby-plugin-emotion": "^4.1.4",
"gatsby-plugin-manifest": "^2.2.9",
"gatsby-plugin-mdx": "^1.0.30",
"gatsby": "^2.15.9",
"gatsby-link": "^2.2.12",
"gatsby-plugin-catch-links": "^2.1.8",
"gatsby-plugin-emotion": "^4.1.5",
"gatsby-plugin-manifest": "^2.2.14",
"gatsby-plugin-mdx": "^1.0.39",
"gatsby-plugin-meta-redirect": "^1.1.1",
"gatsby-plugin-offline": "^2.2.10",
"gatsby-plugin-page-creator": "^2.1.11",
"gatsby-plugin-postcss": "^2.1.5",
"gatsby-plugin-react-helmet": "^3.1.5",
"gatsby-plugin-sass": "^2.1.12",
"gatsby-plugin-sharp": "^2.2.17",
"gatsby-remark-images": "^3.1.17",
"gatsby-source-filesystem": "^2.1.16",
"gatsby-plugin-offline": "^3.0.3",
"gatsby-plugin-page-creator": "^2.1.16",
"gatsby-plugin-postcss": "^2.1.6",
"gatsby-plugin-react-helmet": "^3.1.6",
"gatsby-plugin-sass": "^2.1.13",
"gatsby-plugin-sharp": "^2.2.20",
"gatsby-remark-images": "^3.1.20",
"gatsby-source-filesystem": "^2.1.21",
"gh-pages": "^2.1.1",
"github-slugger": "^1.2.1",
"jest": "^24.9.0",
"jest-emotion": "^10.0.14",
"jest-emotion": "^10.0.17",
"jest-raw-loader": "^1.0.1",
"keycode": "^2.2.0",
"lint-staged": "^9.2.3",
"nodemon": "^1.19.1",
"lint-staged": "^9.2.5",
"nodemon": "^1.19.2",
"ora": "^3.4.0",
"postcss-preset-env": "^6.7.0",
"prettier": "^1.18.2",
Expand All @@ -114,7 +114,7 @@
"react-fake-props": "^0.3.2",
"react-helmet": "^5.2.1",
"react-live": "^2.2.0",
"react-markdown": "^4.1.0",
"react-markdown": "^4.2.2",
"stylelint": "^10.1.0",
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.8.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/dnb-design-system-portal/scripts/commitPages.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if (require.main === module) {
commitToBranch({
requiredBranch: 'develop',
what: 'pages',
skipCI: files => files.length === 1, // in case we only update the "version.lock"
filePathsWhitelist: ['version.json', '/src/docs/', '/src/uilib/'],
skipCI: files => files.every(f => ['version.json'].includes(f)), // in case we only update the "version.lock"
isFeature: false
})
}
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,6 @@ class Example extends PureComponent {
</ComponentBox>
<ComponentBox>
{/* @jsx */ `
<Button
variant="tertiary"
text="Tertiary button with icon on left"
icon_position="left"
icon="chevron_left"
disabled
/>
`}
</ComponentBox>
<ComponentBox>
{/* @jsx */ `
<Button
text="Primary button with href"
href="?no-cache=1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ There are a couple helper classes to style tables:
- `.dnb-table--no-wrap` Use this on a `th`
- `.dnb-table--active` Use this on a `th`
- `.dnb-table--sortable` Use this on a `th`
- `.dnb-tablednb-table--reversed` Use this on a `th`
- `.dnb-table--reversed` Use this on a `th`
- `.dnb-table--tabular` Use this on the `table` root

<ComponentBox reactLive hideCode data-dnb-test="table-classes" caption="Example usage of class helpers">
Expand Down
32 changes: 17 additions & 15 deletions packages/dnb-design-system-portal/src/shared/tags/Intro.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,26 @@ import {
} from 'dnb-ui-lib/src/elements'
import { Button } from 'dnb-ui-lib/src/components'

const onKeyDownHandler = e => {
try {
if (e.key === 'ArrowRight' && ref && ref.current) {
const elem = ref.current.querySelector('a[href*="/intro"]')
const href = elem.getAttribute('href')
navigate(href)
}
if (e.key === 'ArrowLeft') {
window.history.back()
}
} catch (e) {
console.log(e)
}
}

const ref = React.createRef()
const Intro = ({ children }) => {
useEffect(() => {
const onKeyDownHandler = e => {
if (/textarea|input/i.test(document.activeElement.tagName)) {
return
}
try {
if (e.key === 'ArrowRight' && ref && ref.current) {
const elem = ref.current.querySelector('a[href*="/intro"]')
const href = elem.getAttribute('href')
navigate(href)
}
if (e.key === 'ArrowLeft') {
window.history.back()
}
} catch (e) {
console.log(e)
}
}
try {
document.addEventListener('keydown', onKeyDownHandler)
} catch (e) {
Expand Down
1 change: 1 addition & 0 deletions packages/dnb-ui-lib/assets/icons/upload.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/dnb-ui-lib/assets/icons/upload_medium.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 0 additions & 45 deletions packages/dnb-ui-lib/package-scripts.js

This file was deleted.

Loading

0 comments on commit af79671

Please sign in to comment.