Merge branch 'master' into ndelangen/add-dirname

storybookjs · Jan 26, 2018 · 243366c · 243366c
2 parents 237e9b7 + ba3da9d
commit 243366c
Show file tree

Hide file tree

Showing 31 changed files with 134 additions and 75 deletions.
diff --git a/app/angular/package.json b/app/angular/package.json
@@ -30,7 +30,7 @@
  "@storybook/core": "^3.4.0-alpha.5",
  "@storybook/node-logger": "^3.4.0-alpha.5",
  "@storybook/ui": "^3.4.0-alpha.5",
- "airbnb-js-shims": "^1.1.1",
+ "airbnb-js-shims": "^1.4.1",
  "angular2-template-loader": "^0.6.2",
  "autoprefixer": "^7.2.5",
  "babel-core": "^6.26.0",
@@ -50,6 +50,7 @@
  "core-js": "^2.4.1",
  "cross-env": "^5.1.1",
  "css-loader": "^0.28.9",
+ "dotenv-webpack": "^1.5.4",
  "express": "^4.15.3",
  "file-loader": "^0.11.1",
  "find-cache-dir": "^1.0.0",
@@ -68,6 +69,7 @@
  "qs": "^6.5.1",
  "raw-loader": "^0.5.1",
  "react": "^16.0.0",
+ "react-dev-utils": "^5.0.0",
  "react-dom": "^16.0.0",
  "react-modal": "^2.2.4",
  "redux": "^3.6.0",

diff --git a/app/angular/src/server/build.js b/app/angular/src/server/build.js
@@ -1,3 +1,5 @@
+import '@storybook/core/env';
+
 import webpack from 'webpack';
 import program from 'commander';
 import path from 'path';

diff --git a/app/angular/src/server/config/webpack.config.js b/app/angular/src/server/config/webpack.config.js
@@ -1,5 +1,7 @@
 import path from 'path';
 import webpack from 'webpack';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { managerPath } from '@storybook/core/client';
