From e2c8b6efd9dea7940aac847b184ca78c1b3446d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9on=20Rodenburg?= Date: Fri, 3 Nov 2017 13:37:26 +0100 Subject: [PATCH] Use node_modules in examples/polymer-cli dir instead of project root --- .../src/server/config/webpack.config.js | 11 +- .../src/server/config/webpack.config.prod.js | 12 +- examples/polymer-cli/package.json | 7 +- .../polymer-cli/src/PlaygroundButton.html | 2 +- examples/polymer-cli/src/stories/index.js | 8 +- examples/polymer-cli/yarn.lock | 1738 ++++++++++- package.json | 1 - yarn.lock | 2613 +---------------- 8 files changed, 1791 insertions(+), 2601 deletions(-) diff --git a/app/polymer/src/server/config/webpack.config.js b/app/polymer/src/server/config/webpack.config.js index e13791b126d..780c6c14385 100644 --- a/app/polymer/src/server/config/webpack.config.js +++ b/app/polymer/src/server/config/webpack.config.js @@ -66,16 +66,7 @@ export default function() { }, { test: /\.html$/, - use: [ - { - loader: require.resolve('babel-loader'), - options: { cacheDirectory: '.babel-cache' }, - }, - { - loader: require.resolve('polymer-webpack-loader'), - options: { processStyleLinks: true }, - }, - ], + use: [require.resolve('babel-loader'), require.resolve('polymer-webpack-loader')], }, ], }, diff --git a/app/polymer/src/server/config/webpack.config.prod.js b/app/polymer/src/server/config/webpack.config.prod.js index 5a1eb640e25..392fab22570 100644 --- a/app/polymer/src/server/config/webpack.config.prod.js +++ b/app/polymer/src/server/config/webpack.config.prod.js @@ -67,17 +67,7 @@ export default function() { }, { 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 }, - }, - ], + use: [require.resolve('babel-loader'), require.resolve('polymer-webpack-loader')], }, ], }, diff --git a/examples/polymer-cli/package.json b/examples/polymer-cli/package.json index 01974308b27..c30ac64db2c 100644 --- a/examples/polymer-cli/package.json +++ b/examples/polymer-cli/package.json @@ -3,11 +3,11 @@ "version": "1.0.0", "scripts": { "start": "webpack-dev-server", - "storybook": "start-storybook -p 6006", - "build-storybook": "build-storybook" + "storybook": "start-storybook -p 9001 -c .storybook" }, "dependencies": { "@polymer/polymer": "^2.2.0", + "@storybook/polymer": "file:../../packs/storybook-polymer.tgz", "@webcomponents/webcomponentsjs": "^1.0.17", "polymer-cli": "1.5.2", "polymer-webpack-loader": "^2.0.0", @@ -21,7 +21,6 @@ "babel-preset-stage-2": "^6.24.1", "copy-webpack-plugin": "^4.2.0", "html-webpack-plugin": "^2.30.1", - "webpack-dev-server": "^2.9.4", - "@storybook/polymer": "^3.3.0-alpha.2" + "webpack-dev-server": "^2.9.4" } } diff --git a/examples/polymer-cli/src/PlaygroundButton.html b/examples/polymer-cli/src/PlaygroundButton.html index dfc8ea6aae1..eb11ded1a66 100644 --- a/examples/polymer-cli/src/PlaygroundButton.html +++ b/examples/polymer-cli/src/PlaygroundButton.html @@ -1,4 +1,4 @@ - +