@carbon/ibm-products 1.24.0 → 2.0.0-rc.0

package/lib/components/WebTerminal/WebTerminalContentWrapper.js

@@ -21,18 +21,23 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _settings = require("../../settings");
 
-var _excluded = ["children", "isTerminalOpen"];
+var _hooks = require("./hooks");
+
+var _excluded = ["children"];
 // The block part of our conventional BEM class names (blockClass__E--M).
 var componentName = 'WebTerminalContentWrapper';
 var blockClass = "".concat(_settings.pkg.prefix, "--web-terminal-content-wrapper");
 
 var WebTerminalContentWrapper = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var children = _ref.children,
-      isTerminalOpen = _ref.isTerminalOpen,
       rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+
+  var _useWebTerminal = (0, _hooks.useWebTerminal)(),
+      open = _useWebTerminal.open;
+
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     ref: ref,
-    className: (0, _classnames.default)([blockClass, (0, _defineProperty2.default)({}, "".concat(blockClass, "--open"), isTerminalOpen)])
+    className: (0, _classnames.default)([blockClass, (0, _defineProperty2.default)({}, "".concat(blockClass, "--open"), open)])
   }, rest), children);
 }); // Return a placeholder if not released and not enabled by feature flag
 
@@ -49,10 +54,5 @@ WebTerminalContentWrapper.propTypes = {
   /**
    * Pass in content as children.
    */
-  children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]).isRequired,
-
-  /**
-   * A boolean to determine if the terminal is open.
-   */
-  isTerminalOpen: _propTypes.default.bool.isRequired
+  children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]).isRequired
 };

package/lib/components/WebTerminal/hooks/index.js

@@ -0,0 +1,69 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useWebTerminal = exports.WebTerminalProvider = exports.WebTerminalContext = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _settings = require("../../../settings");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var WebTerminalContext = /*#__PURE__*/(0, _react.createContext)();
+exports.WebTerminalContext = WebTerminalContext;
+var componentName = 'WebTerminalProvider';
+
+var WebTerminalProvider = function WebTerminalProvider(_ref) {
+  var children = _ref.children;
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      open = _useState2[0],
+      setOpen = _useState2[1];
+
+  var openWebTerminal = (0, _react.useCallback)(function () {
+    return setOpen(true);
+  }, []);
+  var closeWebTerminal = (0, _react.useCallback)(function () {
+    return setOpen(false);
+  }, []);
+  var toggleWebTerminal = (0, _react.useCallback)(function () {
+    return setOpen(!open);
+  }, [open]);
+  return /*#__PURE__*/_react.default.createElement(WebTerminalContext.Provider, {
+    value: {
+      open: open,
+      openWebTerminal: openWebTerminal,
+      closeWebTerminal: closeWebTerminal,
+      toggleWebTerminal: toggleWebTerminal
+    }
+  }, children);
+}; // Return a placeholder if not released and not enabled by feature flag
+
+
+exports.WebTerminalProvider = WebTerminalProvider;
+exports.WebTerminalProvider = WebTerminalProvider = _settings.pkg.checkComponentEnabled(WebTerminalProvider, componentName);
+WebTerminalProvider.propTypes = {
+  /**
+   * Provide your own terminal component as children to show up in the web terminal
+   */
+  children: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.node), _propTypes.default.node]).isRequired
+}; // Custom hook that exposes the provided value from context
+
+var useWebTerminal = function useWebTerminal() {
+  return (0, _react.useContext)(WebTerminalContext);
+};
+
+exports.useWebTerminal = useWebTerminal;

package/lib/components/WebTerminal/index.js

@@ -15,7 +15,21 @@ Object.defineProperty(exports, "WebTerminalContentWrapper", {
     return _WebTerminalContentWrapper.WebTerminalContentWrapper;
   }
 });
+Object.defineProperty(exports, "WebTerminalProvider", {
+  enumerable: true,
+  get: function get() {
+    return _hooks.WebTerminalProvider;
+  }
+});
+Object.defineProperty(exports, "useWebTerminal", {
+  enumerable: true,
+  get: function get() {
+    return _hooks.useWebTerminal;
+  }
+});
 
 var _WebTerminal = require("./WebTerminal");
 
