Merge branch 'release/2.0' into feature/fix-categorytile-item-is-not-…

…defined
magento · Nov 19, 2018 · c8fad8d · c8fad8d
2 parents ee75246 + fd9b590
commit c8fad8d
Show file tree

Hide file tree

Showing 63 changed files with 34,551 additions and 26,478 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "prettier": "prettier --write '@(packages|scripts)/**/*.@(js|css)' '*.js'",
     "prettier:check": "prettier --list-different '@(packages|scripts)/**/*.@(js|css)' '*.js'",
     "stage:venia": "cd packages/venia-concept && npm start; cd - >/dev/null",
+    "storybook:venia": "cd packages/venia-concept && npm run storybook",
     "test": "jest",
     "test:ci": "npm run -s test -- -i --json --outputFile=test-results.json",
     "test:debug": "node --inspect-brk node_modules/.bin/jest -i",
@@ -37,7 +38,7 @@
   "devDependencies": {
     "@magento/directive-parser": "^0.1.1",
     "@magento/eslint-config": "^1.2.3",
-    "@storybook/react": "^3.4.2",
+    "@storybook/react": "^4.0.7",
     "apollo-boost": "^0.1.20",
     "apollo-cache-inmemory": "^1.3.9",
     "apollo-client": "^2.4.5",
@@ -118,7 +119,7 @@
     "redux-actions": "^2.6.4",
     "redux-thunk": "^2.3.0",
     "rimraf": "^2.6.2",
-    "storybook-readme": "^3.3.0",
+    "storybook-readme": "^4.0.2",
     "stream-snitch": "0.0.3",
     "strip-ansi": "^4.0.0",
     "style-loader": "^0.23.0",

diff --git a/packages/peregrine/package-lock.json b/packages/peregrine/package-lock.json
diff --git a/packages/peregrine/package.json b/packages/peregrine/package.json
@@ -33,7 +33,7 @@
     "redux-thunk": "^2.3.0"
   },
   "devDependencies": {
-    "@storybook/react": "^3.4.2",
+    "@storybook/react": "^4.0.7",
     "babel-cli": "^6.26.0",
     "babel-runtime": "^6.26.0",
     "react": "^16.6.1",

diff --git a/packages/venia-concept/.storybook/config.js b/packages/venia-concept/.storybook/config.js
@@ -0,0 +1,8 @@
+import { configure } from '@storybook/react';
+
+function loadStories() {
+    const context = require.context('../src', true, /__stories__\/.+\.js$/);
+    context.keys().forEach(context);
+}
+
+configure(loadStories, module);
diff --git a/packages/venia-concept/.storybook/webpack.config.js b/packages/venia-concept/.storybook/webpack.config.js
@@ -0,0 +1,63 @@
+const path = require('path');
+
+const configureBabel = require('../babel.config.js');
+const babelOptions = configureBabel('development');
+console.log(babelOptions);
+
+const base_config = require('./webpack.config.js');
+
+const themePaths = {
+    src: path.resolve(__dirname, '../src'),
+    assets: path.resolve(__dirname, '../web'),
+    output: path.resolve(__dirname, '../web/js'),
+    node: path.resolve(__dirname, '../../../')
+};
+
+console.log(themePaths.node);
+
+const testPath = path.resolve('../');
+
+module.exports = (storybookBaseConfig, configType) => {
+    storybookBaseConfig.module.rules.push({
+        include: [themePaths.src],
+        test: /\.js$/,
+        use: [
+            {
+                loader: 'babel-loader',
+                options: { ...babelOptions, cacheDirectory: true }
+            }
+        ]
+    });
+
+    storybookBaseConfig.module.rules.push({
+        test: /\.css$/,
+        use: [
+            'style-loader',
+            {
+                loader: 'css-loader',
+                options: {
+                    importLoaders: 1,
+                    localIdentName: '[name]-[local]-[hash:base64:3]',
+                    modules: true
+                }
+            }
+        ]
+    });
+
+    storybookBaseConfig.module.rules.push({
+        test: /\.(jpg|svg)$/,
+        use: [
+            {
+                loader: 'file-loader',
+                options: {}
+            }
+        ]
+    });
+
+    storybookBaseConfig.resolve.alias = {
+        src: themePaths.src
+    };
+    storybookBaseConfig.resolve.modules = ['node_modules'];
+
+    return storybookBaseConfig;
+};