Merge branch 'add-polymer-support' of github.com:storybooks/storybook…

… into add-polymer-support
estevaolucas · Nov 3, 2017 · 64bd0fa · 64bd0fa
2 parents 47131c4 + ead9750
commit 64bd0fa
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/app/polymer/README.md b/app/polymer/README.md
@@ -14,7 +14,7 @@ With it, you can visualize different states of your UI components and develop th
 
 > Storybook for Polymer is at the **EXPERIMENTAL** stage!
 
-![Storybook Screenshot](https://github.com/storybooks/storybook/blob/master/app/vue/docs/demo.gif)
+![Storybook Screenshot](https://github.com/storybooks/storybook/blob/master/app/polymer/docs/demo.gif)
 
 Storybook runs outside of your app.
 So you can develop UI components in isolation without worrying about app specific dependencies and requirements.

diff --git a/app/polymer/package.json b/app/polymer/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@storybook/polymer",
   "version": "3.3.0-alpha.2",
-  "description": "Storybook for Polymer: Develop Vue Component in isolation with Hot Reloading.",
+  "description": "Storybook for Polymer: Develop Polymer Component in isolation with Hot Reloading.",
   "homepage": "https://github.com/storybooks/storybook/tree/master/apps/polymer",
   "bugs": {
     "url": "https://github.com/storybooks/storybook/issues"

diff --git a/app/polymer/src/server/config.js b/app/polymer/src/server/config.js
@@ -48,7 +48,7 @@ export default function(configType, baseConfig, configDir) {
   const customConfigPath = path.resolve(configDir, 'webpack.config.js');
 
   if (!fs.existsSync(customConfigPath)) {
-    logger.info('=> Using default webpack setup based on "vue-cli".');
+    logger.info('=> Using default webpack setup based on "polymer-cli".');
     const configPath = path.resolve(__dirname, './config/defaults/webpack.config.js');
     const customConfig = require(configPath);
 

diff --git a/app/polymer/src/server/config/globals.js b/app/polymer/src/server/config/globals.js
@@ -1,4 +1,4 @@
 /* globals window */
 
 window.STORYBOOK_REACT_CLASSES = {};
-window.STORYBOOK_ENV = 'vue';
+window.STORYBOOK_ENV = 'polymer';
diff --git a/app/polymer/src/server/config/webpack.config.js b/app/polymer/src/server/config/webpack.config.js
@@ -88,7 +88,6 @@ export default function() {
       // Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
       modules: ['node_modules'].concat(nodePaths),
       alias: {
-        vue$: require.resolve('vue/dist/vue.esm.js'),
         react$: require.resolve('react'),
         'react-dom$': require.resolve('react-dom'),
       },

diff --git a/app/polymer/src/server/config/webpack.config.prod.js b/app/polymer/src/server/config/webpack.config.prod.js
@@ -66,9 +66,18 @@ export default function() {
           exclude: excludePaths,
         },
         {
-          test: /\.vue$/,
-          loader: require.resolve('vue-loader'),
-          options: {},
+          test: /\.html$/,
+          exclude: /node_modules\/(?!(polymer-redux|polymer-webpack-loader)\/).*/,
+          use: [
+            {
+              loader: require.resolve('babel-loader'),
+              options: { cacheDirectory: '.babel-cache' },
+            },
+            {
+              loader: require.resolve('polymer-webpack-loader'),
+              options: { processStyleLinks: true },
+            },
+          ],
         },
       ],
     },
@@ -80,7 +89,6 @@ export default function() {
       // Based on this CRA feature: https://github.com/facebookincubator/create-react-app/issues/253
       modules: ['node_modules'].concat(nodePaths),
       alias: {
-        vue$: require.resolve('vue/dist/vue.esm.js'),
         react$: require.resolve('react'),
         'react-dom$': require.resolve('react-dom'),
       },