-var _WebTerminalContentWrapper = require("./WebTerminalContentWrapper");
+var _WebTerminalContentWrapper = require("./WebTerminalContentWrapper");
+
+var _hooks = require("./hooks");

package/lib/components/WebTerminal/preview-components/Navigation.js

@@ -9,36 +9,38 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _iconsReact = require("@carbon/icons-react");
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
+var _hooks = require("../hooks");
 
-var Navigation = function Navigation(_ref) {
-  var openTerminal = _ref.openTerminal;
-  return /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.Header, {
+var Navigation = function Navigation() {
+  var _useWebTerminal = (0, _hooks.useWebTerminal)(),
+      openWebTerminal = _useWebTerminal.openWebTerminal;
+
+  return /*#__PURE__*/_react.default.createElement(_react2.Header, {
     "aria-label": "IBM Platform Name"
-  }, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.HeaderName, {
+  }, /*#__PURE__*/_react.default.createElement(_react2.HeaderName, {
     href: "#",
     prefix: "IBM"
-  }, "[Platform]"), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.HeaderGlobalBar, null, /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.HeaderGlobalAction, {
+  }, "[Platform]"), /*#__PURE__*/_react.default.createElement(_react2.HeaderGlobalBar, null, /*#__PURE__*/_react.default.createElement(_react2.HeaderGlobalAction, {
     "aria-label": "Web terminal",
-    onClick: openTerminal
-  }, /*#__PURE__*/_react.default.createElement(_iconsReact.Terminal20, null)), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.HeaderGlobalAction, {
+    onClick: openWebTerminal
+  }, /*#__PURE__*/_react.default.createElement(_iconsReact.Terminal, {
+    size: 20
+  })), /*#__PURE__*/_react.default.createElement(_react2.HeaderGlobalAction, {
     "aria-label": "Search",
     onClick: function onClick() {}
-  }, /*#__PURE__*/_react.default.createElement(_iconsReact.Search20, null)), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.HeaderGlobalAction, {
+  }, /*#__PURE__*/_react.default.createElement(_iconsReact.Search, {
+    size: 20
+  })), /*#__PURE__*/_react.default.createElement(_react2.HeaderGlobalAction, {
     "aria-label": "User",
     onClick: function onClick() {}
-  }, /*#__PURE__*/_react.default.createElement(_iconsReact.User20, null))));
+  }, /*#__PURE__*/_react.default.createElement(_iconsReact.User, {
+    size: 20
+  }))));
 };
 
-Navigation.propTypes = {
-  /**
-   * Opens the terminal
-   */
-  openTerminal: _propTypes.default.func.isRequired
-};
 var _default = Navigation;
 exports.default = _default;

package/lib/components/_Canary/Canary.js

@@ -19,7 +19,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _packageSettings = _interopRequireDefault(require("../../global/js/package-settings"));
 
-var _carbonComponentsReact = require("carbon-components-react");
+var _react2 = require("@carbon/react");
 
 var _excluded = ["className", "componentName"];
 // The block part of our conventional BEM class names (blockClass__E--M).
