From 9f68fc144d96986350076394f38a17423ca56147 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Thu, 6 Jul 2017 11:41:43 +0100 Subject: [PATCH] Fix links Former-commit-id: 62284b15432e0641de2b47e1e1c2cc77c457ab3e [formerly 3ac1bfe2dd55541aad63101a3d4c9cca19c5fa4d] [formerly 3bd3010c32560f167acac5527acca1a1011d9243 [formerly 0f3364ad3e1ee68fedae65bd93546db3e6923600]] Former-commit-id: 3c112e30732d1ddc6d41bc47d4a9289bcf901e35 [formerly 9bd68f64d507a9aae08af15de02a6d7e87872351] Former-commit-id: bcf8da9501ed31fac185546540f44ead04330b9c --- assets/build/webpack.dev.conf.js | 4 ++-- assets/build/webpack.prod.conf.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/build/webpack.dev.conf.js b/assets/build/webpack.dev.conf.js index ce961a9f..dd75ac4e 100644 --- a/assets/build/webpack.dev.conf.js +++ b/assets/build/webpack.dev.conf.js @@ -55,7 +55,7 @@ module.exports = merge(baseWebpackConfig, { module.resource && /\.js$/.test(module.resource) && module.resource.indexOf( - path.join(__dirname, '../node_modules') + path.join(__dirname, '../../node_modules') ) === 0 ) } @@ -73,7 +73,7 @@ module.exports = merge(baseWebpackConfig, { ignore: ['.*'] }, { - from: path.resolve(__dirname, '../node_modules/codemirror/mode/*/*'), + from: path.resolve(__dirname, '../../node_modules/codemirror/mode/*/*'), to: path.join(config.assetsSubDirectory, 'js/codemirror/mode/[name]/[name].js') } ]) diff --git a/assets/build/webpack.prod.conf.js b/assets/build/webpack.prod.conf.js index 71851a6f..7912ad3f 100644 --- a/assets/build/webpack.prod.conf.js +++ b/assets/build/webpack.prod.conf.js @@ -35,7 +35,7 @@ var webpackConfig = merge(baseWebpackConfig, { ignore: ['.*'] }, { - from: path.resolve(__dirname, '../node_modules/codemirror/mode/*/*'), + from: path.resolve(__dirname, '../../node_modules/codemirror/mode/*/*'), to: path.join(config.assetsSubDirectory, 'js/codemirror/mode/[name]/[name].js'), transform: function (source, path) { let result = UglifyJS.minify(source.toString('utf8')) @@ -96,7 +96,7 @@ var webpackConfig = merge(baseWebpackConfig, { module.resource && /\.js$/.test(module.resource) && module.resource.indexOf( - path.join(__dirname, '../node_modules') + path.join(__dirname, '../../node_modules') ) === 0 ) }