diff options
| author | Mark Otto <[email protected]> | 2018-06-21 07:31:38 +0300 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2018-07-11 23:30:46 -0700 |
| commit | 0e920ce3f481a23c00c22c10565463ce58c0aac2 (patch) | |
| tree | b66e8c4bf2244d3b71d7f2e6f2376ae528f6bd93 /js | |
| parent | 9e126b26a863505b048bc927c6c6f731d42d2ba4 (diff) | |
| download | bootstrap-0e920ce3f481a23c00c22c10565463ce58c0aac2.tar.xz bootstrap-0e920ce3f481a23c00c22c10565463ce58c0aac2.zip | |
Reorganize docs for easier deploys
With the current docs directory setup, I'm making too many mistakes and have to manually address path changes and directory moves on deploy. This makes for a frustrating experience developing locally and shipping releases. With this PR, we're basically back to the same setup from v3—duplicating the dist directory into our docs directory. Not the most ideal, but very straightforward for me as the release manager.
Diffstat (limited to 'js')
| -rw-r--r-- | js/tests/index.html | 4 | ||||
| -rw-r--r-- | js/tests/karma-bundle.conf.js | 4 | ||||
| -rw-r--r-- | js/tests/karma.conf.js | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/js/tests/index.html b/js/tests/index.html index 01af9b2d0..95d72d87a 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -8,7 +8,7 @@ <!-- jQuery --> <script> (function () { - var path = '../../assets/js/vendor/jquery-slim.min.js' + var path = '../../site/docs/4.1/assets/js/vendor/jquery-slim.min.js' // get jquery param from the query string. var jQueryVersion = location.search.match(/[?&]jquery=(.*?)(?=&|$)/) @@ -19,7 +19,7 @@ document.write('<script src="' + path + '"><\/script>') }()) </script> - <script src="../../assets/js/vendor/popper.min.js"></script> + <script src="../../site/docs/4.1/assets/js/vendor/popper.min.js"></script> <!-- QUnit --> <link rel="stylesheet" href="../../node_modules/qunit/qunit/qunit.css" media="screen"> diff --git a/js/tests/karma-bundle.conf.js b/js/tests/karma-bundle.conf.js index 74d4c77a6..50c500faa 100644 --- a/js/tests/karma-bundle.conf.js +++ b/js/tests/karma-bundle.conf.js @@ -2,7 +2,7 @@ /* eslint no-process-env: 0 */ module.exports = (config) => { - const jqueryFile = process.env.USE_OLD_JQUERY ? 'https://code.jquery.com/jquery-1.9.1.min.js' : 'assets/js/vendor/jquery-slim.min.js' + const jqueryFile = process.env.USE_OLD_JQUERY ? 'https://code.jquery.com/jquery-1.9.1.min.js' : 'site/docs/4.1/assets/js/vendor/jquery-slim.min.js' config.set({ basePath: '../..', @@ -17,7 +17,7 @@ module.exports = (config) => { // list of files / patterns to load in the browser files: [ jqueryFile, - 'assets/js/vendor/popper.min.js', + 'site/docs/4.1/assets/js/vendor/popper.min.js', 'dist/js/bootstrap.js', 'js/tests/unit/*.js' ], diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js index 3b438eaa0..397f8b8e3 100644 --- a/js/tests/karma.conf.js +++ b/js/tests/karma.conf.js @@ -4,7 +4,7 @@ const path = require('path') const jsCoveragePath = path.resolve(__dirname, '../coverage') module.exports = (config) => { - const jqueryFile = process.env.USE_OLD_JQUERY ? 'https://code.jquery.com/jquery-1.9.1.min.js' : 'assets/js/vendor/jquery-slim.min.js' + const jqueryFile = process.env.USE_OLD_JQUERY ? 'https://code.jquery.com/jquery-1.9.1.min.js' : 'site/docs/4.1/assets/js/vendor/jquery-slim.min.js' config.set({ basePath: '../..', @@ -20,7 +20,7 @@ module.exports = (config) => { // list of files / patterns to load in the browser files: [ jqueryFile, - 'assets/js/vendor/popper.min.js', + 'site/docs/4.1/assets/js/vendor/popper.min.js', 'js/coverage/dist/util.js', 'js/coverage/dist/tooltip.js', 'js/coverage/dist/!(util|index|tooltip).js', // include all of our js/dist files except util.js, index.js and tooltip.js |