Merge branch 'main' into pr/2990

.stylelintrc.js

@@ -1,4 +1,7 @@
 module.exports = {
   root: true,
   extends: ['stylelint-config-ibm-products'],
+  rules: {
+    'import-notation': 'string',
+  },
 };

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.2.3.cjs
+yarnPath: .yarn/releases/yarn-3.5.1.cjs

config/babel-preset-ibm-cloud-cognitive/index.js

@@ -31,5 +31,7 @@ module.exports = () => ({
         regenerator: true,
       },
     ],
+    '@babel/plugin-proposal-private-methods',
+    '@babel/plugin-proposal-private-property-in-object',
   ],
 });

config/babel-preset-ibm-cloud-cognitive/package.json

@@ -22,13 +22,13 @@
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon)/'"
   },
   "devDependencies": {
-    "npm-check-updates": "^16.0.6"
+    "npm-check-updates": "^16.10.12"
   },
   "dependencies": {
-    "@babel/core": "^7.18.13",
+    "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-transform-runtime": "^7.18.10",
-    "@babel/preset-env": "^7.18.10",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
     "browserslist-config-carbon": "^10.6.1"
   }

config/cli/package.json

@@ -25,17 +25,17 @@
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon)/'"
   },
   "devDependencies": {
-    "@commitlint/parse": "^17.0.0",
-    "chalk": "^5.0.1",
-    "execa": "^6.1.0",
-    "fast-glob": "^3.2.11",
-    "fs-extra": "^10.1.0",
-    "inquirer": "^9.1.1",
-    "npm-check-updates": "^16.0.6",
-    "prettier": "^2.7.1",
-    "prettier-config-carbon": "^0.7.0",
+    "@commitlint/parse": "^17.4.4",
+    "chalk": "^5.2.0",
+    "execa": "^7.1.1",
+    "fast-glob": "^3.2.12",
+    "fs-extra": "^11.1.1",
+    "inquirer": "^9.1.4",
+    "npm-check-updates": "^16.10.12",
+    "prettier": "^2.8.8",
+    "prettier-config-carbon": "^0.9.0",
     "remark": "^14.0.2",
-    "semver": "^7.3.7",
-    "yargs": "^17.5.1"
+    "semver": "^7.5.0",
+    "yargs": "^17.7.2"
   }
 }

config/jest-config-ibm-cloud-cognitive/index.js

@@ -46,14 +46,18 @@ module.exports = {
     },
   },
   moduleFileExtensions: ['js', 'json', 'node'],
+  modulePathIgnorePatterns: [
+    '<rootDir>/examples',
+    '<rootDir>/packages/security',
+  ],
   resolver: require.resolve('./setup/resolver.js'),
   reporters: ['default'],
   setupFiles: [require.resolve('./setup/setupFiles')],
   setupFilesAfterEnv: [require.resolve('./setup/setupFilesAfterEnv')],
   snapshotSerializers: ['enzyme-to-json/serializer'],
   testEnvironment: 'jsdom',
   testMatch: [
-    '<rootDir>/**/__tests__/**/*.js?(x)',
+    // '<rootDir>/**/__tests__/**/*.js?(x)',
     '<rootDir>/**/*.(spec|test).js?(x)',
     '<rootDir>/**/*-(spec|test).js?(x)',
   ],
@@ -75,7 +79,10 @@ module.exports = {
     'templates',
     '/umd/',
   ],
-  transformIgnorePatterns: ['[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$'],
+  transformIgnorePatterns: [
+    '[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$',
+    'ace-node\\.js',
+  ],
   watchPathIgnorePatterns: [
     '/cjs/',
     '/dist/',

config/jest-config-ibm-cloud-cognitive/package.json

@@ -22,22 +22,22 @@
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon|^chalk$)/'"
   },
   "devDependencies": {
-    "npm-check-updates": "^16.0.6"
+    "npm-check-updates": "^16.10.12"
   },
   "peerDependencies": {
-    "jest": "^29.0.1"
+    "jest": "^29.4.2"
   },
   "dependencies": {
-    "@babel/core": "^7.18.13",
+    "@babel/core": "^7.20.12",
     "@testing-library/jest-dom": "^5.16.5",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
-    "accessibility-checker": "^3.1.35",
-    "axe-core": "^4.4.3",
-    "babel-jest": "^29.0.1",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
+    "accessibility-checker": "^3.1.47",
+    "axe-core": "^4.6.3",
+    "babel-jest": "^29.4.2",
     "babel-preset-ibm-cloud-cognitive": "^0.14.19",
     "chalk": "^4.1.2",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2",
-    "jest-circus": "^29.0.1"
+    "jest-circus": "^29.4.2"
   }
 }

config/jest-config-ibm-cloud-cognitive/setup/setupFiles.js

