mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 06:05:56 +00:00
Merge pull request #1982 from open-sausages/pulls/4.0/fix-vendor-issues
Fix regressions from vendor modularisation
This commit is contained in:
commit
46e2b19337
11
.eslintrc.js
11
.eslintrc.js
@ -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'
|
||||||
|
];
|
||||||
|
@ -72,4 +72,4 @@ after_success:
|
|||||||
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
|
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
|
||||||
|
|
||||||
after_failure:
|
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
|
||||||
|
10
_config.php
10
_config.php
@ -16,10 +16,12 @@ call_user_func(function () {
|
|||||||
|
|
||||||
// Enable insert-link to internal pages
|
// Enable insert-link to internal pages
|
||||||
TinyMCEConfig::get('cms')
|
TinyMCEConfig::get('cms')
|
||||||
->enablePlugins(array(
|
->enablePlugins([
|
||||||
'sslinkinternal' => $module->getResource('client/dist/js/TinyMCE_sslink-internal.js')->getURL(),
|
'sslinkinternal' => $module
|
||||||
'sslinkanchor' => $module->getResource('client/dist/js/TinyMCE_sslink-anchor.js')->getURL()
|
->getResource('client/dist/js/TinyMCE_sslink-internal.js'),
|
||||||
));
|
'sslinkanchor' => $module
|
||||||
|
->getResource('client/dist/js/TinyMCE_sslink-anchor.js'),
|
||||||
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -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": [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user