Skip to content

Commit

Permalink
Merge branch 'master' into number-input-position-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
joshblack authored Feb 19, 2020
2 parents e036623 + a586deb commit 08f7d5b
Show file tree
Hide file tree
Showing 93 changed files with 20,679 additions and 22,925 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-react-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-vanilla-devenv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-generated-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
12
Binary file removed .yarn/offline-mirror/fast-extend-0.0.2.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/fast-extend-1.0.2.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/memfs-2.17.1.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/memfs-3.0.4.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/node-sass-3.13.1.tgz
Binary file not shown.
Binary file removed .yarn/offline-mirror/scss-to-json-1.1.0.tgz
Binary file not shown.
Binary file added .yarn/offline-mirror/scss-to-json-2.0.0.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 @@ -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": [
Expand Down
1 change: 1 addition & 0 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/icon-build-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
30 changes: 0 additions & 30 deletions packages/icon-build-helpers/src/build-metadata.js

This file was deleted.

206 changes: 0 additions & 206 deletions packages/icon-build-helpers/src/check.js

This file was deleted.

6 changes: 2 additions & 4 deletions packages/icon-build-helpers/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
37 changes: 37 additions & 0 deletions packages/icon-build-helpers/src/metadata/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Metadata

## About

We store metadata for a collection of SVG assets to help with searching and
using icons in the Carbon Design System. However, due to the large number of
assets we maintain, we needed to build a system for organizing information about
these icons and creating an output file to be consumed by tooling.

As a result, the Metadata module provides support for building, scaffolding, and
verifying metadata information about a collection of SVG assets. Under the hood,
this module will build up a registry of all available assets and compare them
against metadata files called "extensions". These files are typically written in
YAML and are separated to make authoring of specific types of data easier.

In general, we support the following extension types:

- Icons: provides information for icons available from the source directory of
SVG assets
- Categories: provides category and subcategory information for a collection of
icons
- Module name: provides computed names used in code for an icon
- Deprecations: provides a listing of icons that have been deprecated and
details how to update usage to the preferred format

To support the above use-cases, Metadata makes use of the following concepts:

- [Registry](./registry.js): build up a source of truth for all available SVG
assets in a source tree
- [Extensions](./extensions/index.js): distinct sources of metadata captured for
icons. These modules provide support for verifying file structure, extending
the resulting output metadata, and logical checks to verify information
present (or not present) in these files
- [Adapters](./adapters.js): provide support for authoring metadata in a variety
of formats, we currently author in YAML
- [Storage](./storage.js): ability to read and write extension files for a given
adapter
Loading

0 comments on commit 08f7d5b

Please sign in to comment.