@@ -37,7 +37,7 @@ var Canary = function Canary(_ref
   var instructions = "\nimport { pkg } from '@carbon/ibm-products';\n// NOTE: must happen before component is first used\npkg.component.".concat(componentName, " = true;\n");
   return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, rest, {
     className: (0, _classnames.default)(blockClass, className)
-  }), /*#__PURE__*/_react.default.createElement("h2", null, "This component ", /*#__PURE__*/_react.default.createElement("strong", null, componentName), " is not ready yet."), /*#__PURE__*/_react.default.createElement("p", null, "To enable it, initialize package flags before the component is first used."), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("p", null, "e.g. in main.js"), /*#__PURE__*/_react.default.createElement(_carbonComponentsReact.CodeSnippet, {
+  }), /*#__PURE__*/_react.default.createElement("h2", null, "This component ", /*#__PURE__*/_react.default.createElement("strong", null, componentName), " is not ready yet."), /*#__PURE__*/_react.default.createElement("p", null, "To enable it, initialize package flags before the component is first used."), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("p", null, "e.g. in main.js"), /*#__PURE__*/_react.default.createElement(_react2.CodeSnippet, {
     type: "multi"
   }, instructions), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("p", null, "View a live example on", ' ', /*#__PURE__*/_react.default.createElement("a", {
     href: "https://codesandbox.io/s/example-component-olif5?file=/src/config.js"

package/lib/components/index.js

@@ -321,6 +321,12 @@ Object.defineProperty(exports, "WebTerminalContentWrapper", {
     return _WebTerminal.WebTerminalContentWrapper;
   }
 });
+Object.defineProperty(exports, "WebTerminalProvider", {
+  enumerable: true,
+  get: function get() {
+    return _WebTerminal.WebTerminalProvider;
+  }
+});
 Object.defineProperty(exports, "useActionsColumn", {
   enumerable: true,
   get: function get() {
@@ -405,6 +411,12 @@ Object.defineProperty(exports, "useStickyColumn", {
     return _Datagrid.useStickyColumn;
   }
 });
+Object.defineProperty(exports, "useWebTerminal", {
+  enumerable: true,
+  get: function get() {
+    return _WebTerminal.useWebTerminal;
+  }
+});
 
 var _AboutModal = require("./AboutModal");
 

package/lib/global/js/package-settings.js

@@ -66,6 +66,7 @@ var defaults = {
     ToolbarGroup: false,
     WebTerminal: false,
     WebTerminalContentWrapper: false,
+    WebTerminalProvider: false,
     EditSidePanel: false,
     CancelableTextEdit: false,
     DataSpreadsheet: false,

package/lib/global/js/utils/test-helper.js

@@ -64,7 +64,8 @@ var scssCompile = function scssCompile(file) {
     // When the sass API is revised it may be feasible to switch back to
     // using the API for SCSS compilation and checking.
     execFileSync('sass', [compressed ? '--style=compressed' : '--style=expanded', '--no-source-map', '--load-path', loadPath1, '--load-path', loadPath2, file], {
-      stdio: ['ignore', 'pipe', 'pipe']
+      stdio: ['ignore', 'pipe', 'pipe'],
+      maxBuffer: 1024 * 1024 * 1.5
     }).toString()
   );
 };

package/lib/settings.js

@@ -11,25 +11,16 @@ var _Canary = require("./components/_Canary");
 
 var _packageSettings = _interopRequireDefault(require("./global/js/package-settings"));
 
-var _carbonComponents = require("carbon-components");
-
 var _react = _interopRequireDefault(require("react"));
 
 var _themes = require("@carbon/themes");
 
 var carbon = {
-  get prefix() {
-    return _carbonComponents.settings.prefix;
-  },
-
-  set prefix(val) {
-    _carbonComponents.settings.prefix = val;
-  },
-
   get themes() {
     return _themes.themes;
-  }
+  },
 
+  prefix: 'cds'
 }; // Check that a component is enabled. This function returns a stub which checks
 // the component status on first use and then renders as the component or as
 // a Canary placeholder initialized with the name of the replaced component.

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "1.24.0",
+  "version": "2.0.0-rc.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
+  "installConfig": {
+    "hoistingLimits": "none"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/carbon-design-system/ibm-cloud-cognitive.git",
@@ -50,9 +53,9 @@
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon|^react$|^react-dom$|^chalk$|^react-dnd|^namor)/'"
   },
   "devDependencies": {
-    "@babel/cli": "^7.18.6",
-    "@babel/core": "^7.18.6",
-    "babel-preset-ibm-cloud-cognitive": "^0.14.17",
+    "@babel/cli": "^7.18.10",
+    "@babel/core": "^7.18.10",
+    "babel-preset-ibm-cloud-cognitive": "^0.14.18",
     "chalk": "^4.1.2",
     "change-case": "^4.1.2",
     "copyfiles": "^2.4.1",
@@ -60,18 +63,24 @@
     "fs-extra": "^10.1.0",
     "glob": "^8.0.3",
     "jest": "^28.1.3",
-    "jest-config-ibm-cloud-cognitive": "^0.24.2",
+    "jest-config-ibm-cloud-cognitive": "^0.24.3",
     "jest-environment-jsdom": "^28.1.3",
     "namor": "^1.1.2",
-    "npm-check-updates": "^15.3.3",
+    "npm-check-updates": "^16.0.5",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "yargs": "^17.5.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.18.6",
+    "@babel/runtime": "^7.18.9",
+    "@carbon/grid": "^11.3.0",
+    "@carbon/layout": "^11.3.0",
+    "@carbon/motion": "^11.2.0",
+    "@carbon/react": "^1.9.0-rc.0",
     "@carbon/telemetry": "^0.1.0",
+    "@carbon/themes": "^11.4.0",
+    "@carbon/type": "^11.4.0",
     "immutability-helper": "^3.1.1",
     "react-dnd": "^15.1.2",
     "react-dnd-html5-backend": "^15.1.3",
@@ -80,18 +89,8 @@
     "react-window": "^1.8.7"
   },
   "peerDependencies": {
-    "@carbon/colors": "^10.37.1",
-    "@carbon/icons-react": "^10.49.0",
-    "@carbon/import-once": "^10.7.0",
-    "@carbon/layout": "^10.37.1",
-    "@carbon/motion": "^10.29.0",
-    "@carbon/themes": "^10.54.0",
-    "@carbon/type": "^10.44.0",
-    "carbon-components": "^10.57.2",
-    "carbon-components-react": "^7.57.3",
-    "carbon-icons": "^7.0.7",
     "react": "^16.8.6 || ^17.0.1",
     "react-dom": "^16.8.6 || ^17.0.1"
   },
-  "gitHead": "e03a4b24cc558c658938d5a7f540ce4987a01fd5"
+  "gitHead": "a6d3c1295dbe9918e95c1eb75d53188b7770fb8e"
 }

package/scss/components/APIKeyModal/_api-key-modal.scss

@@ -1,63 +1,52 @@
 //
-// Copyright IBM Corp. 2021, 2021
+// Copyright IBM Corp. 2021, 2022
 //
 // This source code is licensed under the Apache-2.0 license found in the
 // LICENSE file in the root directory of this source tree.
 //
 
 // Standard imports.
-@import '../../global/styles/project-settings';
-
-// APIKeyModal uses the following Carbon components:
-// ComposedModal, ModalHeader, ModalFooter, ModalBody, TextInput,
-// InlineLoading, Form, Button
-@import 'carbon-components/scss/components/modal/modal';
-@import 'carbon-components/scss/components/text-input/text-input';
-@import 'carbon-components/scss/components/inline-loading/inline-loading';
-@import 'carbon-components/scss/components/form/form';
-@import 'carbon-components/scss/components/button/button';
-
-@mixin apikey-modal {
-  $block-class: #{$pkg-prefix}--apikey-modal;
-
-  .#{$block-class} .#{$carbon-prefix}--modal-close {
-    display: none;
-  }
-
-  .#{$block-class} .#{$carbon-prefix}--inline-loading {
-    min-height: 3rem; // increasing the height from 2 to 3 resolves an issue where the scroll bar bounces
-  }
-
-  .#{$block-class} .#{$carbon-prefix}--modal-content {
-    padding-right: $spacing-05;
-  }
-
-  .#{$block-class}__body {
-    padding-right: calc(20% - #{$spacing-05});
-    margin-bottom: $spacing-05;
-  }
-
-  .#{$block-class}__messaging {
-    display: flex;
-    padding-right: calc(20% - #{$spacing-05});
-    margin-top: $spacing-03;
-  }
-
-  .#{$block-class}__messaging-text {
-    flex: 1;
-    margin-left: $spacing-03;
-    @include carbon--type-style('label-01');
-  }
-
-  .#{$block-class}__messaging-text > * {
-    font: inherit;
-  }
-
-  .#{$block-class}__error-icon svg {
-    fill: $danger-01;
-  }
-}
-
-@include exports('apikey-modal') {
-  @include apikey-modal;
+@use '@carbon/styles/scss/theme' as *;
+@use '@carbon/styles/scss/components/button/tokens' as *;
+@use '@carbon/styles/scss/spacing' as *;
+@use '@carbon/styles/scss/type';
+@use '../../global/styles/project-settings' as c4p-settings;
+
+$block-class: #{c4p-settings.$pkg-prefix}--apikey-modal;
+
+.#{$block-class} .#{c4p-settings.$carbon-prefix}--modal-close {
+  display: none;
+}
+
+.#{$block-class} .#{c4p-settings.$carbon-prefix}--inline-loading {
+  min-height: 3rem; // increasing the height from 2 to 3 resolves an issue where the scroll bar bounces
+}
+
+.#{$block-class} .#{c4p-settings.$carbon-prefix}--modal-content {
+  padding-right: $spacing-05;
+}
+
+.#{$block-class}__body {
+  padding-right: calc(20% - #{$spacing-05});
+  margin-bottom: $spacing-05;
+}
+
+.#{$block-class}__messaging {
+  display: flex;
+  padding-right: calc(20% - #{$spacing-05});
+  margin-top: $spacing-03;
+}
+
+.#{$block-class}__messaging-text {
+  flex: 1;
+  margin-left: $spacing-03;
+  @include type.type-style('label-01');
+}
+
+.#{$block-class}__messaging-text > * {
+  font: inherit;
+}
+
+.#{$block-class}__error-icon svg {
+  fill: $button-danger-primary;
 }

