Skip to content

Commit

Permalink
style(all): linting codebase with prettier
Browse files Browse the repository at this point in the history
Closes: INSTUI-2728

Ran prettier fix on code in order to format it better and prevent merge conflicts based on
pre-commit prettier linting later.
  • Loading branch information
ke1k0 committed Dec 10, 2020
1 parent 1bd36e2 commit 434e756
Show file tree
Hide file tree
Showing 955 changed files with 19,408 additions and 16,058 deletions.
21 changes: 13 additions & 8 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,16 @@
* SOFTWARE.
*/

module.exports = {
presets: [[ require('@instructure/ui-babel-preset'), {
coverage: Boolean(process.env.COVERAGE),
esModules: Boolean(process.env.ES_MODULES),
removeConsole: process.env.NODE_ENV === 'production',
transformImports: Boolean(process.env.TRANSFORM_IMPORTS)
}]]
}
module.exports = {
presets: [
[
require('@instructure/ui-babel-preset'),
{
coverage: Boolean(process.env.COVERAGE),
esModules: Boolean(process.env.ES_MODULES),
removeConsole: process.env.NODE_ENV === 'production',
transformImports: Boolean(process.env.TRANSFORM_IMPORTS)
}
]
]
}
17 changes: 13 additions & 4 deletions packages/__docs__/components.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ export { NumberInput } from '@instructure/ui-number-input'
export { DateInput } from '@instructure/ui-date-input'
export { Pill } from '@instructure/ui-pill'
export { TextInput } from '@instructure/ui-text-input'
export {
export {
FormField,
FormFieldLabel,
FormFieldMessage,
FormFieldMessages,
FormFieldLayout,
FormFieldGroup,
FormFieldGroup
} from '@instructure/ui-form-field'
export { Table } from '@instructure/ui-table'
export { TruncateText } from '@instructure/ui-truncate-text'
Expand All @@ -74,7 +74,12 @@ export { Tooltip } from '@instructure/ui-tooltip'
export { Breadcrumb } from '@instructure/ui-breadcrumb'
export { DrawerLayout } from '@instructure/ui-drawer-layout'
export { Grid } from '@instructure/ui-grid'
export { Checkbox, CheckboxGroup, CheckboxFacade, ToggleFacade } from '@instructure/ui-checkbox'
export {
Checkbox,
CheckboxGroup,
CheckboxFacade,
ToggleFacade
} from '@instructure/ui-checkbox'
export { Navigation, AppNav } from '@instructure/ui-navigation'
export { List, InlineList } from '@instructure/ui-list'
export { Menu } from '@instructure/ui-menu'
Expand Down Expand Up @@ -108,4 +113,8 @@ export { View, ContextView } from '@instructure/ui-view'
export { Tray } from '@instructure/ui-tray'
export { Spinner } from '@instructure/ui-spinner'
export * from '@instructure/ui-icons'
export { Guidelines, Figure, ToggleBlockquote } from '@instructure/ui-docs-client'
export {
Guidelines,
Figure,
ToggleBlockquote
} from '@instructure/ui-docs-client'
34 changes: 17 additions & 17 deletions packages/__docs__/globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,23 @@ const globals = {
DateTime,
iconExample,
lorem: {
sentence () {
return lorem({
count: 1,
units: 'sentences'
})
},
paragraph () {
return lorem({
count: 1,
units: 'paragraphs'
})
},
paragraphs (count) {
return lorem({
count: count || Math.floor(Math.random() * 10),
units: 'paragraphs'
})
sentence() {
return lorem({
count: 1,
units: 'sentences'
})
},
paragraph() {
return lorem({
count: 1,
units: 'paragraphs'
})
},
paragraphs(count) {
return lorem({
count: count || Math.floor(Math.random() * 10),
units: 'paragraphs'
})
}
},
mirrorHorizontalPlacement,
Expand Down
7 changes: 4 additions & 3 deletions packages/__docs__/placeholder-image.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
* SOFTWARE.
*/


// eslint-disable-next-line import/no-webpack-loader-syntax, import/no-unresolved
import IconSVG from '!!raw-loader!./placeholder.svg'

export default function placeholderImage (width = 512, height = 512) {
export default function placeholderImage(width = 512, height = 512) {
// We need to base64 encode this because otherwise FF will add extra escape chars
const dataUri = btoa(IconSVG.replace(/{{w}}/g, width).replace(/{{h}}/g, height).trim())
const dataUri = btoa(
IconSVG.replace(/{{w}}/g, width).replace(/{{h}}/g, height).trim()
)
return `data:image/svg+xml;base64,${dataUri}`
}
7 changes: 4 additions & 3 deletions packages/__docs__/placeholder-logo.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
* SOFTWARE.
*/


// eslint-disable-next-line import/no-webpack-loader-syntax, import/no-unresolved
import IconSVG from '!!raw-loader!./placeholder-logo.svg'

export default function placeholderLogo (width = 84, height = 84) {
export default function placeholderLogo(width = 84, height = 84) {
// We need to base64 encode this because otherwise FF will add extra escape chars
const dataUri = btoa(IconSVG.replace(/{{w}}/g, width).replace(/{{h}}/g, height).trim())
const dataUri = btoa(
IconSVG.replace(/{{w}}/g, width).replace(/{{h}}/g, height).trim()
)
return `data:image/svg+xml;base64,${dataUri}`
}
170 changes: 136 additions & 34 deletions packages/__docs__/resolve.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,60 @@ module.exports = {
alias: {
// set up aliases to get webpack to rebuild when we make changes to these packages
'@instructure/debounce$:': path.resolve(__dirname, '../debounce/src/'),
'@instructure/ui-a11y-content$': path.resolve(__dirname, '../ui-a11y-content/src/'),
'@instructure/ui-a11y-content$': path.resolve(
__dirname,
'../ui-a11y-content/src/'
),
'@instructure/ui-alerts$': path.resolve(__dirname, '../ui-alerts/src/'),
'@instructure/ui-avatar$': path.resolve(__dirname, '../ui-avatar/src/'),
'@instructure/ui-badge$': path.resolve(__dirname, '../ui-badge/src/'),
'@instructure/ui-billboard$': path.resolve(__dirname, '../ui-billboard/src/'),
'@instructure/ui-breadcrumb$': path.resolve(__dirname, '../ui-breadcrumb/src/'),
'@instructure/ui-billboard$': path.resolve(
__dirname,
'../ui-billboard/src/'
),
'@instructure/ui-breadcrumb$': path.resolve(
__dirname,
'../ui-breadcrumb/src/'
),
'@instructure/ui-buttons$': path.resolve(__dirname, '../ui-buttons/src/'),
'@instructure/ui-byline$': path.resolve(__dirname, '../ui-byline/src/'),
'@instructure/ui-calendar$': path.resolve(__dirname, '../ui-calendar/src/'),
'@instructure/ui-checkbox$': path.resolve(__dirname, '../ui-checkbox/src/'),
'@instructure/ui-code-editor$': path.resolve(__dirname, '../ui-code-editor/src/'),
'@instructure/ui-date-input$': path.resolve(__dirname, '../ui-date-input/src/'),
'@instructure/ui-code-editor$': path.resolve(
__dirname,
'../ui-code-editor/src/'
),
'@instructure/ui-date-input$': path.resolve(
__dirname,
'../ui-date-input/src/'
),
'@instructure/ui-dialog$': path.resolve(__dirname, '../ui-dialog/src/'),
'@instructure/ui-docs-client$': path.resolve(__dirname, '../ui-docs-client/src/'),
'@instructure/ui-drawer-layout$': path.resolve(__dirname, '../ui-drawer-layout/src/'),
'@instructure/ui-docs-client$': path.resolve(
__dirname,
'../ui-docs-client/src/'
),
'@instructure/ui-drawer-layout$': path.resolve(
__dirname,
'../ui-drawer-layout/src/'
),
'@instructure/ui-editable$': path.resolve(__dirname, '../ui-editable/src/'),
'@instructure/ui-expandable$': path.resolve(__dirname, '../ui-expandable/src/'),
'@instructure/ui-expandable$': path.resolve(
__dirname,
'../ui-expandable/src/'
),
'@instructure/ui-flex$': path.resolve(__dirname, '../ui-flex/src'),
'@instructure/ui-focusable$': path.resolve(__dirname, '../ui-focusable/src/'),
'@instructure/ui-a11y-utils$': path.resolve(__dirname, '../ui-a11y-utils/src/'),
'@instructure/ui-form-field$': path.resolve(__dirname, '../ui-form-field/src/'),
'@instructure/ui-focusable$': path.resolve(
__dirname,
'../ui-focusable/src/'
),
'@instructure/ui-a11y-utils$': path.resolve(
__dirname,
'../ui-a11y-utils/src/'
),
'@instructure/ui-form-field$': path.resolve(
__dirname,
'../ui-form-field/src/'
),
'@instructure/ui-grid$': path.resolve(__dirname, '../ui-grid/src/'),
'@instructure/ui-i18n$': path.resolve(__dirname, '../ui-i18n/src/'),
'@instructure/ui-img$': path.resolve(__dirname, '../ui-img/src/'),
Expand All @@ -58,48 +91,117 @@ module.exports = {
'@instructure/ui-metric$': path.resolve(__dirname, '../ui-metric/src/'),
'@instructure/ui-modal$': path.resolve(__dirname, '../ui-modal/src/'),
'@instructure/ui-motion$': path.resolve(__dirname, '../ui-motion/src/'),
'@instructure/ui-navigation$': path.resolve(__dirname, '../ui-navigation/src/'),
'@instructure/ui-number-input$': path.resolve(__dirname, '../ui-number-input/src/'),
'@instructure/ui-text-area$': path.resolve(__dirname, '../ui-text-area/src/'),
'@instructure/ui-text-input$': path.resolve(__dirname, '../ui-text-input/src/'),
'@instructure/ui-navigation$': path.resolve(
__dirname,
'../ui-navigation/src/'
),
'@instructure/ui-number-input$': path.resolve(
__dirname,
'../ui-number-input/src/'
),
'@instructure/ui-text-area$': path.resolve(
__dirname,
'../ui-text-area/src/'
),
'@instructure/ui-text-input$': path.resolve(
__dirname,
'../ui-text-input/src/'
),
'@instructure/ui-options$': path.resolve(__dirname, '../ui-options/src/'),
'@instructure/ui-overlays$': path.resolve(__dirname, '../ui-overlays/src/'),
'@instructure/ui-pagination$': path.resolve(__dirname, '../ui-pagination/src/'),
'@instructure/ui-pagination$': path.resolve(
__dirname,
'../ui-pagination/src/'
),
'@instructure/ui-pages$': path.resolve(__dirname, '../ui-pages/src/'),
'@instructure/ui-pill$': path.resolve(__dirname, '../ui-pill/src/'),
'@instructure/ui-popover$': path.resolve(__dirname, '../ui-popover/src/'),
'@instructure/ui-position$': path.resolve(__dirname, '../ui-position/src/'),
'@instructure/ui-portal$': path.resolve(__dirname, '../ui-portal/src/'),
'@instructure/ui-progress$': path.resolve(__dirname, '../ui-progress/src'),
'@instructure/ui-radio-input$': path.resolve(__dirname, '../ui-radio-input/src/'),
'@instructure/ui-range-input$': path.resolve(__dirname, '../ui-range-input/src/'),
'@instructure/ui-radio-input$': path.resolve(
__dirname,
'../ui-radio-input/src/'
),
'@instructure/ui-range-input$': path.resolve(
__dirname,
'../ui-range-input/src/'
),
'@instructure/ui-rating$': path.resolve(__dirname, '../ui-rating/src/'),
'@instructure/ui-responsive$': path.resolve(__dirname, '../ui-responsive/src/'),
'@instructure/ui-responsive$': path.resolve(
__dirname,
'../ui-responsive/src/'
),
'@instructure/ui-select$': path.resolve(__dirname, '../ui-select/src/'),
'@instructure/ui-selectable$': path.resolve(__dirname, '../ui-selectable/src/'),
'@instructure/ui-simple-select$': path.resolve(__dirname, '../ui-simple-select/src/'),
'@instructure/ui-selectable$': path.resolve(
__dirname,
'../ui-selectable/src/'
),
'@instructure/ui-simple-select$': path.resolve(
__dirname,
'../ui-simple-select/src/'
),
'@instructure/ui-spinner$': path.resolve(__dirname, '../ui-spinner/src/'),
'@instructure/ui-svg-images$': path.resolve(__dirname, '../ui-svg-images/src/'),
'@instructure/ui-svg-images$': path.resolve(
__dirname,
'../ui-svg-images/src/'
),
'@instructure/ui-table$': path.resolve(__dirname, '../ui-table/src/'),
'@instructure/ui-tabs$': path.resolve(__dirname, '../ui-tabs/src/'),
'@instructure/ui-tag$': path.resolve(__dirname, '../ui-tag/src/'),
'@instructure/ui-text$': path.resolve(__dirname, '../ui-text/src/'),
'@instructure/ui-time-select$': path.resolve(__dirname, '../ui-time-select/src/'),
'@instructure/ui-toggle-details$': path.resolve(__dirname, '../ui-toggle-details/src/'),
'@instructure/ui-time-select$': path.resolve(
__dirname,
'../ui-time-select/src/'
),
'@instructure/ui-toggle-details$': path.resolve(
__dirname,
'../ui-toggle-details/src/'
),
'@instructure/ui-tooltip$': path.resolve(__dirname, '../ui-tooltip/src/'),
'@instructure/ui-tray$': path.resolve(__dirname, '../ui-tray/src/'),
'@instructure/ui-tree-browser$': path.resolve(__dirname, '../ui-tree-browser/src/'),
'@instructure/ui-truncate-text$': path.resolve(__dirname, '../ui-truncate-text/src/'),
'@instructure/ui-tree-browser$': path.resolve(
__dirname,
'../ui-tree-browser/src/'
),
'@instructure/ui-truncate-text$': path.resolve(
__dirname,
'../ui-truncate-text/src/'
),
'@instructure/ui-utils$': path.resolve(__dirname, '../ui-utils/src/'),
'@instructure/ui-view$': path.resolve(__dirname, '../ui-view/src/'),
'@instructure/canvas-theme$': path.resolve(__dirname, '../canvas-theme/src/'),
'@instructure/canvas-high-contrast-theme$': path.resolve(__dirname, '../canvas-high-contrast-theme/src/'),
'@instructure/instructure-theme$': path.resolve(__dirname, '../instructure-theme/src/'),
'@instructure/ui-themeable$': path.resolve(__dirname, '../ui-themeable/src/'),
'@instructure/ui-react-utils$': path.resolve(__dirname, '../ui-react-utils/src/'),
'@instructure/ui-dom-utils$': path.resolve(__dirname, '../ui-dom-utils/src/'),
'@instructure/ui-color-utils$': path.resolve(__dirname, '../ui-color-utils/src/'),
'@instructure/ui-file-drop$': path.resolve(__dirname, '../ui-file-drop/src/'),
'@instructure/canvas-theme$': path.resolve(
__dirname,
'../canvas-theme/src/'
),
'@instructure/canvas-high-contrast-theme$': path.resolve(
__dirname,
'../canvas-high-contrast-theme/src/'
),
'@instructure/instructure-theme$': path.resolve(
__dirname,
'../instructure-theme/src/'
),
'@instructure/ui-themeable$': path.resolve(
__dirname,
'../ui-themeable/src/'
),
'@instructure/ui-react-utils$': path.resolve(
__dirname,
'../ui-react-utils/src/'
),
'@instructure/ui-dom-utils$': path.resolve(
__dirname,
'../ui-dom-utils/src/'
),
'@instructure/ui-color-utils$': path.resolve(
__dirname,
'../ui-color-utils/src/'
),
'@instructure/ui-file-drop$': path.resolve(
__dirname,
'../ui-file-drop/src/'
),
'@instructure/ui-heading$': path.resolve(__dirname, '../ui-heading/src/')
}
}
11 changes: 2 additions & 9 deletions packages/__docs__/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ module.exports = {
...baseConfig,
entry: {
// Note: these entries have to keep these names so that old codepens still work
common: [
'@instructure/ui-polyfill-loader!',
'react',
'react-dom'
],
common: ['@instructure/ui-polyfill-loader!', 'react', 'react-dom'],
globals: './globals.js'
},
output: {
Expand All @@ -54,9 +50,6 @@ module.exports = {
contentBase: outputPath,
host: '0.0.0.0'
},
plugins: [
...baseConfig.plugins,
...require('./plugins')
],
plugins: [...baseConfig.plugins, ...require('./plugins')],
resolve: DEBUG ? require('./resolve') : { mainFields: ['main'] }
}
Loading

0 comments on commit 434e756

Please sign in to comment.