Merge branch 'next' of https://github.com/IBM/carbon-addons-iot-react into fix-hotspot-1897

Author: scottdickerson

.github/CONTRIBUTING.MD

@@ -18,6 +18,20 @@ but some popular options are [VSCode](https://code.visualstudio.com/),
 
 With that all in place, you're ready to start contributing!
 
+### Working with the monorepo
+
+The PAL is structured as a set of packages versioned and deployed together - `carbon-addons-iot-react`, `@ai-apps/angular`, and `@ai-apps/components`. Each one of these packages live in the `packages` directory, for example, `carbon-addons-iot-react` lives in the `packages/react` directory.
+
+To work on a package you must make sure to change into the correct directory - `cd packages/react` - otherwise package specific commands, or packages added via `yarn add`, will be run and added to the global scope and may conflict with other packages.
+
+Each package should be capable of producing an independent build and storybook environment, however it may be necessary to build and link _all_ packages contained within the monorepo. In that case running `yarn build` from the root will build every package and it's local dependents in order. Other global scripts include:
+
+- `build`: Builds and links every package
+- `lint`: Lints every package
+- `test`: Runs the test suite of every package
+- `build:storybook`: Builds the storybook for every package (where applicable)
+- `clean`: Cleans built files for the entire monorepo
+
 ### Developing on Windows 10
 
 To get a Windows environment set up for contributing to this codebase, you'll

README.MD .github/README.MDREADME.MD renamed to .github/README.MD

@@ -33,12 +33,15 @@ jobs:
         run: yarn lint
 
       - name: Test, collect coverage
-        run: yarn test --maxWorkers=2 --ci --logHeapUsage --coverage
+        # we need the "-- --" to pass the options through yarn and lerna and back to yarn
+        run: yarn test -- -- --maxWorkers=2 --ci --logHeapUsage --coverage
 
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: "./packages/react/coverage/lcov.info"
+          base-path: "packages/react"
 
       - name: Build
         run: yarn build

.github/workflows/publish.yml

@@ -20,9 +20,12 @@ jobs:
         run: yarn --frozen-lockfile
 
       - name: Run tests, collect coverage
-        run: yarn test --maxWorkers=2 --ci --logHeapUsage --coverage
+        # we need the "-- --" to pass the options through yarn and lerna and back to yarn
+        run: yarn test -- -- --maxWorkers=2 --ci --logHeapUsage --coverage
 
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: "./packages/react/coverage/lcov.info"
+          base-path: "packages/react"

.github/workflows/test.yml

@@ -0,0 +1,7 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "0.0.0",
+  "npmClient": "yarn"
+}

__mocks__/@carbon/charts-react/bar-chart-grouped.js

@@ -1,8 +1,8 @@
 [build]
-  # Directory (relative to root of your repo) that contains the deploy-ready 
+  # Directory (relative to root of your repo) that contains the deploy-ready
   # HTML files and assets generated by the build. If a base directory has
   # been specified, include it in the publish directory path.
-  publish = "storybook-static"
+  publish = "packages/react/storybook-static"
 
   # Default build command.
-  command = "yarn build:storybook"
+  command = "yarn build:storybook"

__mocks__/@carbon/charts-react/bar-chart-simple.js

@@ -1,110 +1,49 @@
 {
-  "name": "carbon-addons-iot-react",
+  "name": "ibm-ai-applications",
   "engines": {
-    "node": "10.x || 12.x"
+    "node": ">= 10"
   },
+  "workspaces": ["packages/react"],
   "main": "lib/src/index.js",
   "module": "es/src/index.js",
   "unpkg": "umd/carbon-addons-iot-react.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/carbon-design-system/carbon-addons-iot-react.git"
   },
