tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Patch webpack-config temporarily

Browse Source
This commit is contained in:
Damian Mooyman 2017-10-03 18:15:41 +13:00
parent 2fc3f80f1f
commit 9a11580563
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.eslintrc.js
View File

@ -1 +1,12 @@
module.exports = require('@silverstripe/webpack-config/.eslintrc'); module.exports = require('@silverstripe/webpack-config/.eslintrc');
// @todo Remove once upgrading webpack-config to 0.4.0
module.exports.settings['import/resolver'].node.moduleDirectory = [
'.',
'client/src',
'../admin/client/src',
'../admin/node_modules',
'vendor/silverstripe/admin/client/src',
'vendor/silverstripe/admin/node_modules',
'node_modules'
];

8
package.json
View File

@ -59,10 +59,10 @@
"moduleDirectories": [ "moduleDirectories": [
"client/src", "client/src",
"node_modules", "node_modules",
"../silverstripe-admin/client/src", "../admin/client/src",
"../silverstripe-admin", "../admin",
"silverstripe-admin/client/src", "vendor/silverstripe/admin/client/src",
"silverstripe-admin", "vendor/silverstripe/admin",
"node_modules/@silverstripe/webpack-config/node_modules" "node_modules/@silverstripe/webpack-config/node_modules"
], ],
"testMatch": [ "testMatch": [