diff --git a/docker-compose.yml b/docker-compose.yml index a28dc405..993c50ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ services: co-authors-plus, log-deprecated-notices, query-monitor, + relative-url, # piglatin, db: image: mysql:5.7 diff --git a/src/academic-bloggers-toolkit.php b/src/academic-bloggers-toolkit.php index 24e3e29f..3fb6f304 100644 --- a/src/academic-bloggers-toolkit.php +++ b/src/academic-bloggers-toolkit.php @@ -120,8 +120,8 @@ function abt_frontend_scripts() { wp_enqueue_style('abt_frontend_styles', plugins_url('academic-bloggers-toolkit/lib/css/frontend.css'), ['dashicons'], ABT_VERSION); if (is_singular()) { - wp_enqueue_script('abt-bundle', plugins_url('academic-bloggers-toolkit/vendor/vendor.bundle.js'), [], ABT_VERSION); - wp_enqueue_script('abt_frontend_js', plugins_url('academic-bloggers-toolkit/lib/js/Frontend.js'), ['abt-bundle'], ABT_VERSION); + wp_enqueue_script('abt-bundle', plugins_url('academic-bloggers-toolkit/vendor/vendor.bundle.js'), [], ABT_VERSION, true); + wp_enqueue_script('abt_frontend_js', plugins_url('academic-bloggers-toolkit/lib/js/Frontend.js'), ['abt-bundle'], ABT_VERSION, true); } } add_action('wp_enqueue_scripts', 'abt_frontend_scripts'); diff --git a/tslint.json b/tslint.json index 33071133..d5b02787 100644 --- a/tslint.json +++ b/tslint.json @@ -1,5 +1,6 @@ { - "extends": ["tslint:latest", "tslint-react", "tslint-microsoft-contrib"], + "extends": ["tslint:latest", + "tslint-react", "tslint-microsoft-contrib"], "rulesDirectory": ["node_modules/tslint-microsoft-contrib"], "rules": { "curly": false, @@ -23,6 +24,7 @@ "react-a11y-anchors": false, "react-a11y-image-button-has-alt": false, "no-backbone-get-set-outside-model": false, + "jsx-no-multiline-js": false, "import-name": false, "one-line": [false, "check-open-brace", @@ -39,7 +41,13 @@ "variable-name": [true, "ban-keywords" ], - "jsx-no-multiline-js": false, - "whitespace": [true, "check-branch", "check-decl", "check-module", "check-separator", "check-type", "check-operator"] + "whitespace": [true, + "check-branch", + "check-decl", + "check-module", + "check-separator", + "check-type", + "check-operator" + ] } }