fix(package.json): missing devDependencies for storybook (#1580)

* fix(package.json): missing devDependencies for storybook * chore(yarn): update * fix(package.jsons, deploy scripts) * fix(yarn): remove install-state.gz
carbon-design-system · Jun 26, 2023 · e208fcc · e208fcc
1 parent c6fd195
commit e208fcc
Show file tree

Hide file tree

Showing 11 changed files with 409 additions and 572 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,14 @@
 
 # Root-level of monorepo
 .vscode/
-.yarn/cache
+
+# Yarn items to not include in repo as they are rebuilt by yarn install
+.yarn/*
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+
 pages/
 
 # Package-level

diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -32,7 +32,7 @@
     "@angular/core": "^16.0.0"
   },
   "dependencies": {
-    "@carbon/charts": "^1.10.0",
+    "@carbon/charts": "workspace:*",
     "@carbon/telemetry": "~0.1.0",
     "tslib": "^2.5.3"
   },
@@ -63,9 +63,12 @@
     "@storybook/manager-api": "^7.0.23",
     "@storybook/testing-library": "^0.2.0",
     "@storybook/theming": "^7.0.23",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@typescript-eslint/eslint-plugin": "^5.60.1",
+    "@typescript-eslint/parser": "^5.60.1",
     "concurrently": "^8.2.0",
+    "d3": "^7.8.5",
+    "d3-cloud": "^1.2.5",
+    "d3-sankey": "^0.12.3",
     "downlevel-dts": "^0.11.0",
     "eslint": "^8.43.0",
     "eslint-config-prettier": "^8.8.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -83,11 +83,11 @@
     "@carbon/colors": "^11.16.0",
     "@carbon/import-once": "^10.7.0",
     "@carbon/layout": "^11.15.0",
-    "@carbon/styles": "^1.31.2",
+    "@carbon/styles": "^1.32.0",
     "@carbon/telemetry": "~0.1.0",
     "@carbon/themes": "^11.20.0",
     "@carbon/utils-position": "^1.1.4",
-    "carbon-components": "^10.58.7",
+    "carbon-components": "^10.58.3",
     "d3": "^7.8.5",
     "d3-cloud": "^1.2.5",
     "d3-sankey": "^0.12.3",
@@ -109,6 +109,9 @@
     },
     "d3-sankey": {
       "optional": true
+    },
+    "sass": {
+      "optional": true
     }
   },
   "devDependencies": {
@@ -129,8 +132,8 @@
     "@types/d3-sankey": "^0.12.1",
     "@types/lodash-es": "^4.17.7",
     "@types/topojson": "^3.2.3",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@typescript-eslint/eslint-plugin": "^5.60.1",
+    "@typescript-eslint/parser": "^5.60.1",
     "concurrently": "^8.2.0",
     "downlevel-dts": "^0.11.0",
     "eslint": "^8.43.0",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -41,7 +41,7 @@
     "clean": "rm -rf dist demo/bundle"
   },
   "dependencies": {
-    "@carbon/charts": "^1.10.0",
+    "@carbon/charts": "workspace:*",
     "@carbon/icons-react": "^11.21.0",
     "@carbon/telemetry": "~0.1.0"
   },
@@ -70,14 +70,17 @@
     "@storybook/testing-library": "^0.2.0",
     "@storybook/theming": "^7.0.23",
     "@types/carbon__icons-react": "^11.20.0",
-    "@types/react": "^18.2.13",
+    "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@typescript-eslint/eslint-plugin": "^5.60.1",
+    "@typescript-eslint/parser": "^5.60.1",
     "@vitejs/plugin-react": "^4.0.1",
     "classnames": "^2.3.2",
     "concurrently": "^8.2.0",
     "css-loader": "6.8.1",
+    "d3": "^7.8.5",
+    "d3-cloud": "^1.2.5",
+    "d3-sankey": "^0.12.3",
     "downlevel-dts": "^0.11.0",
     "eslint": "^8.43.0",
     "eslint-config-prettier": "^8.8.0",

diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -41,7 +41,7 @@
     "svelte": "^3.31.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@carbon/charts": "^1.10.0",
+    "@carbon/charts": "workspace:*",
     "@carbon/telemetry": "~0.1.0",
     "@stackblitz/sdk": "^1.9.0",
     "@storybook/addon-essentials": "^7.0.23",
@@ -54,11 +54,14 @@
     "@storybook/testing-library": "^0.2.0",
     "@storybook/theming": "^7.0.23",
     "@sveltejs/adapter-auto": "^2.1.0",
-    "@sveltejs/kit": "^1.20.4",
-    "@sveltejs/package": "^2.0.2",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
+    "@sveltejs/kit": "^1.20.5",
+    "@sveltejs/package": "^2.1.0",
+    "@typescript-eslint/eslint-plugin": "^5.60.1",
+    "@typescript-eslint/parser": "^5.60.1",
     "concurrently": "^8.2.0",
+    "d3": "^7.8.5",
+    "d3-cloud": "^1.2.5",
+    "d3-sankey": "^0.12.3",
     "eslint": "^8.43.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-storybook": "^0.6.12",

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -44,7 +44,7 @@
     "vue": "^2.7.0"
   },
   "dependencies": {
-    "@carbon/charts": "^1.10.0",
+    "@carbon/charts": "workspace:*",
     "@carbon/telemetry": "~0.1.0",
     "vue": "^2.7.14"
   },
@@ -60,15 +60,16 @@
     "@storybook/testing-library": "^0.2.0",
     "@storybook/theming": "^7.0.23",
     "@storybook/vue-vite": "^7.0.23",
-    "@vitejs/plugin-vue": "^4.2.3",
     "@vue/eslint-config-prettier": "^7.1.0",
     "@vue/eslint-config-typescript": "^11.0.3",
-    "@vue/tsconfig": "^0.4.0",
     "concurrently": "^8.2.0",
+    "d3": "^7.8.5",
+    "d3-cloud": "^1.2.5",
+    "d3-sankey": "^0.12.3",
     "downlevel-dts": "^0.11.0",
     "eslint": "^8.43.0",
     "eslint-plugin-storybook": "^0.6.12",
-    "eslint-plugin-vue": "^9.15.0",
+    "eslint-plugin-vue": "^9.15.1",
     "prettier": "^2.8.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/packages/vue/vue.config.js b/packages/vue/vue.config.js
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -18,14 +18,19 @@ git pull
 # Use latest dependencies
 yarn install
 
+# At this point, there could be a new yarn.lock (install-state.gz is now gitignored)
+git add yarn.lock
+git commit --allow-empty -m "chore(repo): yarn lock preventative commit"
+
 # Create version, changelogs and Github release
 echo "Creating version, changelogs and publishing to Github..."
-npx lerna version minor --yes --force-publish --conventional-commits --create-release github
+npx lerna version --yes --force-publish --conventional-commits --create-release github
 
 echo "Rebuild packages and demos so dist and demo/bundle directories are updated..."
 yarn build
 
-node scripts/update-angular-dependency-version.cjs
+# Should not be needed
+# node scripts/update-angular-dependency-version.cjs
 
 # Authenticate with npm registry
 npm config set //registry.npmjs.org/:_authToken=$NPM_TOKEN -q

diff --git a/scripts/next.sh b/scripts/next.sh
@@ -11,19 +11,24 @@ echo "https://${GH_TOKEN}:@github.com" > .git/credentials 2>/dev/null
 
 # Get git into the right state, ensure local branch is up-to-date
 git stash
-git checkout pr-1554
+git checkout issue-1579
 git pull
 
 # Use latest dependencies
 yarn install
 
-# Create next prerelease version (1.9.0-next.2, 1.9.0-next.3, etc.)
+# At this point, there could be a new yarn.lock (install-state.gz is now gitignored)
+git add yarn.lock
+git commit --allow-empty -m "chore(repo): yarn lock preventative commit"
+
+# Create next prerelease version (1.11.0-next.0, etc.)
 npx lerna version prerelease --preid next --force-publish
 
 # For angular package, copies the version to dist/package.json using ng-packagr
 yarn build
 
-node scripts/update-angular-dependency-version.cjs
+# Should not be needed
+# node scripts/update-angular-dependency-version.cjs
 
 npm config set //registry.npmjs.org/:_authToken=$NPM_TOKEN -q