From 921d5ce4e6ea04ba2a7a27a54f5d539570b587eb Mon Sep 17 00:00:00 2001
From: Adam Skoufis <askoufis@seek.com.au>
Date: Mon, 17 Apr 2023 09:26:26 +1000
Subject: [PATCH 1/3] Add missing `@vanilla-extract/css` dev dep to
 `braid-design-system` fixture

---
 fixtures/braid-design-system/package.json | 3 +++
 pnpm-lock.yaml                            | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/fixtures/braid-design-system/package.json b/fixtures/braid-design-system/package.json
index 38c372c3c..b756a2e0b 100644
--- a/fixtures/braid-design-system/package.json
+++ b/fixtures/braid-design-system/package.json
@@ -7,5 +7,8 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "sku": "workspace:*"
+  },
+  "devDependencies": {
+    "@vanilla-extract/css": "^1.0.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bcdd1870b..65bec6de3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -67,6 +67,7 @@ importers:
   fixtures/braid-design-system:
     specifiers:
       '@sku-private/test-utils': workspace:*
+      '@vanilla-extract/css': ^1.0.0
       braid-design-system: ^31.0.0
       react: ^17.0.1
       react-dom: ^17.0.1
@@ -77,6 +78,8 @@ importers:
       react: 17.0.2
       react-dom: 17.0.2_react@17.0.2
       sku: link:../../packages/sku
+    devDependencies:
+      '@vanilla-extract/css': 1.11.0
 
   fixtures/configure:
     specifiers:

From 0c7350f7749568a818232b4f07d4fd1ecd18bec4 Mon Sep 17 00:00:00 2001
From: Adam Skoufis <askoufis@seek.com.au>
Date: Mon, 17 Apr 2023 09:26:53 +1000
Subject: [PATCH 2/3] Remove duplicate `relativeTarget` entry from sku context

---
 packages/sku/context/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/sku/context/index.js b/packages/sku/context/index.js
index e434a8251..c5c6540fe 100644
--- a/packages/sku/context/index.js
+++ b/packages/sku/context/index.js
@@ -151,7 +151,6 @@ const paths = {
     : null,
   serverEntry: getPathFromCwd(skuConfig.serverEntry),
   public: getPathFromCwd(skuConfig.public),
-  relativeTarget: skuConfig.target,
   target: getPathFromCwd(skuConfig.target),
   relativeTarget: skuConfig.target,
   publicPath: isStartScript ? '/' : publicPath,

From 04417d9c5c8aeae9394a9f5f9f18f3620dfe056d Mon Sep 17 00:00:00 2001
From: Adam Skoufis <askoufis@seek.com.au>
Date: Mon, 17 Apr 2023 09:27:44 +1000
Subject: [PATCH 3/3] Remove unnecessary CI check from storybook webpack config

---
 .../sku/config/storybook/storybookWebpackConfig.js     | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/sku/config/storybook/storybookWebpackConfig.js b/packages/sku/config/storybook/storybookWebpackConfig.js
index 04f7c1cd7..70211caee 100644
--- a/packages/sku/config/storybook/storybookWebpackConfig.js
+++ b/packages/sku/config/storybook/storybookWebpackConfig.js
@@ -1,22 +1,12 @@
-const webpack = require('webpack');
 const { paths } = require('../../context');
 const find = require('lodash/find');
 const { merge: webpackMerge } = require('webpack-merge');
-const isCI = require('../../lib/isCI');
 const makeWebpackConfig = require('../webpack/webpack.config');
 const { resolvePackage } = require('../webpack/utils/resolvePackage');
 
 const hot = process.env.SKU_HOT !== 'false';
 
 module.exports = ({ config }, { isDevServer }) => {
-  if (isCI) {
-    // Remove noisy progress plugin in CI, currently no official option to disable
-    // https://github.com/storybookjs/storybook/issues/1260#issuecomment-308036626
-    config.plugins = config.plugins.filter(
-      (plugin) => !(plugin instanceof webpack.ProgressPlugin),
-    );
-  }
-
   const clientWebpackConfig = find(
     makeWebpackConfig({
       isIntegration: true,