diff --git a/.babelrc b/.babelrc index 82b89979..203a80b0 100644 --- a/.babelrc +++ b/.babelrc @@ -6,6 +6,9 @@ } }] ], + "plugins": [ + "transform-inline-environment-variables" + ], "env": { "test": { "plugins": [ diff --git a/.eslintrc.js b/.eslintrc.js index 6630ad49..98df0bbf 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -30,7 +30,7 @@ module.exports = { "ecmaVersion": 2017 }, "env":{ - "commonjs": true, + "node": true, "es6": true, "browser": true, "jest": true, diff --git a/package.json b/package.json index 208e0e02..4ba069b8 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "timers": "fake" }, "devDependencies": { + "babel-plugin-transform-inline-environment-variables": "^0.2.0", "babel-plugin-transform-remove-console": "^6.8.5", "babel-preset-env": "^1.6.1", "codecov": "^3.0.0", diff --git a/resources/assets/src/js/admin/common.js b/resources/assets/src/js/admin/common.js index 0b326dc3..12544c40 100644 --- a/resources/assets/src/js/admin/common.js +++ b/resources/assets/src/js/admin/common.js @@ -51,7 +51,7 @@ async function sendFeedback() { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { sendFeedback, initTables diff --git a/resources/assets/src/js/admin/customize.js b/resources/assets/src/js/admin/customize.js index bbf32d5b..711f82df 100644 --- a/resources/assets/src/js/admin/customize.js +++ b/resources/assets/src/js/admin/customize.js @@ -25,6 +25,6 @@ async function submitColor() { $('#color-submit').click(submitColor); -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = submitColor; } diff --git a/resources/assets/src/js/admin/players.js b/resources/assets/src/js/admin/players.js index edd86c43..ba3fec8b 100644 --- a/resources/assets/src/js/admin/players.js +++ b/resources/assets/src/js/admin/players.js @@ -191,7 +191,7 @@ async function deletePlayer(pid) { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { changeOwner, showNicknameInSwal, diff --git a/resources/assets/src/js/admin/plugins.js b/resources/assets/src/js/admin/plugins.js index 822ed534..f6f10c37 100644 --- a/resources/assets/src/js/admin/plugins.js +++ b/resources/assets/src/js/admin/plugins.js @@ -67,7 +67,7 @@ async function deletePlugin(name) { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { deletePlugin, enablePlugin, diff --git a/resources/assets/src/js/admin/tables.js b/resources/assets/src/js/admin/tables.js index 97485622..d153d770 100644 --- a/resources/assets/src/js/admin/tables.js +++ b/resources/assets/src/js/admin/tables.js @@ -271,7 +271,7 @@ function initPluginsTable() { }); } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { initUsersTable, initPlayersTable, diff --git a/resources/assets/src/js/admin/update.js b/resources/assets/src/js/admin/update.js index 6c7193b3..3d885f43 100644 --- a/resources/assets/src/js/admin/update.js +++ b/resources/assets/src/js/admin/update.js @@ -101,7 +101,7 @@ async function checkForUpdates() { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { checkForUpdates, progressPolling, diff --git a/resources/assets/src/js/admin/users.js b/resources/assets/src/js/admin/users.js index f650e76a..31fea525 100644 --- a/resources/assets/src/js/admin/users.js +++ b/resources/assets/src/js/admin/users.js @@ -215,7 +215,7 @@ $('body').on('keypress', '.score', function(event){ } }); -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { changeUserPwd, changeBanStatus, diff --git a/resources/assets/src/js/auth/captcha.js b/resources/assets/src/js/auth/captcha.js index 3d819568..c501668d 100644 --- a/resources/assets/src/js/auth/captcha.js +++ b/resources/assets/src/js/auth/captcha.js @@ -10,6 +10,6 @@ function refreshCaptcha() { $('.captcha').click(refreshCaptcha); -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = refreshCaptcha; } diff --git a/resources/assets/src/js/common/cookie.js b/resources/assets/src/js/common/cookie.js index 15600f30..d66c7cc0 100644 --- a/resources/assets/src/js/common/cookie.js +++ b/resources/assets/src/js/common/cookie.js @@ -59,6 +59,6 @@ var docCookies = { } }; -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = docCookies; } diff --git a/resources/assets/src/js/common/i18n.js b/resources/assets/src/js/common/i18n.js index 9a4aacba..6afc4554 100644 --- a/resources/assets/src/js/common/i18n.js +++ b/resources/assets/src/js/common/i18n.js @@ -48,7 +48,7 @@ function trans(key, parameters = {}) { return temp; } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { trans, loadLocales, diff --git a/resources/assets/src/js/common/notify.js b/resources/assets/src/js/common/notify.js index bbc1eb5c..4018361a 100644 --- a/resources/assets/src/js/common/notify.js +++ b/resources/assets/src/js/common/notify.js @@ -69,7 +69,7 @@ function showModal(msg, title = 'Message', type = 'default', options = {}) { }).modal(options); } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { showMsg, showModal, diff --git a/resources/assets/src/js/common/texture-preview.js b/resources/assets/src/js/common/texture-preview.js index 6cb9d897..2555bfbf 100644 --- a/resources/assets/src/js/common/texture-preview.js +++ b/resources/assets/src/js/common/texture-preview.js @@ -115,6 +115,6 @@ $('.fa-pause').click(function () { $('.fa-forward').click(() => MSP.setStatus('running', ! MSP.getStatus('running'))); $('.fa-repeat' ).click(() => MSP.setStatus('rotation', ! MSP.getStatus('rotation'))); -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = TexturePreview; } diff --git a/resources/assets/src/js/common/utils.js b/resources/assets/src/js/common/utils.js index f40a476c..619b1ef5 100644 --- a/resources/assets/src/js/common/utils.js +++ b/resources/assets/src/js/common/utils.js @@ -139,7 +139,7 @@ function url(relativeUri = '') { return blessing.base_url + relativeUri; } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { url, fetch, diff --git a/resources/assets/src/js/skinlib/index.js b/resources/assets/src/js/skinlib/index.js index a285889f..a4ddb041 100644 --- a/resources/assets/src/js/skinlib/index.js +++ b/resources/assets/src/js/skinlib/index.js @@ -226,7 +226,7 @@ function updateBreadCrumb() { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { initSkinlib, renderSkinlib, diff --git a/resources/assets/src/js/skinlib/operations.js b/resources/assets/src/js/skinlib/operations.js index 4aa41b9e..b0ba74ed 100644 --- a/resources/assets/src/js/skinlib/operations.js +++ b/resources/assets/src/js/skinlib/operations.js @@ -222,7 +222,7 @@ async function deleteTexture(tid) { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { toggleLiked, addToCloset, diff --git a/resources/assets/src/js/skinlib/upload.js b/resources/assets/src/js/skinlib/upload.js index 9977ba95..1b2788aa 100644 --- a/resources/assets/src/js/skinlib/upload.js +++ b/resources/assets/src/js/skinlib/upload.js @@ -131,6 +131,6 @@ function upload() { }); } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = upload; } diff --git a/resources/assets/src/js/user/closet.js b/resources/assets/src/js/user/closet.js index c14a961b..7981cd10 100644 --- a/resources/assets/src/js/user/closet.js +++ b/resources/assets/src/js/user/closet.js @@ -337,7 +337,7 @@ async function setTexture() { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { setAsAvatar, renderCloset, diff --git a/resources/assets/src/js/user/player.js b/resources/assets/src/js/user/player.js index 954bff41..c78caa7f 100644 --- a/resources/assets/src/js/user/player.js +++ b/resources/assets/src/js/user/player.js @@ -204,7 +204,7 @@ async function addNewPlayer() { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { addNewPlayer, clearTexture, diff --git a/resources/assets/src/js/user/profile.js b/resources/assets/src/js/user/profile.js index e94b3f7a..814ad99f 100644 --- a/resources/assets/src/js/user/profile.js +++ b/resources/assets/src/js/user/profile.js @@ -181,7 +181,7 @@ async function deleteAccount() { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = { changeEmail, deleteAccount, diff --git a/resources/assets/src/js/user/sign.js b/resources/assets/src/js/user/sign.js index 27ff443e..37626e56 100644 --- a/resources/assets/src/js/user/sign.js +++ b/resources/assets/src/js/user/sign.js @@ -36,6 +36,6 @@ async function sign() { } } -if (typeof require !== 'undefined' && typeof module !== 'undefined') { +if (process.env.NODE_ENV === 'test') { module.exports = sign; } diff --git a/yarn.lock b/yarn.lock index d7a41151..290daf8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -685,6 +685,10 @@ babel-plugin-transform-exponentiation-operator@^6.22.0: babel-plugin-syntax-exponentiation-operator "^6.8.0" babel-runtime "^6.22.0" +babel-plugin-transform-inline-environment-variables@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-environment-variables/-/babel-plugin-transform-inline-environment-variables-0.2.0.tgz#37dad411a819667fd69c33e72f7a14ea1a50ba98" + babel-plugin-transform-regenerator@^6.22.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"