Skip to content

Commit 03ab15c

Browse files
committed
Merge branch 'master' of github.com:carbon-design-system/carbon into chore/update-git-tools-january-2020
2 parents 3e228ae + f7acfd8 commit 03ab15c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+206
-225
lines changed
3.95 KB
Binary file not shown.
3.69 KB
Binary file not shown.
-4.09 KB
Binary file not shown.
-4.09 KB
Binary file not shown.
3.18 KB
Binary file not shown.
-1.41 KB
Binary file not shown.
3.64 KB
Binary file not shown.
-1.92 KB
Binary file not shown.
3.53 KB
Binary file not shown.
-1.97 KB
Binary file not shown.
3.51 KB
Binary file not shown.
-1.79 KB
Binary file not shown.
-1.83 KB
Binary file not shown.
4.29 KB
Binary file not shown.
-1.94 KB
Binary file not shown.
5.58 KB
Binary file not shown.
-382 KB
Binary file not shown.
381 KB
Binary file not shown.
3.5 KB
Binary file not shown.
-2.06 KB
Binary file not shown.
4.08 KB
Binary file not shown.
-1.92 KB
Binary file not shown.
3.49 KB
Binary file not shown.
-2.11 KB
Binary file not shown.
3.79 KB
Binary file not shown.
-1.38 KB
Binary file not shown.
3.5 KB
Binary file not shown.
-2.18 KB
Binary file not shown.
-1.95 KB
Binary file not shown.
4.23 KB
Binary file not shown.
-1.93 KB
Binary file not shown.
3.17 KB
Binary file not shown.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"enzyme-to-json": "^3.3.5",
5858
"eslint": "^6.0.0",
5959
"eslint-config-carbon": "10.4.0",
60-
"fs-extra": "^7.0.1",
60+
"fs-extra": "^8.1.0",
6161
"glob": "^7.1.4",
6262
"husky": "^4.0.10",
6363
"jest": "^24.8.0",

packages/bundler/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@
2828
"autoprefixer": "^9.4.3",
2929
"babel-plugin-macros": "^2.4.2",
3030
"chalk": "^2.4.1",
31-
"change-case": "^3.0.2",
31+
"change-case": "^4.1.1",
3232
"cli-table": "^0.3.1",
3333
"commander": "^2.19.0",
3434
"cssnano": "^4.1.7",
3535
"execa": "^2.0.3",
3636
"filesize": "^3.6.1",
37-
"fs-extra": "^7.0.0",
37+
"fs-extra": "^8.1.0",
3838
"glob": "^7.1.3",
3939
"gzip-size": "^5.0.0",
4040
"inquirer": "^6.5.0",
4141
"klaw-sync": "^6.0.0",
4242
"markdown-toc": "^1.2.0",
43-
"node-sass": "^4.9.4",
43+
"node-sass": "^4.13.1",
4444
"postcss": "^7.0.7",
4545
"postcss-discard-comments": "^4.0.1",
4646
"replace-in-file": "^3.4.4",

packages/colors/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
"@carbon/cli-reporter": "10.3.0",
3636
"@carbon/scss-generator": "^10.5.0",
3737
"@carbon/test-utils": "^10.6.0",
38-
"change-case": "^3.0.2",
38+
"change-case": "^4.1.1",
3939
"core-js": "^3.0.1",
40-
"fs-extra": "^7.0.0",
41-
"node-sass": "^4.11.0",
40+
"fs-extra": "^8.1.0",
41+
"node-sass": "^4.13.1",
4242
"rimraf": "^3.0.0"
4343
},
4444
"eyeglass": {

packages/components/Staticfile

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
root: demo
2+
force_https: true

packages/components/docs/sass.md

+6-9

packages/components/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
"minimatch": "^3.0.4",
144144
"mkdirp": "^0.5.0",
145145
"mock-raf": "^1.0.0",
146-
"node-sass": "^4.11.0",
146+
"node-sass": "^4.13.1",
147147
"nodemon": "^1.18.7",
148148
"path-to-regexp": "^2.2.0",
149149
"portscanner": "^2.2.0",

packages/components/src/components/date-picker/_date-picker.scss

+5-6
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@
316316
}
317317
}
318318

