Skip to content

Commit

Permalink
adds datawheel-canon root to web pack resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
davelandry committed Feb 14, 2017
1 parent 8cd56b5 commit 4d6b157
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion webpack/webpack.config.dev-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module.exports = {
loaders: commonLoaders
},
resolve: {
root: [appDir, appPath],
root: [appDir, appPath, path.join(__dirname, "..")],
extensions: ["", ".js", ".jsx", ".css"]
},
plugins: [
Expand Down
5 changes: 1 addition & 4 deletions webpack/webpack.config.dev-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ const assetsPath = path.join(appDir, "static", "assets");
const publicPath = "/assets/";
const appPath = path.join(appDir, "app");

console.log("appDir:", appDir);
console.log("myPath:", __dirname);

const commonLoaders = [
{
test: /\.js$|\.jsx$/,
Expand Down Expand Up @@ -45,7 +42,7 @@ module.exports = {
loaders: commonLoaders
},
resolve: {
root: [appDir, appPath],
root: [appDir, appPath, path.join(__dirname, "..")],
extensions: ["", ".js", ".jsx", ".css"]
},
plugins: [
Expand Down
4 changes: 2 additions & 2 deletions webpack/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = [
loaders: commonLoaders
},
resolve: {
root: [appDir, appPath],
root: [appDir, appPath, path.join(__dirname, "..")],
extensions: ["", ".js", ".jsx", ".css"]
},
plugins: [
Expand All @@ -89,7 +89,7 @@ module.exports = [
loaders: commonLoaders
},
resolve: {
root: [appDir, appPath],
root: [appDir, appPath, path.join(__dirname, "..")],
extensions: ["", ".js", ".jsx", ".css"]
},
plugins: [
Expand Down

0 comments on commit 4d6b157

Please sign in to comment.