@@ -26,6 +26,8 @@ global.requestAnimationFrame = (callback) => {
 enzyme.configure({ adapter: new Adapter() });
 
 if (global.HTMLElement) {
+  HTMLCanvasElement.prototype.getContext = jest.fn();
+
   // This is a quirk that we need to bring in due to how our `tabbable` dependency
   // determines what nodes are focusable. Without this override, it's unable to
   // determine whether or not things are visible in JSDOM. With it, we get

config/storybook-addon-carbon-theme/package.json

@@ -42,22 +42,22 @@
     "vue": "*"
   },
   "dependencies": {
-    "@storybook/addons": "6.5.10",
-    "@storybook/api": "6.5.10",
-    "@storybook/client-api": "6.5.10",
-    "@storybook/client-logger": "6.5.10",
-    "@storybook/components": "6.5.10",
-    "@storybook/core-events": "6.5.10",
-    "@storybook/theming": "6.5.10",
-    "core-js": "^3.25.0",
+    "@storybook/addons": "6.5.16",
+    "@storybook/api": "6.5.16",
+    "@storybook/client-api": "6.5.16",
+    "@storybook/client-logger": "6.5.16",
+    "@storybook/components": "6.5.16",
+    "@storybook/core-events": "6.5.16",
+    "@storybook/theming": "6.5.16",
+    "core-js": "^3.28.0",
     "global": "^4.4.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.18.10",
-    "@babel/core": "^7.18.13",
+    "@babel/cli": "^7.20.7",
+    "@babel/core": "^7.20.12",
     "@babel/preset-react": "^7.18.6",
-    "npm-check-updates": "^16.0.6",
+    "npm-check-updates": "^16.10.12",
     "npm-run-all": "^4.1.5",
-    "rimraf": "^3.0.2"
+    "rimraf": "^5.0.0"
   }
 }

config/stylelint-config-ibm-products/package.json

@@ -15,14 +15,14 @@
     "upgrade-dependencies": "npm-check-updates -u --dep dev,peer,prod --color --reject '/(carbon$)/'"
   },
   "peerDependencies": {
-    "stylelint": "^14.11.0"
+    "stylelint": "^15.6.1"
   },
   "devDependencies": {
-    "stylelint-config-carbon": "^1.10.0",
-    "stylelint-config-idiomatic-order": "^8.1.0",
-    "stylelint-config-standard": "^28.0.0",
-    "stylelint-config-standard-scss": "^5.0.0",
-    "stylelint-no-unsupported-browser-features": "^5.0.3",
-    "stylelint-plugin-carbon-tokens": "2.0.0"
+    "stylelint-config-carbon": "^1.12.0",
+    "stylelint-config-idiomatic-order": "^9.0.0",
+    "stylelint-config-standard": "^33.0.0",
+    "stylelint-config-standard-scss": "^9.0.0",
+    "stylelint-no-unsupported-browser-features": "^6.1.0",
+    "stylelint-plugin-carbon-tokens": "2.2.0"
   }
 }

cspell.json

@@ -71,6 +71,7 @@
     "apikey",
     "buildhome",
     "checkmark",
+    "codesandbox",
     "colindex",
     "columnheader",
     "dasharray",
@@ -109,6 +110,7 @@
     "serializers",
     "sidepanel",
     "stackable",
+    "stackblitz",
     "statusicon",
     "structurality",
     "subcomponent",

examples/carbon-for-ibm-products/example-gallery/.gitignore

@@ -1,23 +1,24 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
+# Logs
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

examples/carbon-for-ibm-products/example-gallery/gallery.config.json

@@ -0,0 +1,3 @@
+{
+  "label": "Empty State"
+}

examples/carbon-for-ibm-products/example-gallery/index.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Vite + React</title>
+</head>
+
+<body>
+  <div id="root"></div>
+  <script type="module" src="/src/main.jsx"></script>
+</body>
+
+</html>

examples/carbon-for-ibm-products/example-gallery/package.json

@@ -1,36 +1,40 @@
 {
   "name": "example-gallery",
-  "version": "0.1.0",
+  "description": "An example showing use of the EmptyStates component from the @carbon/ibm-products component library.",
   "keywords": [
     "carbon",
     "ibm",
     "ibm-products",
     "component",
-    "apikeymodal"
+    "EmptyStates",
+    "empty",
+    "state"
   ],
   "license": "Apache-2.0",
-  "main": "src/index.js",
-  "dependencies": {
-    "@carbon/elements": "^10",
-    "@carbon/ibm-products": "latest",
-    "@carbon/icons-react": "^10",
-    "carbon-components": "^10",
-    "@carbon/react": "^7",
-    "carbon-icons": "latest",
-    "react": "latest",
-    "react-dom": "latest",
-    "react-scripts": "latest",
-    "sass": "latest"
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "lint": "eslint src --ext js,jsx --report-unused-disable-directives --max-warnings 0",
+    "preview": "vite preview"
   },
-  "//resolutions:minimist": "https://security.snyk.io/vuln/SNYK-JS-MINIMIST-2429795 (version <=1.2.5)",
-  "resolutions": {
-    "**/request/minimist": "^1.2.6"
+  "dependencies": {
+    "@carbon/ibm-products": "^2.0.0-rc.28",
+    "@carbon/react": "^1.28.0",
+    "lodash": "^4.17.21",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "sass": "^1.62.1"
   },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
+  "devDependencies": {
+    "@types/react": "^18.0.37",
+    "@types/react-dom": "^18.0.11",
+    "@vitejs/plugin-react": "^4.0.0",
+    "eslint": "^8.38.0",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.3.4",
+    "vite": "^4.3.2"
   },
   "eslintConfig": {
     "extends": [
@@ -50,7 +54,9 @@
       "last 1 safari version"
     ]
   },
-  "devDependencies": {
-    "web-vitals": "^2.1.4"
+  "eslintConfig": {
+    "extends": [
+      "react-app"
+    ]
   }
 }