Merge branch 'master' into form-item-removal

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   system:
     docker:
-      - image: circleci/node:10.18-browsers
+      - image: circleci/node:12-browsers
     working_directory: ~/repo
     steps:
       - checkout

.github/workflows/deploy-react-storybook.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@master
-      - name: Use Node.js 10.x
+      - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project

.github/workflows/deploy-vanilla-devenv.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@master
-      - name: Use Node.js 10.x
+      - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project

.github/workflows/nightly-release.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@master
-      - name: Use Node.js 10.x
+      - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project

.github/workflows/sync-generated-files.yml

@@ -8,10 +8,10 @@ jobs:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Use Node.js 10.x
+      - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - name: Install dependencies
         run: yarn install --offline
       - name: Build project

.nvmrc

@@ -1 +1 @@
-10
+12

package.json

@@ -5,7 +5,7 @@
   "repository": "git@github.com:carbon-design-system/carbon.git",
   "license": "Apache-2.0",
   "engines": {
-    "node": "10.x"
+    "node": "12.x"
   },
   "workspaces": {
     "packages": [

packages/components/docs/sass.md

@@ -19690,6 +19690,11 @@ Number input styles
     }
   }
 
+  //No label positioning adjustment
+  .#{$prefix}--number--nolabel .bx--label + .bx--form__helper-text {
+    margin-top: 0;
+  }
+
   // Skeleton State
   .#{$prefix}--number.#{$prefix}--skeleton {
     @include skeleton;

packages/components/package.json

@@ -69,6 +69,7 @@
     "carbon-icons": "^7.0.7",
     "flatpickr": "4.6.1",
     "lodash.debounce": "^4.0.8",
+    "scss-to-json": "^2.0.0",
     "warning": "^3.0.0"
   },
   "devDependencies": {

packages/components/src/components/number-input/_number-input.scss

@@ -220,6 +220,11 @@
     }
   }
 
+  //No label positioning adjustment
+  .#{$prefix}--number--nolabel .bx--label + .bx--form__helper-text {
+    margin-top: 0;
+  }
+
   // Skeleton State
   .#{$prefix}--number.#{$prefix}--skeleton {
     @include skeleton;

packages/icon-build-helpers/package.json

@@ -29,7 +29,7 @@
     "joi": "^14.3.1",
     "js-yaml": "^3.12.1",
     "klaw-sync": "^6.0.0",
-    "memfs": "^2.14.0",
+    "memfs": "^3.0.4",
     "prettier": "^1.19.1",
     "prop-types": "^15.6.2",
     "react": "^16.6.0",

packages/icon-build-helpers/src/index.js

@@ -8,11 +8,9 @@
 'use strict';
 
 const builders = require('./builders');
-const buildMetadata = require('./build-metadata');
-const check = require('./check');
+const Metadata = require('./metadata');
 
 module.exports = {
   builders,
-  buildMetadata,
-  check,
+  Metadata,
 };