@@ -27,6 +29,7 @@ export default function(configDir) {
  publicPath: '/',
  },
  plugins: [
+ new InterpolateHtmlPlugin(process.env),
  new HtmlWebpackPlugin({
  filename: 'index.html',
  chunks: ['manager'],
@@ -53,6 +56,7 @@ export default function(configDir) {
  /angular(\\|\/)core(\\|\/)(@angular|esm5)/,
  path.resolve(__dirname, '../src')
  ),
+ new Dotenv({ silent: true }),
  ],
  module: {
  rules: [

diff --git a/app/angular/src/server/config/webpack.config.prod.js b/app/angular/src/server/config/webpack.config.prod.js
@@ -1,6 +1,8 @@
 import path from 'path';
 import webpack from 'webpack';
 import UglifyJsPlugin from 'uglifyjs-webpack-plugin';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { managerPath } from '@storybook/core/client';
 
@@ -29,6 +31,7 @@ export default function(configDir) {
  publicPath: '',
  },
  plugins: [
+ new InterpolateHtmlPlugin(process.env),
  new HtmlWebpackPlugin({
  filename: 'index.html',
  chunks: ['manager'],
@@ -65,6 +68,7 @@ export default function(configDir) {
  /angular(\\|\/)core(\\|\/)(@angular|esm5)/,
  path.resolve(__dirname, '../src')
  ),
+ new Dotenv({ silent: true }),
  ],
  module: {
  rules: [

diff --git a/app/angular/src/server/index.js b/app/angular/src/server/index.js
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+import '@storybook/core/env';
 
 import express from 'express';
 import https from 'https';

diff --git a/app/polymer/package.json b/app/polymer/package.json
@@ -29,7 +29,7 @@
  "@storybook/node-logger": "^3.4.0-alpha.5",
  "@storybook/ui": "^3.4.0-alpha.5",
  "@webcomponents/webcomponentsjs": "^1.1.0",
- "airbnb-js-shims": "^1.3.0",
+ "airbnb-js-shims": "^1.4.1",
  "autoprefixer": "^7.1.6",
  "babel-core": "^6.26.0",
  "babel-loader": "^7.1.2",
@@ -52,6 +52,7 @@
  "copy-webpack-plugin": "^4.2.0",
  "core-js": "^2.5.1",
  "css-loader": "^0.28.9",
+ "dotenv-webpack": "^1.5.4",
  "express": "^4.16.2",
  "file-loader": "^0.11.2",
  "find-cache-dir": "^1.0.0",
@@ -67,6 +68,7 @@
  "prop-types": "^15.6.0",
  "qs": "^6.5.1",
  "react": "^16.0.0",
+ "react-dev-utils": "^5.0.0",
  "react-dom": "^16.0.0",
  "react-modal": "^2.4.1",
  "redux": "^3.7.2",

diff --git a/app/polymer/src/server/build.js b/app/polymer/src/server/build.js
@@ -1,3 +1,5 @@
+import '@storybook/core/env';
+
 import webpack from 'webpack';
 import program from 'commander';
 import path from 'path';

diff --git a/app/polymer/src/server/config/webpack.config.js b/app/polymer/src/server/config/webpack.config.js
@@ -1,5 +1,7 @@
 import path from 'path';
 import webpack from 'webpack';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
@@ -35,6 +37,7 @@ export default function() {
  publicPath: '/',
  },
  plugins: [
+ new InterpolateHtmlPlugin(process.env),
  new HtmlWebpackPlugin({
  filename: 'index.html',
  chunks: ['manager'],
@@ -61,6 +64,7 @@ export default function() {
  new CaseSensitivePathsPlugin(),
  new WatchMissingNodeModulesPlugin(nodeModulesPaths),
  new webpack.ProgressPlugin(),
+ new Dotenv({ silent: true }),
  ],
  module: {
  rules: [

diff --git a/app/polymer/src/server/config/webpack.config.prod.js b/app/polymer/src/server/config/webpack.config.prod.js
@@ -1,4 +1,6 @@
 import webpack from 'webpack';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
 import { managerPath } from '@storybook/core/client';
@@ -27,6 +29,7 @@ export default function() {
  publicPath: '',
  },
  plugins: [
+ new InterpolateHtmlPlugin(process.env),
  new HtmlWebpackPlugin({
  filename: 'index.html',
  chunks: ['manager'],
@@ -60,6 +63,7 @@ export default function() {
  screw_ie8: true,
  },
  }),
+ new Dotenv({ silent: true }),
  ],
  module: {
  rules: [

diff --git a/app/polymer/src/server/index.js b/app/polymer/src/server/index.js
@@ -1,3 +1,5 @@
+import '@storybook/core/env';
+
 import express from 'express';
 import https from 'https';
 import favicon from 'serve-favicon';

diff --git a/app/react/package.json b/app/react/package.json
@@ -31,7 +31,7 @@
  "@storybook/core": "^3.4.0-alpha.5",
  "@storybook/node-logger": "^3.4.0-alpha.5",
  "@storybook/ui": "^3.4.0-alpha.5",
- "airbnb-js-shims": "^1.4.0",
+ "airbnb-js-shims": "^1.4.1",
  "autoprefixer": "^7.2.5",
  "babel-loader": "^7.1.2",
  "babel-plugin-macros": "^2.0.0",
@@ -70,6 +70,7 @@
  "postcss-loader": "^2.0.10",
  "prop-types": "^15.6.0",
  "qs": "^6.5.1",
+ "react-dev-utils": "^5.0.0",
  "redux": "^3.7.2",
  "request": "^2.83.0",
  "serve-favicon": "^2.4.5",

diff --git a/app/react/src/server/build.js b/app/react/src/server/build.js
@@ -1,3 +1,5 @@
+import '@storybook/core/env';
+
 import webpack from 'webpack';
 import program from 'commander';
 import path from 'path';

diff --git a/app/react/src/server/config/webpack.config.js b/app/react/src/server/config/webpack.config.js
@@ -1,6 +1,7 @@
 import path from 'path';
 import webpack from 'webpack';
 import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { managerPath } from '@storybook/core/client';
@@ -28,6 +29,7 @@ export default function(configDir) {
  publicPath: '/',
  },
  plugins: [
+ new InterpolateHtmlPlugin(process.env),
  new HtmlWebpackPlugin({
  filename: 'index.html',
  chunks: ['manager'],
@@ -50,7 +52,7 @@ export default function(configDir) {
  new CaseSensitivePathsPlugin(),
  new WatchMissingNodeModulesPlugin(nodeModulesPaths),
  new webpack.ProgressPlugin(),
- new Dotenv(),
+ new Dotenv({ silent: true }),
  ],
  module: {
  rules: [

diff --git a/app/react/src/server/config/webpack.config.prod.js b/app/react/src/server/config/webpack.config.prod.js
@@ -1,5 +1,7 @@
 import webpack from 'webpack';
 import UglifyJsPlugin from 'uglifyjs-webpack-plugin';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { managerPath } from '@storybook/core/client';
 import babelLoaderConfig from './babel.prod';
@@ -27,6 +29,7 @@ export default function(configDir) {
  publicPath: '',
  },
  plugins: [
+ new InterpolateHtmlPlugin(process.env),
  new HtmlWebpackPlugin({
  filename: 'index.html',
  chunks: ['manager'],
@@ -59,6 +62,7 @@ export default function(configDir) {
  },
  },
  }),
+ new Dotenv({ silent: true }),
  ],
  module: {
  rules: [

diff --git a/app/react/src/server/index.js b/app/react/src/server/index.js
@@ -1,3 +1,5 @@
+import '@storybook/core/env';
+
 import express from 'express';
 import https from 'https';
 import favicon from 'serve-favicon';

diff --git a/app/vue/package.json b/app/vue/package.json
@@ -29,7 +29,7 @@
  "@storybook/channel-postmessage": "^3.4.0-alpha.5",
  "@storybook/core": "^3.4.0-alpha.5",
  "@storybook/ui": "^3.4.0-alpha.5",
- "airbnb-js-shims": "^1.4.0",
+ "airbnb-js-shims": "^1.4.1",
  "autoprefixer": "^7.2.5",
  "babel-loader": "^7.1.2",
  "babel-plugin-macros": "^2.0.0",
@@ -65,6 +65,7 @@
  "prop-types": "^15.6.0",
  "qs": "^6.5.1",
  "react": "^16.2.0",
+ "react-dev-utils": "^5.0.0",
  "react-dom": "^16.2.0",
  "redux": "^3.7.2",
  "request": "^2.83.0",

diff --git a/app/vue/src/server/build.js b/app/vue/src/server/build.js
@@ -1,3 +1,5 @@
+import '@storybook/core/env';
+
 import webpack from 'webpack';
 import program from 'commander';
 import path from 'path';

diff --git a/app/vue/src/server/config/webpack.config.js b/app/vue/src/server/config/webpack.config.js
@@ -1,6 +1,7 @@
 import path from 'path';
 import webpack from 'webpack';
 import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { managerPath } from '@storybook/core/client';
@@ -28,6 +29,7 @@ export default function(configDir) {
  publicPath: '/',
  },
  plugins: [
+ new InterpolateHtmlPlugin(process.env),
  new HtmlWebpackPlugin({
  filename: 'index.html',
  chunks: ['manager'],
@@ -50,7 +52,7 @@ export default function(configDir) {
  new CaseSensitivePathsPlugin(),
  new WatchMissingNodeModulesPlugin(nodeModulesPaths),
  new webpack.ProgressPlugin(),
- new Dotenv(),
+ new Dotenv({ silent: true }),
  ],
  module: {
  rules: [

diff --git a/app/vue/src/server/config/webpack.config.prod.js b/app/vue/src/server/config/webpack.config.prod.js
@@ -1,5 +1,7 @@
 import webpack from 'webpack';
 import UglifyJsPlugin from 'uglifyjs-webpack-plugin';
+import Dotenv from 'dotenv-webpack';
+import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import { managerPath } from '@storybook/core/client';
 import babelLoaderConfig from './babel.prod';
@@ -27,6 +29,7 @@ export default function(configDir) {
  publicPath: '',
  },
  plugins: [
+ new InterpolateHtmlPlugin(process.env),
  new HtmlWebpackPlugin({
  filename: 'index.html',
  chunks: ['manager'],
@@ -59,6 +62,7 @@ export default function(configDir) {
  },
  },
  }),
+ new Dotenv({ silent: true }),
  ],
  module: {
  rules: [

diff --git a/app/vue/src/server/index.js b/app/vue/src/server/index.js
@@ -1,3 +1,5 @@
+import '@storybook/core/env';
+
 import express from 'express';
 import https from 'https';
 import favicon from 'serve-favicon';

diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
@@ -13,23 +13,23 @@
  "test": "ng test"
  },
  "dependencies": {
- "@angular/animations": "^5.2.1",
- "@angular/common": "^5.2.1",
- "@angular/compiler": "^5.2.1",
- "@angular/core": "^5.2.1",
- "@angular/forms": "^5.2.1",
- "@angular/http": "^5.2.1",
- "@angular/platform-browser": "^5.2.1",
- "@angular/platform-browser-dynamic": "^5.2.1",
- "@angular/router": "^5.2.1",
+ "@angular/animations": "^5.2.2",
+ "@angular/common": "^5.2.2",
+ "@angular/compiler": "^5.2.2",
+ "@angular/core": "^5.2.2",
+ "@angular/forms": "^5.2.2",
+ "@angular/http": "^5.2.2",
+ "@angular/platform-browser": "^5.2.2",
+ "@angular/platform-browser-dynamic": "^5.2.2",
+ "@angular/router": "^5.2.2",
  "core-js": "^2.4.1",
  "rxjs": "^5.4.2",
  "zone.js": "^0.8.20"
  },
  "devDependencies": {
  "@angular/cli": "1.6.5",
- "@angular/compiler-cli": "^5.2.1",
- "@angular/language-service": "^5.2.1",
+ "@angular/compiler-cli": "^5.2.2",
+ "@angular/language-service": "^5.2.2",
  "@storybook/addon-actions": "^3.4.0-alpha.5",
  "@storybook/addon-links": "^3.4.0-alpha.5",
  "@storybook/addon-notes": "^3.4.0-alpha.5",

diff --git a/examples/official-storybook/.env b/examples/official-storybook/.env
@@ -0,0 +1 @@
+DISPLAY_WARNING=none
diff --git a/examples/official-storybook/addons.js b/examples/official-storybook/addons.js
@@ -11,4 +11,4 @@ import '@storybook/addon-jest/register';
 
 import addHeadWarning from './head-warning';
 
-addHeadWarning('Manager');
+addHeadWarning('Manager head not loaded', 'manager-head-not-loaded');
diff --git a/examples/official-storybook/config.js b/examples/official-storybook/config.js
@@ -4,7 +4,8 @@ import { setOptions } from '@storybook/addon-options';
 import 'react-chromatic/storybook-addon';
 import addHeadWarning from './head-warning';
 
-addHeadWarning('Preview');
+addHeadWarning('Preview head not loaded', 'preview-head-not-loaded');
+addHeadWarning('Dotenv file not loaded', 'dotenv-file-not-loaded');
 
 setOptions({
  hierarchySeparator: /\/|\./,

diff --git a/examples/official-storybook/head-warning.js b/examples/official-storybook/head-warning.js
@@ -1,9 +1,9 @@
 import { document } from 'global';
 
-export default function addHeadWarning(bundle) {
+export default function addHeadWarning(text, className) {
  const warning = document.createElement('h1');
- warning.textContent = `${bundle} head not loaded`;
- warning.className = `${bundle.toLowerCase()}-head-not-loaded`;
+ warning.textContent = text;
+ warning.className = className;
  warning.style.color = 'red';
 
  document.body.insertBefore(warning, document.body.firstChild);