fix(EmptyState): illustrations should render correctly now

.github/workflows/ci-check.yml → .github/workflows/ci.yml

@@ -1,14 +1,10 @@
-name: Continuous integration check
+name: CI
 
 on:
   pull_request:
     branches:
       - master
 
-  push:
-    branches:
-      - master
-
 jobs:
   check:
     runs-on: ubuntu-latest

netlify.toml

@@ -1,4 +1,4 @@
 # Netlify build and deploy settings - https://docs.netlify.com/configure-builds/file-based-configuration/#sample-file
 [build]
-command = "yarn build:storybook-addon-carbon-theme && yarn build:storybook"
+command = "yarn build:storybook"
 publish = "packages/core/storybook-static"

package.json

@@ -12,21 +12,24 @@
   },
   "scripts": {
     "audit": "node scripts/audit.js dependencies moderate",
-    "build": "lerna run build --stream --prefix --npm-client yarn",
-    "build:storybook-addon-carbon-theme": "lerna run --scope \"@carbon/storybook-addon-theme\" build",
-    "build:storybook": "cd packages/core && yarn build:storybook",
-    "ci-check": "yarn format:diff && yarn lint && yarn test --ci",
+    "build": "lerna run build --stream --prefix --npm-client yarn --include-dependencies",
+    "build:storybook-addon-carbon-theme": "yarn build --scope \"@carbon/storybook-addon-theme\"",    
+    "//build:storybook": "# we build dependencies, then run storybook build directly because its dynamic output gets mangled by lerna",
+    "build:storybook": "yarn build:storybook-dependencies-only && cd packages/core && yarn build",
+    "build:storybook-dependencies-only": "yarn build $(lerna ls --scope @carbon/ibm-cloud-cognitive-core --include-dependencies | grep -v '^@carbon/ibm-cloud-cognitive-core$' | xargs -n1 echo '--scope')",
+    "ci-check": "yarn format:diff && yarn lint && yarn test --ci && lerna run ci-check --stream",
     "clean": "lerna run clean && lerna clean --yes && rimraf node_modules",
     "copy-common-files": "sh ./scripts/copy-common-files.sh;",
     "format": "prettier --write '**/*.{js,md,mdx,scss,ts}' '!**/{build,es,lib,storybook,ts,umd}/**'",
     "format:diff": "prettier --list-different '**/*.{js,md,mdx,scss,ts}' '!**/{build,es,lib,storybook,ts,umd}/**' '!README.md'",
-    "generate": "cd packages/experimental && yarn generate",
+    "generate": "lerna run generate --scope \"@carbon/ibm-cloud-cognitive-experimental",
     "monorepo:npm-upgrade": "sh ./scripts/monorepo-npm-upgrade.sh",
     "lint": "yarn lint:es && yarn lint:style",
     "lint:es": "eslint 'packages/*/src/**/*.js'",
     "lint:style": "stylelint 'packages/*/src/**/*.scss' --report-needless-disables --report-invalid-scope-disables",
     "test": "lerna run test --stream && jest",
-    "storybook": "yarn build:storybook-addon-carbon-theme && cd packages/core && yarn start",
+    "//storybook": "# we build dependencies, then start storybook directly because its dynamic output gets mangled by lerna",
+    "storybook": "yarn build:storybook-dependencies-only && cd packages/core && yarn start",
     "sync": "carbon-cli sync"
   },
   "peerDependencies": {
@@ -38,6 +41,7 @@
     "@commitlint/config-conventional": "^8.3.4",
     "@testing-library/react": "^11.2.2",
     "@testing-library/user-event": "^12.6.0",
+    "chalk": "^4.1.0",
     "copyfiles": "^2.4.1",
     "cpx": "^1.5.0",
     "enzyme": "^3.11.0",

packages/cloud-cognitive/CHANGELOG.md

@@ -3,6 +3,158 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.1.92](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-10)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.91](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-10)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.90](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-10)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.89](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-09)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.88](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-09)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.87](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-09)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.86](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-09)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.85](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-09)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.84](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-09)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.83](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-08)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.82](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-08)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.81](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-08)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.80](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-05)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.79](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-05)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.78](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-04)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.77](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-04)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.76](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-04)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.75](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-04)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
+## [0.1.74](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-03)
+
+**Note:** Version bump only for package @carbon/ibm-cloud-cognitive
+
+
+
+
+
 ## [0.1.73](https://github.com/carbon-design-system/ibm-cloud-cognitive/compare/@carbon/[email protected]...@carbon/[email protected]) (2021-03-01)
 
 **Note:** Version bump only for package @carbon/ibm-cloud-cognitive

