diff --git a/.editorconfig b/.editorconfig index d0d3054abae254775fd5c772f0c82ab370b11040..8da7b4b0dc1def84a8139b0caeb138150e4e2c54 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,11 +7,11 @@ root = true charset = utf-8 indent_style = space indent_size = 2 -end_of_line = lf +end_of_line = crlf insert_final_newline = true trim_trailing_whitespace = true # md files [*.md] insert_final_newline = false -trim_trailing_whitespace = false \ No newline at end of file +trim_trailing_whitespace = false diff --git a/packages/webpack-uni-pages-loader/lib/util.js b/packages/webpack-uni-pages-loader/lib/util.js index 739f903caab579237b3fdc42f0ea1b27522a5902..44a33ad6e2180a8d2f595e28185e9982fd62c245 100644 --- a/packages/webpack-uni-pages-loader/lib/util.js +++ b/packages/webpack-uni-pages-loader/lib/util.js @@ -133,6 +133,7 @@ function parseTabBar (style = {}) { const NON_APP_JSON_KEYS = [ 'appid', 'unipush', + 'secureNetwork', 'usingComponents', 'optimization', 'scopedSlotsCompiler',