-  "license": "Apache-2",
-  "files": [
-    "lib/**/*",
-    "es/**/*",
-    "umd/**/*",
-    "scss/**/*",
-    "css/**/*"
-  ],
+  "private": true,
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/carbon-design-system/carbon-addons-iot-react/issues"
   },
   "homepage": "https://carbon-addons-iot-react.com",
   "scripts": {
-    "build": "yarn svg-convert && cross-env BABEL_ENV='production' NODE_ENV='production' yarn build:pre && rollup -c && yarn build:post",
-    "build:pre": "yarn test:engines && rimraf lib es umd css scss tmp storybook-static",
-    "build:post": "rimraf tmp",
-    "build:storybook": "yarn test:engines && NODE_OPTIONS='--max-old-space-size=16384' build-storybook -s public/production",
-    "format": "prettier --write \"**/*.{scss,css,js,jsx,md,ts}\"",
-    "format:check": "prettier --check \"**/*.{scss,css,js,jsx,md,ts}\" --loglevel warn",
-    "format:diff": "prettier --list-different \"**/*.{scss,css,js,jsx,md,ts}\"",
-    "lint": "yarn lint:javascript && yarn lint:stylelint",
-    "lint:javascript": "eslint --ext .jsx --ext .js .",
-    "lint:stylelint": "stylelint './src/**/*.scss' --syntax scss --ignorePath .gitignore --custom-formatter ./config/stylelint/sassMsgFormatter.js",
-    "postinstall": "carbon-telemetry collect --install",
-    "publish-npm": "yarn semantic-release",
-    "start": "yarn test:engines && yarn storybook",
-    "storybook": "yarn test:engines && start-storybook -p 3000 -s public/development",
-    "svg-convert": "svgr --ext jsx -d src/icons/components src/icons/svg && prettier --write src/icons/components/index.jsx ",
-    "test": "yarn test:engines && yarn test:a11y && yarn test:base",
-    "test:base": "yarn test:engines && cross-env NODE_ICU_DATA=node_modules/full-icu TZ=America/Chicago jest --testPathPattern='.*\\.test\\.js(x)?' --coverage",
-    "test:a11y": "yarn test:engines && cross-env NODE_ICU_DATA=node_modules/full-icu TZ=America/Chicago jest --forceExit --testPathPattern='.*\\.a11y\\.js(x)?'",
-    "test:watch": "yarn test:engines && cross-env NODE_ICU_DATA=node_modules/full-icu TZ=America/Chicago jest --testPathPattern='.*\\.test\\.js(x)?' --watch --verbose --coverage",
-    "test:update": "yarn test:engines && cross-env NODE_ICU_DATA=node_modules/full-icu TZ=America/Chicago jest src/components/StorybookSnapshots.test.js src/utils/__tests__/publicAPI.test.js --updateSnapshot",
-    "test:clear": "yarn test:engines && cross-env NODE_ICU_DATA=node_modules/full-icu TZ=America/Chicago jest --clearCache",
-    "test:engines": "check-node-version --node $(cat .nvmrc) --yarn 1.x"
-  },
-  "stylelint": {
-    "extends": "stylelint-config-recommended-scss",
-    "plugins": [
-      "stylelint-scss"
-    ],
-    "rules": {
-      "declaration-property-unit-blacklist": [
-        {
-          "font-size": [
-            "em",
-            "px",
-            "pt"
-          ],
-          "margin": [
-            "px",
-            "rem"
-          ],
-          "padding": [
-            "px",
-            "rem"
-          ],
-          "transition": [
-            "s",
-            "ms"
-          ]
-        },
-        {
-          "severity": "error"
-        }
-      ],
-      "declaration-property-value-blacklist": [
-        {
-          "color": [
-            "/^#/",
-            "/^rgb/"
-          ]
-        },
-        {
-          "severity": "error"
-        }
-      ]
-    }
+    "build:storybook": "lerna run --stream build:storybook",
+    "build": "lerna run --stream build",
+    "lint": "lerna run --stream lint",
+    "test": "lerna run --stream test",
+    "start": "lerna run --stream start",
+    "clean": "lerna run --stream clean",
+    "format": "lerna run --stream format",
+    "format:check": "lerna run --stream format:check",
+    "publish-npm": "bash ./scripts/release.sh"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "yarn svg-convert && yarn lint-staged && yarn test:base",
+      "pre-commit": "yarn lint-staged && lerna run --stream pre-commit",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
   "lint-staged": {
     "linters": {
-      "*.{jsx,js}": [
-        "eslint --fix"
+      "packages/react/*.{jsx,js}": [
+        "cd packages/react && eslint --fix"
       ],
-      "*.{scss,css}": [
-        "yarn lint:stylelint"
+      "packages/react/*.{scss,css}": [
+        "cd packages/react && yarn lint:stylelint"
       ],
-      "*.{scss,css,js,md,jsx,json}": [
-        "yarn format",
+      "packages/react/*.{scss,css,js,md,jsx,json}": [
+        "cd packages/react && yarn format",
         "git add"
       ]
     }
@@ -114,177 +53,11 @@
       "@commitlint/config-conventional"
     ]
   },
-  "release": {
-    "branches": [
-      "+([0-9])?(.{+([0-9]),x}).x",
-      "master",
-      {
-        "name": "next",
-        "channel": "next",
-        "prerelease": "next"
-      }
-    ]
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.10.2",
-    "@carbon/charts": "^0.41.11",
-    "@carbon/charts-react": "^0.41.11",
-    "@carbon/colors": "10.15.0",
-    "@carbon/icons-react": "10.17.0",
-    "@carbon/layout": "10.12.0",
-    "@carbon/motion": "10.6.0",
-    "@carbon/pictograms-react": "11.0.0",
-    "@carbon/telemetry": "^0.0.0-alpha.5",
-    "@carbon/themes": "10.16.0",
-    "@monaco-editor/react": "^3.6.2",
-    "carbon-components": "10.17.0",
-    "carbon-components-react": "7.17.0",
-    "carbon-icons": "^7.0.7",
-    "classnames": "^2.2.5",
-    "core-js": "3.6.5",
-    "downshift": "5.2.1",
-    "immutability-helper": "^2.9.0",
-    "js-file-download": "^0.4.7",
-    "lodash": "^4.17.19",
-    "moment": "^2.24.0",
-    "polished": "^2.3.3",
-    "prop-types": "^15.7.2",
-    "react-dnd": "11.1.3",
-    "react-dnd-html5-backend": "11.1.3",
-    "react-grid-layout": "^0.18.3",
-    "react-sizeme": "^2.6.3",
-    "react-transition-group": "^2.6.0",
-    "react-visibility-sensor": "^5.0.2",
-    "styled-components": "^4.1.3",
-    "use-deep-compare-effect": "^1.2.0",
-    "use-lang-direction": "^0.1.11",
-    "use-resize-observer": "^6.1.0",
-    "uuid": "^3.3.2",
-    "warning": "^4.0.3"
-  },
-  "peerDependencies": {
-    "d3": ">=5.0.0 <=5.14.2",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6"
-  },
   "devDependencies": {
-    "@babel/core": "^7.10.2",
-    "@babel/plugin-proposal-class-properties": "^7.10.1",
-    "@babel/plugin-proposal-decorators": "^7.10.1",
-    "@babel/plugin-proposal-do-expressions": "^7.10.1",
-    "@babel/plugin-proposal-export-default-from": "^7.10.1",
-    "@babel/plugin-proposal-export-namespace-from": "^7.10.1",
-    "@babel/plugin-proposal-function-sent": "^7.10.1",
-    "@babel/plugin-proposal-json-strings": "^7.10.1",
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.10.1",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.1",
-    "@babel/plugin-proposal-numeric-separator": "^7.10.1",
-    "@babel/plugin-proposal-optional-chaining": "^7.10.1",
-    "@babel/plugin-proposal-pipeline-operator": "^7.10.1",
-    "@babel/plugin-proposal-throw-expressions": "^7.10.1",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-syntax-import-meta": "^7.10.1",
-    "@babel/plugin-transform-runtime": "^7.10.1",
-    "@babel/polyfill": "^7.10.1",
-    "@babel/preset-env": "^7.10.2",
-    "@babel/preset-flow": "^7.10.1",
-    "@babel/preset-react": "^7.10.1",
-    "@commitlint/cli": "^7.2.1",
-    "@commitlint/config-conventional": "^7.1.2",
-    "@storybook/addon-a11y": "^5.3.17",
-    "@storybook/addon-actions": "^5.3.17",
-    "@storybook/addon-info": "^5.3.17",
-    "@storybook/addon-knobs": "^5.3.17",
-    "@storybook/addon-links": "^5.3.17",
-    "@storybook/addon-storyshots": "^5.3.17",
-    "@storybook/addons": "^5.3.17",
-    "@storybook/react": "^5.3.17",
-    "@svgr/cli": "^5.4.0",
-    "@testing-library/dom": "^7.22.2",
-    "@testing-library/jest-dom": "^5.11.3",
-    "@testing-library/react": "^10.4.8",
-    "@testing-library/user-event": "^12.1.1",
-    "accessibility-checker": "^3.0.6",
-    "autoprefixer": "^9.4.4",
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-eslint": "^10.1.0",
-    "babel-loader": "^8.1.0",
-    "babel-plugin-dev-expression": "^0.2.2",
-    "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-react-docgen": "^4.1.0",
-    "babel-plugin-require-context-hook": "^1.0.0",
-    "babel-plugin-styled-components": "^1.10.7",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "chalk": "^4.1.0",
-    "check-node-version": "^4.0.3",
-    "coveralls": "^3.0.2",
-    "cross-env": "^6.0.3",
-    "css-loader": "^2.1.0",
-    "d3": ">=5.0.0 <=5.14.2",
-    "deepdash": "^5.1.2",
-    "enzyme": "^3.8.0",
-    "enzyme-adapter-react-16": "^1.14.0",
-    "enzyme-to-json": "^3.3.5",
-    "eslint": "^5.11.1",
-    "eslint-config-airbnb": "^17.1.0",
-    "eslint-config-prettier": "^6.12.0",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jest": "^23.8.2",
-    "eslint-plugin-jsx-a11y": "^6.1.2",
-    "eslint-plugin-lodash": "^5.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-react": "^7.12.2",
-    "eslint-plugin-react-hooks": "^1.5.0",
-    "eslint-plugin-testing-library": "^3.3.1",
-    "eslint-plugin-unicorn": "^20.1.0",
-    "faker": "^4.1.0",
-    "fast-sass-loader": "^1.5.0",
-    "file-loader": "^4.0.0",
-    "full-icu": "^1.3.1",
     "husky": "^1.3.1",
-    "jest": "^25.5.1",
-    "jest-environment-jsdom-sixteen": "^1.0.3",
-    "jest-styled-components": "^6.3.1",
-    "lint-staged": "^8.1.0",
-    "moment-timezone": "^0.5.26",
-    "node-sass": "^4.13.1",
-    "object-assign": "^4.1.1",
-    "postcss-loader": "^3.0.0",
-    "prettier": "^2.1.2",
-    "prettier-config-carbon": "^0.4.0",
-    "promise": "^8.0.2",
-    "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "react-is": "^16.13.1",
-    "react-lorem-component": "^0.13.0",
-    "react-test-renderer": "^16.8.6",
-    "rimraf": "^3.0.0",
-    "rollup": "^1.1.0",
-    "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-commonjs": "^9.2.0",
-    "rollup-plugin-copy": "^3.2.0",
-    "rollup-plugin-filesize": "^6.0.0",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-node-resolve": "^4.0.0",
-    "rollup-plugin-postcss": "^2.0.3",
-    "rollup-plugin-replace": "^2.1.0",
-    "rollup-plugin-uglify": "^6.0.4",
-    "sass-loader": "^7.1.0",
-    "semantic-release": "^17.2.3",
-    "storybook-addon-rtl": "^0.2.2",
-    "storybook-readme": "^5.0.8",
-    "style-loader": "^0.23.1",
-    "stylelint": "^10.1.0",
-    "stylelint-config-recommended-scss": "^3.3.0",
-    "stylelint-scss": "^3.10.0",
-    "weak-napi": "^2.0.1",
-    "webpack": "^4.28.4",
-    "whatwg-fetch": "^3.0.0"
+    "lerna": "^3.22.1",
+    "lint-staged": "^8.1.0"
   },
   "sideEffects": false,
-  "resolutions": {
-    "chokidar": "3.3.1"
-  },
   "version": "0.0.0-development"
 }