packages/cloud-cognitive/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-cloud-cognitive",
   "description": "Carbon for Cloud & Cognitive common UI components",
-  "version": "0.1.73",
+  "version": "0.1.92",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -32,17 +32,18 @@
     "build": "yarn clean && yarn build:js && yarn build:scss",
     "build:js": "node scripts/build",
     "build:scss": "bundler bundle:scss src/index.scss && copyfiles 'src/**/*.scss' scss -u 1",
+    "ci-check": "node scripts/import",
     "clean": "rimraf es lib scss",
     "test": "bundler check 'src/**/*.scss'"
   },
   "peerDependencies": {
     "react": "^16.13.1"
   },
   "dependencies": {
-    "@carbon/ibm-cloud-cognitive-experimental": "^0.20.2",
-    "@carbon/ibm-cloud-cognitive-security": "^0.4.2"
+    "@carbon/ibm-cloud-cognitive-experimental": "^0.21.5",
+    "@carbon/ibm-cloud-cognitive-security": "^0.4.9"
   },
   "devDependencies": {
-    "@carbon/ibm-cloud-cognitive-core": "^0.6.2"
+    "@carbon/ibm-cloud-cognitive-core": "^0.6.13"
   }
 }

packages/cloud-cognitive/scripts/import.js

@@ -0,0 +1,10 @@
+/**
+ * Copyright IBM Corp. 2021, 2021
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+module.exports = require('@carbon/ibm-cloud-cognitive-core/import')(
+  require('path').resolve(__dirname, '..', 'lib')
+);

packages/core/.storybook/index.scss

@@ -17,29 +17,37 @@ $css--reset: false;
 @import '../generated/feature-flags/feature-flags';
 @import '@carbon/themes/scss/themes';
 
+// Setting attribute storybook-carbon-theme="XXX" on the html element
+// will set the carbon theme used for the storybook pane.
+// Adding class sb--use-carbon-theme-XXX on any element
+// will set the carbon theme used within that element.
 @if map-get($feature-flags, 'enable-css-custom-properties') {
-  :root {
+  :root,
+  .sb--use-carbon-theme-white {
     @include carbon--theme(
       $theme: $carbon--theme--white,
       $emit-custom-properties: true
     );
   }
 
-  :root[storybook-carbon-theme='g10'] {
+  :root[storybook-carbon-theme='g10'],
+  .sb--use-carbon-theme-g10 {
     @include carbon--theme(
       $theme: $carbon--theme--g10,
       $emit-custom-properties: true
     );
   }
 
-  :root[storybook-carbon-theme='g90'] {
+  :root[storybook-carbon-theme='g90'],
+  .sb--use-carbon-theme-g90 {
     @include carbon--theme(
       $theme: $carbon--theme--g90,
       $emit-custom-properties: true
     );
   }
 
-  :root[storybook-carbon-theme='g100'] {
+  :root[storybook-carbon-theme='g100'],
+  .sb--use-carbon-theme-g100 {
     @include carbon--theme(
       $theme: $carbon--theme--g100,
       $emit-custom-properties: true

packages/core/.storybook/preview.js

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { withInfo } from '@storybook/addon-info';
 import React, { useEffect } from 'react';
+import { withInfo } from '@storybook/addon-info';
 import { withCarbonTheme } from '@carbon/storybook-addon-theme/react';
 
 import index from './index.scss';
@@ -39,12 +39,34 @@ const decorators = [
   withCarbonTheme,
 ];
 
+const order = [
+  'Cloud & Cognitive/Released',
+  'Cloud & Cognitive/Canary',
+  'Legacy',
+];
+const toOrder = (value) => {
+  const inOrder = order.findIndex((item) => value.startsWith(item));
+  // length is last index + 1
+  return inOrder < 0 ? order.length : inOrder;
+};
+
 const parameters = {
   controls: { expanded: true, hideNoControlsWarning: true },
   layout: 'centered',
   options: {
-    storySort: {
-      order: ['Cloud & Cognitive', ['Released', 'Canary'], 'Legacy'],
+    storySort: (a, b) => {
+      // const storybookOrder = ['Cloud & Cognitive', ['Released', 'Canary'], 'Legacy'];
+      const aInOrder = toOrder(a[1].kind);
+      const bInOrder = toOrder(b[1].kind);
+
+      if (aInOrder !== bInOrder) {
+        return aInOrder - bInOrder;
+      } else {
+        // from storybook doc example https://storybook.js.org/docs/react/writing-stories/naming-components-and-hierarchy
+        return a[1].kind === b[1].kind
+          ? 0
+          : a[1].id.localeCompare(b[1].id, undefined, { numeric: true });
+      }
     },
   },