package/scss/components/APIKeyModal/_carbon-imports.scss

@@ -0,0 +1,15 @@
+//
+// Copyright IBM Corp. 2022, 2022
+//
+// This source code is licensed under the Apache-2.0 license found in the
+// LICENSE file in the root directory of this source tree.
+//
+
+// APIKeyModal uses the following Carbon components:
+// ComposedModal, ModalHeader, ModalFooter, ModalBody, TextInput,
+// InlineLoading, Form, Button
+@use '@carbon/react/scss/components/modal';
+@use '@carbon/react/scss/components/text-input';
+@use '@carbon/react/scss/components/inline-loading';
+@use '@carbon/react/scss/components/form';
+@use '@carbon/react/scss/components/button';

package/scss/components/APIKeyModal/_index-with-carbon.scss

@@ -0,0 +1,9 @@
+//
+// 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.
+//
+
+@use './carbon-imports';
+@use './api-key-modal';

package/scss/components/APIKeyModal/_index.scss

@@ -7,4 +7,4 @@
 
 // An index file is most useful when you have multiple components
 
-@import './api-key-modal';
+@use './api-key-modal';

package/scss/components/APIKeyModal/_storybook-styles.scss

@@ -5,29 +5,31 @@
 // LICENSE file in the root directory of this source tree.
 //
 
