From 4eff00d4cf87f021fc0ef9b1db93d9a7618c5cdd Mon Sep 17 00:00:00 2001 From: James Date: Thu, 26 Jul 2018 17:00:13 -0400 Subject: [PATCH] god knows --- config/webpack.demo.config.js | 16 +++++++++++----- demo/client/index.js | 2 +- package.json | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/config/webpack.demo.config.js b/config/webpack.demo.config.js index 4d411ffffd..fdea0854bb 100644 --- a/config/webpack.demo.config.js +++ b/config/webpack.demo.config.js @@ -2,6 +2,7 @@ const merge = require('webpack-merge'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const baseConfig = require('./webpack.base.config'); const optConfig = require('./webpack.opt.config'); +const path = require('path'); const demoConfig = { entry: './demo/client/index.js', @@ -10,12 +11,17 @@ const demoConfig = { template: './demo/client/index.html', filename: './index.html' }) - ] + ], + resolve: { + alias: { + Payload: path.resolve(__dirname, '../src') + } + } }; // Instead of simply merging the base and demo configs, -// we need to replace the plugisn array entirely -// as local development will feature a different index.html entry point -module.exports = merge.strategy({ +// we need to replace the plugins array entirely +// as module demo / development will feature a different index.html entry point +module.exports = merge.strategy({ plugins: 'replace' -})(baseConfig, optConfig, demoConfig); \ No newline at end of file +})(baseConfig, optConfig, demoConfig); diff --git a/demo/client/index.js b/demo/client/index.js index dcafeeeb39..a0f5fccf91 100644 --- a/demo/client/index.js +++ b/demo/client/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { render } from 'react-dom'; -import Sidebar from '../../src/client/components/Sidebar'; +import Sidebar from 'Payload/client/components/Sidebar'; import './testStyles.css'; diff --git a/package.json b/package.json index f0c971b42f..0494ec000c 100644 --- a/package.json +++ b/package.json @@ -57,4 +57,4 @@ "webpack-dev-server": "^3.1.4", "webpack-merge": "^4.1.3" } -} \ No newline at end of file +}