From 07e47e971161dbf47e5538fbe2124a7094bb3035 Mon Sep 17 00:00:00 2001 From: Brent Jackson Date: Mon, 11 Jun 2018 21:42:29 -0400 Subject: [PATCH 1/2] Edit cli webpack config --- cli/lib/dev.js | 8 +++++++- cli/package.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cli/lib/dev.js b/cli/lib/dev.js index 53cafbbc..888a473b 100644 --- a/cli/lib/dev.js +++ b/cli/lib/dev.js @@ -17,7 +17,7 @@ module.exports = opts => { { test: /\.js$/, exclude: path.resolve(__dirname, '../node_modules'), - include: path.resolve(__dirname), + include: path.resolve(__dirname, '..'), loader: require.resolve('babel-loader'), options: { presets: [ @@ -34,6 +34,12 @@ module.exports = opts => { ], }, resolve: { + modules: [ + __dirname, + path.join(__dirname, '../node_modules'), + path.relative(process.cwd(), path.join(__dirname, '../node_modules')), + 'node_modules' + ], alias: { 'webpack-hot-client/client': path.join(__dirname, '../node_modules/webpack-hot-client/client') } diff --git a/cli/package.json b/cli/package.json index cf1d6fce..1aeceb37 100644 --- a/cli/package.json +++ b/cli/package.json @@ -44,6 +44,7 @@ "pkg-conf": "^2.1.0", "prop-types": "^15.5.10", "react": "^16.4.0", + "styled-components": "^3.3.2", "update-notifier": "^2.5.0" }, "devDependencies": { @@ -55,7 +56,6 @@ "react-test-renderer": "^16.4.0", "rebass": "^2.0.0-2", "refunk": "^3.0.1", - "styled-components": "^3.3.2", "xo": "^0.18.2" }, "publishConfig": { From ed32677be7606b2c95702c2d053d1f1b188f9b5a Mon Sep 17 00:00:00 2001 From: Brent Jackson Date: Mon, 11 Jun 2018 21:42:59 -0400 Subject: [PATCH 2/2] CLI prerelease --- cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/package.json b/cli/package.json index 1aeceb37..724d5bcb 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "@compositor/kit-cli", - "version": "1.0.39", + "version": "1.0.40-6", "description": "Compositor Kit CLI", "license": "MIT", "repository": "c8r/kit-cli",