-@import '../../global/styles/project-settings';
+@use '../../global/styles/project-settings' as c4p-settings;
+@use '@carbon/styles/scss/theme' as *;
+@use '@carbon/styles/scss/spacing' as *;
 
-$block-class: #{$pkg-prefix}--apikey-modal;
+$block-class: #{c4p-settings.$pkg-prefix}--apikey-modal;
 
-.#{$block-class} .#{$carbon-prefix}--radio-button-wrapper {
+.#{$block-class} .#{c4p-settings.$carbon-prefix}--radio-button-wrapper {
   margin-bottom: $spacing-02;
 }
 
-.#{$block-class}__permissions.#{$carbon-prefix}--fieldset {
+.#{$block-class}__permissions.#{c4p-settings.$carbon-prefix}--fieldset {
   margin-top: $spacing-05;
   margin-bottom: 0;
 }
 
-.#{$block-class}__resource-toggle.#{$carbon-prefix}--fieldset {
+.#{$block-class}__resource-toggle.#{c4p-settings.$carbon-prefix}--fieldset {
   margin-top: 0;
   margin-bottom: $spacing-05;
 }
 
-.#{$block-class}__resource-name.#{$carbon-prefix}--fieldset {
+.#{$block-class}__resource-name.#{c4p-settings.$carbon-prefix}--fieldset {
   margin-top: 0;
   margin-bottom: 0;
 }
 
-.#{$block-class}__button-loading.#{$carbon-prefix}--btn--primary {
-  background: $link-02;
+.#{$block-class}__button-loading.#{c4p-settings.$carbon-prefix}--btn--primary {
+  background: $link-secondary;
 }