Merge pull request #1982 from open-sausages/pulls/4.0/fix-vendor-issues

Fix regressions from vendor modularisation
This commit is contained in:
Ingo Schommer 2017-10-04 00:17:57 +13:00 committed by GitHub
commit 46e2b19337
4 changed files with 22 additions and 9 deletions

View File

@ -1 +1,12 @@
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'
];

View File

@ -72,4 +72,4 @@ after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
after_failure:
- if [[ $BEHAT_TEST ]]; then php ./framework/tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./artifacts/; fi
- if [[ $BEHAT_TEST ]]; then php ./vendor/silverstripe/framework/tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./artifacts/; fi

View File

@ -16,10 +16,12 @@ call_user_func(function () {
// Enable insert-link to internal pages
TinyMCEConfig::get('cms')
->enablePlugins(array(
'sslinkinternal' => $module->getResource('client/dist/js/TinyMCE_sslink-internal.js')->getURL(),
'sslinkanchor' => $module->getResource('client/dist/js/TinyMCE_sslink-anchor.js')->getURL()
));
->enablePlugins([
'sslinkinternal' => $module
->getResource('client/dist/js/TinyMCE_sslink-internal.js'),
'sslinkanchor' => $module
->getResource('client/dist/js/TinyMCE_sslink-anchor.js'),
]);
});

View File

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