Skip to content

Commit

Permalink
Merge branch 'master' of github.com:carbon-design-system/carbon into …
Browse files Browse the repository at this point in the history
…chore/update-git-tools-january-2020
  • Loading branch information
joshblack committed Jan 20, 2020
2 parents 3e228ae + f7acfd8 commit 03ab15c
Show file tree
Hide file tree
Showing 54 changed files with 206 additions and 225 deletions.
Binary file added .yarn/offline-mirror/camel-case-4.1.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/capital-case-1.0.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/change-case-3.0.2.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/change-case-3.1.0.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/change-case-4.1.1.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/constant-case-2.0.0.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/constant-case-3.0.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/dot-case-2.1.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/dot-case-3.0.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/header-case-1.0.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/header-case-2.0.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/is-lower-case-1.1.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/is-upper-case-1.1.2.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/lower-case-2.0.1.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/lower-case-first-1.0.2.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/no-case-3.0.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/node-sass-4.10.0.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/node-sass-4.13.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/param-case-3.0.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/pascal-case-2.0.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/pascal-case-3.1.1.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/path-case-2.1.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/path-case-3.0.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/sentence-case-2.1.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/sentence-case-3.0.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/snake-case-2.1.0.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/snake-case-3.0.3.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/swap-case-1.1.2.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/title-case-2.1.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/upper-case-2.0.1.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/upper-case-first-1.1.2.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/upper-case-first-2.0.1.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"enzyme-to-json": "^3.3.5",
"eslint": "^6.0.0",
"eslint-config-carbon": "10.4.0",
"fs-extra": "^7.0.1",
"fs-extra": "^8.1.0",
"glob": "^7.1.4",
"husky": "^4.0.10",
"jest": "^24.8.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/bundler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@
"autoprefixer": "^9.4.3",
"babel-plugin-macros": "^2.4.2",
"chalk": "^2.4.1",
"change-case": "^3.0.2",
"change-case": "^4.1.1",
"cli-table": "^0.3.1",
"commander": "^2.19.0",
"cssnano": "^4.1.7",
"execa": "^2.0.3",
"filesize": "^3.6.1",
"fs-extra": "^7.0.0",
"fs-extra": "^8.1.0",
"glob": "^7.1.3",
"gzip-size": "^5.0.0",
"inquirer": "^6.5.0",
"klaw-sync": "^6.0.0",
"markdown-toc": "^1.2.0",
"node-sass": "^4.9.4",
"node-sass": "^4.13.1",
"postcss": "^7.0.7",
"postcss-discard-comments": "^4.0.1",
"replace-in-file": "^3.4.4",
Expand Down
6 changes: 3 additions & 3 deletions packages/colors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
"@carbon/cli-reporter": "10.3.0",
"@carbon/scss-generator": "^10.5.0",
"@carbon/test-utils": "^10.6.0",
"change-case": "^3.0.2",
"change-case": "^4.1.1",
"core-js": "^3.0.1",
"fs-extra": "^7.0.0",
"node-sass": "^4.11.0",
"fs-extra": "^8.1.0",
"node-sass": "^4.13.1",
"rimraf": "^3.0.0"
},
"eyeglass": {
Expand Down
1 change: 1 addition & 0 deletions packages/components/Staticfile
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
root: demo
force_https: true
15 changes: 6 additions & 9 deletions packages/components/docs/sass.md
Original file line number Diff line number Diff line change
Expand Up @@ -6381,7 +6381,6 @@ $text-02: if(
- [carbon--theme [mixin]](#carbon--theme-mixin)
- [content-switcher [mixin]](#content-switcher-mixin)
- [data-table-core [mixin]](#data-table-core-mixin)
- [date-picker [mixin]](#date-picker-mixin)
- [dropdown [mixin]](#dropdown-mixin)
- [file-uploader [mixin]](#file-uploader-mixin)
- [form [mixin]](#form-mixin)
Expand Down Expand Up @@ -16164,9 +16163,9 @@ Date picker styles
}
}

.#{$prefix}--date-picker__days .nextMonthDay,
.#{$prefix}--date-picker__days .prevMonthDay {
color: $text-02;
.#{$prefix}--date-picker__day.nextMonthDay,
.#{$prefix}--date-picker__day.prevMonthDay {
color: $text-05;
}

.#{$prefix}--date-picker__day.today,
Expand Down Expand Up @@ -16200,11 +16199,10 @@ Date picker styles
}
}

.#{$prefix}--date-picker__day.disabled,
.flatpickr-day.disabled {
.#{$prefix}--date-picker__day.flatpickr-day.flatpickr-disabled {
cursor: not-allowed;
opacity: 0.5;
color: $ui-05;
color: $disabled-02;

&:hover {
background: transparent;
Expand Down Expand Up @@ -16358,9 +16356,8 @@ Date picker styles
- [carbon--spacing-03 [variable]](#carbon--spacing-03-variable)
- [interactive-01 [variable]](#interactive-01-variable)
- [hover-ui [variable]](#hover-ui-variable)
- [text-02 [variable]](#text-02-variable)
- [ui-05 [variable]](#ui-05-variable)
- [text-04 [variable]](#text-04-variable)
- [ui-05 [variable]](#ui-05-variable)

## dropdown

Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
"minimatch": "^3.0.4",
"mkdirp": "^0.5.0",
"mock-raf": "^1.0.0",
"node-sass": "^4.11.0",
"node-sass": "^4.13.1",
"nodemon": "^1.18.7",
"path-to-regexp": "^2.2.0",
"portscanner": "^2.2.0",
Expand Down
11 changes: 5 additions & 6 deletions packages/components/src/components/date-picker/_date-picker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@
}
}

.#{$prefix}--date-picker__days .nextMonthDay,
.#{$prefix}--date-picker__days .prevMonthDay {
color: $text-02;
.#{$prefix}--date-picker__day.nextMonthDay,
.#{$prefix}--date-picker__day.prevMonthDay {
color: $text-05;
}

.#{$prefix}--date-picker__day.today,
Expand Down Expand Up @@ -352,11 +352,10 @@
}
}

.#{$prefix}--date-picker__day.disabled,
.flatpickr-day.disabled {
.#{$prefix}--date-picker__day.flatpickr-day.flatpickr-disabled {
cursor: not-allowed;
opacity: 0.5;
color: $ui-05;
color: $disabled-02;

&:hover {
background: transparent;
Expand Down
2 changes: 1 addition & 1 deletion packages/elements/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"devDependencies": {
"@carbon/bundler": "^10.5.0",
"fs-extra": "^7.0.1",
"fs-extra": "^8.1.0",
"klaw-sync": "^6.0.0",
"replace-in-file": "^3.4.2",
"rimraf": "^3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/icon-build-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"@carbon/cli-reporter": "10.3.0",
"@carbon/icon-helpers": "^10.5.0",
"browserslist-config-carbon": "10.4.0",
"change-case": "^3.0.2",
"change-case": "^4.1.1",
"core-js": "^3.1.3",
"fs-extra": "^7.0.0",
"fs-extra": "^8.1.0",
"joi": "^14.3.1",
"js-yaml": "^3.12.1",
"klaw-sync": "^6.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/icon-build-helpers/src/builders/react/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

'use strict';

const { camel } = require('change-case');
const { camelCase } = require('change-case');
const { reporter } = require('@carbon/cli-reporter');
const fs = require('fs-extra');
const path = require('path');
Expand Down Expand Up @@ -269,7 +269,7 @@ function shouldTransformAttribute(attribute) {
function formatAttributes(attrs) {
return Object.keys(attrs).reduce((acc, key, index) => {
const attribute = shouldTransformAttribute(key)
? `${camel(key)}="${attrs[key]}"`
? `${camelCase(key)}="${attrs[key]}"`
: `${key}="${attrs[key]}"`;

if (index === 0) {
Expand Down
18 changes: 9 additions & 9 deletions packages/icon-build-helpers/src/builders/vanilla/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'use strict';

const { reporter } = require('@carbon/cli-reporter');
const { pascal } = require('change-case');
const { pascalCase } = require('change-case');
const fs = require('fs-extra');
const path = require('path');
const prettier = require('prettier');
Expand Down Expand Up @@ -211,7 +211,7 @@ function getModuleName(name, size, prefixParts, descriptor) {
const height = parseInt(descriptor.attrs.height, 10);
let prefix = prefixParts
.filter(size => isNaN(size))
.map(pascal)
.map(pascalCase)
.join('');
const isGlyph = width < 16 || height < 16;

Expand All @@ -221,25 +221,25 @@ function getModuleName(name, size, prefixParts, descriptor) {
}
if (!size) {
if (isGlyph) {
return prefix + pascal(name) + 'Glyph';
return prefix + pascalCase(name) + 'Glyph';
}
return prefix + pascal(name);
return prefix + pascalCase(name);
}
return prefix + pascal(name) + size;
return prefix + pascalCase(name) + size;
}

if (!size) {
if (isGlyph) {
return pascal(name) + 'Glyph';
return pascalCase(name) + 'Glyph';
}
return pascal(name);
return pascalCase(name);
}

if (isNaN(name[0])) {
return pascal(name) + size;
return pascalCase(name) + size;
}

return '_' + pascal(name) + size;
return '_' + pascalCase(name) + size;
}

function createIconSource(file, descriptor) {
Expand Down
4 changes: 2 additions & 2 deletions packages/icons-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"@angular/core": "6.1.10",
"@carbon/cli-reporter": "10.3.0",
"@carbon/icons": "^10.8.0",
"change-case": "3.0.2",
"fs-extra": "7.0.1",
"change-case": "4.1.1",
"fs-extra": "8.1.0",
"rollup": "^0.66.6",
"typescript": "2.9.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/icons-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"devDependencies": {
"@carbon/cli-reporter": "10.3.0",
"@carbon/icons": "^10.8.0",
"fs-extra": "^7.0.1",
"fs-extra": "^8.1.0",
"prettier": "^1.19.1",
"rimraf": "^3.0.0",
"rollup": "^1.15.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"browserslist-config-carbon": "10.4.0",
"carbon-components": "^10.9.0",
"css-loader": "^3.2.0",
"node-sass": "^4.12.0",
"node-sass": "^4.13.1",
"postcss-loader": "^3.0.0",
"react": "^16.9.0",
"react-dom": "^16.9.0",
Expand Down
1 change: 1 addition & 0 deletions packages/react/Staticfile
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
root: storybook-static
force_https: true
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"jest-circus": "^24.0.0",
"lcov2badge": "^0.1.0",
"mini-css-extract-plugin": "^0.4.4",
"node-sass": "4.10.0",
"node-sass": "^4.13.1",
"object-assign": "^4.1.1",
"postcss-custom-properties": "^9.0.2",
"postcss-loader": "^3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"access": "public"
},
"peerDependencies": {
"node-sass": "^4.11.0",
"node-sass": "^4.13.1",
"react-dom": "^16.9.0"
},
"dependencies": {
Expand All @@ -27,7 +27,7 @@
"tabbable": "^4.0.0"
},
"devDependencies": {
"node-sass": "^4.11.0",
"node-sass": "^4.13.1",
"react-dom": "^16.9.0"
}
}
6 changes: 3 additions & 3 deletions packages/themes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
"@carbon/cli-reporter": "10.3.0",
"@carbon/scss-generator": "^10.5.0",
"@carbon/test-utils": "^10.6.0",
"change-case": "^3.1.0",
"change-case": "^4.1.1",
"core-js": "^3.0.1",
"fs-extra": "^7.0.1",
"fs-extra": "^8.1.0",
"js-yaml": "^3.13.0",
"node-sass": "^4.11.0",
"node-sass": "^4.13.1",
"rimraf": "^3.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/type/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"devDependencies": {
"@carbon/bundler": "^10.5.0",
"@carbon/test-utils": "^10.6.0",
"change-case": "^3.1.0",
"change-case": "^4.1.1",
"rimraf": "^3.0.0"
},
"eyeglass": {
Expand Down
4 changes: 2 additions & 2 deletions packages/upgrade/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
},
"dependencies": {
"chalk": "^2.4.2",
"change-case": "^3.1.0",
"change-case": "^4.1.1",
"cross-spawn": "^6.0.5",
"fast-glob": "^2.2.6",
"fs-extra": "^7.0.1",
"fs-extra": "^8.1.0",
"inquirer": "^6.3.1",
"jest-diff": "^23.6.0",
"jscodeshift": "^0.6.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

'use strict';

const { pascal } = require('change-case');
const { pascalCase } = require('change-case');

/**
* This transform upgrades the import path that teams may be using for icons
Expand Down Expand Up @@ -164,23 +164,23 @@ module.exports = (file, api) => {
function getModuleName(name, size, prefixParts) {
const prefix = prefixParts
.filter(size => isNaN(size))
.map(pascal)
.map(pascalCase)
.join('');

if (prefix !== '') {
if (!size) {
return prefix + pascal(name) + 'Glyph';
return prefix + pascalCase(name) + 'Glyph';
}
return prefix + pascal(name) + size;
return prefix + pascalCase(name) + size;
}

if (!size) {
return pascal(name) + 'Glyph';
return pascalCase(name) + 'Glyph';
}

if (isNaN(name[0])) {
return pascal(name) + size;
return pascalCase(name) + size;
}

return '_' + pascal(name) + size;
return '_' + pascalCase(name) + size;
}
Loading

0 comments on commit 03ab15c

Please sign in to comment.