319-
.#{$prefix}--date-picker__days .nextMonthDay,
320-
.#{$prefix}--date-picker__days .prevMonthDay {
321-
color: $text-02;
319+
.#{$prefix}--date-picker__day.nextMonthDay,
320+
.#{$prefix}--date-picker__day.prevMonthDay {
321+
color: $text-05;
322322
}
323323

324324
.#{$prefix}--date-picker__day.today,
@@ -352,11 +352,10 @@
352352
}
353353
}
354354

355-
.#{$prefix}--date-picker__day.disabled,
356-
.flatpickr-day.disabled {
355+
.#{$prefix}--date-picker__day.flatpickr-day.flatpickr-disabled {
357356
cursor: not-allowed;
358357
opacity: 0.5;
359-
color: $ui-05;
358+
color: $disabled-02;
360359

361360
&:hover {
362361
background: transparent;

packages/elements/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
},
4343
"devDependencies": {
4444
"@carbon/bundler": "^10.5.0",
45-
"fs-extra": "^7.0.1",
45+
"fs-extra": "^8.1.0",
4646
"klaw-sync": "^6.0.0",
4747
"replace-in-file": "^3.4.2",
4848
"rimraf": "^3.0.0"

packages/icon-build-helpers/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"@carbon/cli-reporter": "10.3.0",
2424
"@carbon/icon-helpers": "^10.5.0",
2525
"browserslist-config-carbon": "10.4.0",
26-
"change-case": "^3.0.2",
26+
"change-case": "^4.1.1",
2727
"core-js": "^3.1.3",
28-
"fs-extra": "^7.0.0",
28+
"fs-extra": "^8.1.0",
2929
"joi": "^14.3.1",
3030
"js-yaml": "^3.12.1",
3131
"klaw-sync": "^6.0.0",

packages/icon-build-helpers/src/builders/react/builder.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
'use strict';
99

10-
const { camel } = require('change-case');
10+
const { camelCase } = require('change-case');
1111
const { reporter } = require('@carbon/cli-reporter');
1212
const fs = require('fs-extra');
1313
const path = require('path');
@@ -269,7 +269,7 @@ function shouldTransformAttribute(attribute) {
269269
function formatAttributes(attrs) {
270270
return Object.keys(attrs).reduce((acc, key, index) => {
271271
const attribute = shouldTransformAttribute(key)
272-
? `${camel(key)}="${attrs[key]}"`
272+
? `${camelCase(key)}="${attrs[key]}"`
273273
: `${key}="${attrs[key]}"`;
274274

275275
if (index === 0) {

packages/icon-build-helpers/src/builders/vanilla/builder.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'use strict';
99

1010
const { reporter } = require('@carbon/cli-reporter');
11-
const { pascal } = require('change-case');
11+
const { pascalCase } = require('change-case');
1212
const fs = require('fs-extra');
1313
const path = require('path');
1414
const prettier = require('prettier');
@@ -211,7 +211,7 @@ function getModuleName(name, size, prefixParts, descriptor) {
211211
const height = parseInt(descriptor.attrs.height, 10);
212212
let prefix = prefixParts
213213
.filter(size => isNaN(size))
214-
.map(pascal)
214+
.map(pascalCase)
215215
.join('');
216216
const isGlyph = width < 16 || height < 16;
217217

@@ -221,25 +221,25 @@ function getModuleName(name, size, prefixParts, descriptor) {
221221
}
222222
if (!size) {
223223
if (isGlyph) {
224-
return prefix + pascal(name) + 'Glyph';
224+
return prefix + pascalCase(name) + 'Glyph';
225225
}
226-
return prefix + pascal(name);
226+
return prefix + pascalCase(name);
227227
}
228-
return prefix + pascal(name) + size;
228+
return prefix + pascalCase(name) + size;
229229
}
230230

231231
if (!size) {
232232
if (isGlyph) {
233-
return pascal(name) + 'Glyph';
233+
return pascalCase(name) + 'Glyph';
234234
}
235-
return pascal(name);
235+
return pascalCase(name);
236236
}
237237

238238
if (isNaN(name[0])) {
239-
return pascal(name) + size;
239+
return pascalCase(name) + size;
240240
}
241241

242-
return '_' + pascal(name) + size;
242+
return '_' + pascalCase(name) + size;
243243
}
244244

245245
function createIconSource(file, descriptor) {

packages/icons-angular/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
"@angular/core": "6.1.10",
4141
"@carbon/cli-reporter": "10.3.0",
4242
"@carbon/icons": "^10.8.0",
43-
"change-case": "3.0.2",
44-
"fs-extra": "7.0.1",
43+
"change-case": "4.1.1",
44+
"fs-extra": "8.1.0",
4545
"rollup": "^0.66.6",
4646
"typescript": "2.9.2"
4747
},

packages/icons-vue/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"devDependencies": {
3030
"@carbon/cli-reporter": "10.3.0",
3131
"@carbon/icons": "^10.8.0",
32-
"fs-extra": "^7.0.1",
32+
"fs-extra": "^8.1.0",
3333
"prettier": "^1.19.1",
3434
"rimraf": "^3.0.0",
3535
"rollup": "^1.15.1",

packages/react-hooks/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"browserslist-config-carbon": "10.4.0",
4242
"carbon-components": "^10.9.0",
4343
"css-loader": "^3.2.0",
44-
"node-sass": "^4.12.0",
44+
"node-sass": "^4.13.1",
4545
"postcss-loader": "^3.0.0",
4646
"react": "^16.9.0",
4747
"react-dom": "^16.9.0",

packages/react/Staticfile

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
root: storybook-static
2+
force_https: true

packages/react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"jest-circus": "^24.0.0",
9494
"lcov2badge": "^0.1.0",
9595
"mini-css-extract-plugin": "^0.4.4",
96-
"node-sass": "4.10.0",
96+
"node-sass": "^4.13.1",
9797
"object-assign": "^4.1.1",
9898
"postcss-custom-properties": "^9.0.2",
9999
"postcss-loader": "^3.0.0",

packages/test-utils/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"access": "public"
1919
},
2020
"peerDependencies": {
21-
"node-sass": "^4.11.0",
21+
"node-sass": "^4.13.1",
2222
"react-dom": "^16.9.0"
2323
},
2424
"dependencies": {
@@ -27,7 +27,7 @@
2727
"tabbable": "^4.0.0"
2828
},
2929
"devDependencies": {
30-
"node-sass": "^4.11.0",
30+
"node-sass": "^4.13.1",
3131
"react-dom": "^16.9.0"
3232
}
3333
}

packages/themes/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
"@carbon/cli-reporter": "10.3.0",
3333
"@carbon/scss-generator": "^10.5.0",
3434
"@carbon/test-utils": "^10.6.0",
35-
"change-case": "^3.1.0",
35+
"change-case": "^4.1.1",
3636
"core-js": "^3.0.1",
37-
"fs-extra": "^7.0.1",
37+
"fs-extra": "^8.1.0",
3838
"js-yaml": "^3.13.0",
39-
"node-sass": "^4.11.0",
39+
"node-sass": "^4.13.1",
4040
"rimraf": "^3.0.0"
4141
}
4242
}

packages/type/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"devDependencies": {
3939
"@carbon/bundler": "^10.5.0",
4040
"@carbon/test-utils": "^10.6.0",
41-
"change-case": "^3.1.0",
41+
"change-case": "^4.1.1",
4242
"rimraf": "^3.0.0"
4343
},
4444
"eyeglass": {

packages/upgrade/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
},
2828
"dependencies": {
2929
"chalk": "^2.4.2",
30-
"change-case": "^3.1.0",
30+
"change-case": "^4.1.1",
3131
"cross-spawn": "^6.0.5",
3232
"fast-glob": "^2.2.6",
33-
"fs-extra": "^7.0.1",
33+
"fs-extra": "^8.1.0",
3434
"inquirer": "^6.3.1",
3535
"jest-diff": "^23.6.0",
3636
"jscodeshift": "^0.6.4",

packages/upgrade/src/migrations/carbon-icons-react/10.3.0/update-icon-import-path.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
'use strict';
99

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

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

170170
if (prefix !== '') {
171171
if (!size) {
172-
return prefix + pascal(name) + 'Glyph';
172+
return prefix + pascalCase(name) + 'Glyph';
173173
}
174-
return prefix + pascal(name) + size;
174+
return prefix + pascalCase(name) + size;
175175
}
176176

177177
if (!size) {
178-
return pascal(name) + 'Glyph';
178+
return pascalCase(name) + 'Glyph';
179179
}
180180

181181
if (isNaN(name[0])) {
182-
return pascal(name) + size;
182+
return pascalCase(name) + size;
183183
}
184184

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

0 commit comments

Comments
 (0)