Merge pull request #195 from pagesource/feature/fixed-storybook-setup

Feature/fixed storybook setup

Author: vinodloha

.changeset/ten-hornets-join.md

@@ -0,0 +1,5 @@
+---
+'create-universal-react': minor
+---
+
+Fixed storybook setup and updated generator-plop version to 1.1.1

templates/common/storybook/.storybook/main.js

@@ -1,3 +1,6 @@
+const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+const path = require('path');
+
 module.exports = {
   addons: [
     '@storybook/addon-a11y',
@@ -6,7 +9,8 @@ module.exports = {
     '@storybook/addon-knobs',
     '@storybook/addon-links',
     'storybook-design-token',
-    '@storybook/addon-viewport'
+    '@storybook/addon-viewport',
+    'storybook-addon-styled-component-theme/dist/preset'
   ],
   framework: '@storybook/react',
   core: {
@@ -16,7 +20,8 @@ module.exports = {
     config.resolve.plugins = [
       ...(config.resolve.plugins || []),
       new TsconfigPathsPlugin({
-        extensions: config.resolve.extensions
+        extensions: config.resolve.extensions,
+        configFile: path.resolve('tsconfig.json')
       })
     ];
     return config;

templates/common/storybook/package.json

@@ -17,11 +17,17 @@
     "@storybook/addon-knobs": "^6.4.0",
     "@storybook/addon-links": "^6.4.18",
     "@storybook/addon-viewport": "^6.4.18",
+    "@storybook/builder-webpack5": "^6.4.18",
     "@storybook/cli": "^6.4.18",
+    "@storybook/manager-webpack5": "^6.4.18",
     "@storybook/react": "^6.4.18",
     "@types/styled-components": "^5.1.22",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
+    "storybook-addon-styled-component-theme": "^2.0.0",
     "storybook-design-token": "^1.2.2",
     "styled-components": "^5.3.1"
+  },
+  "devDependencies": {
+    "tsconfig": "*"
   }
 }

templates/common/storybook/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "tsconfig/base.json",
+  "compilerOptions": {
+    "baseUrl": "."
+  }
+}

templates/root/package.json

@@ -14,9 +14,10 @@
     "@commitlint/cli": "^16.2.1",
     "@commitlint/config-angular": "^16.2.1",
     "@commitlint/prompt-cli": "^16.2.1",
-    "@xt-pagesource/generate-plop": "^1.1.0",
+    "@xt-pagesource/generate-plop": "^1.1.1",
     "husky": "^4.3.8",
     "ts-jest": "^27.1.3",
-    "prettier": "^2.5.1"
+    "prettier": "^2.5.1",
+    "webpack": "^5.70.0"
   }
 }