fix(prerender): do not override prerendered mode setting

packages/core/package-lock.json

@@ -5,67 +5,28 @@
     "requires": true,
     "dependencies": {
         "@stencil/core": {
-            "version": "0.0.4-14",
+            "version": "0.0.5-5",
-            "resolved": "https://registry.npmjs.org/@stencil/core/-/core-0.0.4-14.tgz",
+            "resolved": "https://registry.npmjs.org/@stencil/core/-/core-0.0.5-5.tgz",
-            "integrity": "sha512-vDD5RzrmxVt/9j+IAnNaYD4ukrxEvBkiEXuudC1QgLJghyOp+nPKVOvQ9mHhQQnurOooRj+3Kmvv5ADrYhIrYA==",
+            "integrity": "sha512-VbONjlxdyizy5JdoS2RzbIKQvUgYVVnx0ZFRoIztHl4VoKd55hNx/EMOcYaoVH/crQ0OPRxgpzgYE3iGIBCj0w==",
             "dev": true,
             "requires": {
-                "chalk": "1.1.3",
                 "chokidar": "1.7.0",
-                "clean-css": "4.1.7",
                 "jsdom": "11.1.0",
-                "node-fetch": "1.7.2",
                 "node-sass": "4.5.3",
-                "rollup": "0.41.4",
-                "rollup-plugin-commonjs": "8.1.0",
-                "rollup-plugin-node-resolve": "3.0.0",
                 "typescript": "2.5.0-dev.20170808",
                 "uglify-es": "3.0.27"
             }
         },
         "@stencil/dev-server": {
-            "version": "0.0.14",
+            "version": "0.0.16",
-            "resolved": "https://registry.npmjs.org/@stencil/dev-server/-/dev-server-0.0.14.tgz",
+            "resolved": "https://registry.npmjs.org/@stencil/dev-server/-/dev-server-0.0.16.tgz",
-            "integrity": "sha512-sdnuZ1Tgg1I8DsXhkzyZjrwdFkQvI0HrXQXcHARZYeV6CeIJS51+q9EbvoMBHsUBuqPxgTgR8GHySw/DfZY5UQ==",
+            "integrity": "sha512-Moeafche095DJKXD5ztLowvz0wOjj1udwoWNK4iYP8th8pSVj5q8gD6pP5hgXcshqKwF++Qdsh0Vy5DEm5MUyw==",
             "dev": true,
             "requires": {
-                "chalk": "2.1.0",
                 "chokidar": "1.7.0",
                 "ecstatic": "2.2.1",
-                "lodash.debounce": "4.0.8",
                 "opn": "5.1.0",
                 "tiny-lr": "1.0.5"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.0",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-                    "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "1.9.0"
-                    }
-                },
-                "chalk": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-                    "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "3.2.0",
-                        "escape-string-regexp": "1.0.5",
-                        "supports-color": "4.2.1"
-                    }
-                },
-                "supports-color": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz",
-                    "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "2.0.0"
-                    }
-                }
             }
         },
         "@stencil/utils": {
@@ -309,23 +270,6 @@
                 "repeat-element": "1.1.2"
             }
         },
-        "browser-resolve": {
-            "version": "1.11.2",
-            "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
-            "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=",
-            "dev": true,
-            "requires": {
-                "resolve": "1.1.7"
-            },
-            "dependencies": {
-                "resolve": {
-                    "version": "1.1.7",
-                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-                    "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-                    "dev": true
-                }
-            }
-        },
         "builtin-modules": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
@@ -390,15 +334,6 @@
                 "readdirp": "2.1.0"
             }
         },
-        "clean-css": {
-            "version": "4.1.7",
-            "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.7.tgz",
-            "integrity": "sha1-ua6k+FZ5iJzz6ui0A0nsTr390DI=",
-            "dev": true,
-            "requires": {
-                "source-map": "0.5.6"
-            }
-        },
         "cliui": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
@@ -422,21 +357,6 @@
             "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
             "dev": true
         },
-        "color-convert": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",
-            "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",
-            "dev": true,
-            "requires": {
-                "color-name": "1.1.3"
-            }
-        },
-        "color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
-        },
         "combined-stream": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
@@ -597,15 +517,6 @@
                 "url-join": "2.0.2"
             }
         },
-        "encoding": {
-            "version": "0.1.12",
-            "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-            "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-            "dev": true,
-            "requires": {
-                "iconv-lite": "0.4.13"
-            }
-        },
         "error": {
             "version": "7.0.2",
             "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz",
@@ -668,12 +579,6 @@
             "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
             "dev": true
         },
-        "estree-walker": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.3.1.tgz",
-            "integrity": "sha1-5rGlHPcpJSTnI3wxLl/mZgwc4ao=",
-            "dev": true
-        },
         "esutils": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
@@ -1841,12 +1746,6 @@
                 "ansi-regex": "2.1.1"
             }
         },
-        "has-flag": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-            "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-            "dev": true
-        },
         "has-unicode": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -2030,12 +1929,6 @@
                 "is-extglob": "1.0.0"
             }
         },
-        "is-module": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-            "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-            "dev": true
-        },
         "is-number": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -2057,12 +1950,6 @@
             "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
             "dev": true
         },
-        "is-stream": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-            "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-            "dev": true
-        },
         "is-typedarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -2262,12 +2149,6 @@
             "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
             "dev": true
         },
-        "lodash.debounce": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-            "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-            "dev": true
-        },
         "lodash.mergewith": {
             "version": "4.6.0",
             "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
@@ -2300,15 +2181,6 @@
                 "yallist": "2.1.2"
             }
         },
-        "magic-string": {
-            "version": "0.19.1",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.19.1.tgz",
-            "integrity": "sha1-FNdoATyvLsj96hakmvgvw3fnUgE=",
-            "dev": true,
-            "requires": {
-                "vlq": "0.2.2"
-            }
-        },
         "map-obj": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
@@ -2419,16 +2291,6 @@
             "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
             "dev": true
         },
-        "node-fetch": {
-            "version": "1.7.2",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz",
-            "integrity": "sha512-xZZUq2yDhKMIn/UgG5q//IZSNLJIwW2QxS14CNH5spuiXkITM2pUitjdq58yLSaU7m4M0wBNaM2Gh/ggY4YJig==",
-            "dev": true,
-            "requires": {
-                "encoding": "0.1.12",
-                "is-stream": "1.1.0"
-            }
-        },
         "node-gyp": {
             "version": "3.6.2",
             "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
@@ -2668,12 +2530,6 @@
             "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
             "dev": true
         },
-        "path-parse": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-            "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-            "dev": true
-        },
         "path-type": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
@@ -2970,15 +2826,6 @@
             "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
             "dev": true
         },
-        "resolve": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
-            "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
-            "dev": true,
-            "requires": {
-                "path-parse": "1.0.5"
-            }
-        },
         "rimraf": {
             "version": "2.6.1",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
@@ -2988,50 +2835,6 @@
                 "glob": "7.1.2"
             }
         },
-        "rollup": {
-            "version": "0.41.4",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.41.4.tgz",
-            "integrity": "sha1-qXBYAXYyn56thoVNf9TEbedSrvg=",
-            "dev": true,
-            "requires": {
-                "source-map-support": "0.4.15"
-            }
-        },
-        "rollup-plugin-commonjs": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.1.0.tgz",
-            "integrity": "sha512-mxLU0oCZPakY+o1P9OeVG+yT7bGOFyRQf6pk3xden2+sEG2NP40CrKWw1h/BHZuK7yegRcOJMCfr/uzLmodrGQ==",
-            "dev": true,
-            "requires": {
-                "acorn": "4.0.13",
-                "estree-walker": "0.3.1",
-                "magic-string": "0.19.1",
-                "resolve": "1.4.0",
-                "rollup-pluginutils": "2.0.1"
-            }
-        },
-        "rollup-plugin-node-resolve": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz",
-            "integrity": "sha1-i4l8TDAw1QASd7BRSyXSygloPuA=",
-            "dev": true,
-            "requires": {
-                "browser-resolve": "1.11.2",
-                "builtin-modules": "1.1.1",
-                "is-module": "1.0.0",
-                "resolve": "1.4.0"
-            }
-        },
-        "rollup-pluginutils": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz",
-            "integrity": "sha1-fslbNXP2VDpGpkYb2afFRFJdD8A=",
-            "dev": true,
-            "requires": {
-                "estree-walker": "0.3.1",
-                "micromatch": "2.3.11"
-            }
-        },
         "safe-buffer": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
@@ -3122,15 +2925,6 @@
             "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
             "dev": true
         },
-        "source-map-support": {
-            "version": "0.4.15",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
-            "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
-            "dev": true,
-            "requires": {
-                "source-map": "0.5.6"
-            }
-        },
         "spdx-correct": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
@@ -3396,12 +3190,6 @@
                 }
             }
         },
-        "vlq": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/vlq/-/vlq-0.2.2.tgz",
-            "integrity": "sha1-4xbVJXtAuGu0PLjV/qXX9U1rDKE=",
-            "dev": true
-        },
         "webidl-conversions": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.1.tgz",

packages/core/package.json

@@ -18,7 +18,7 @@
     "build": "stencil build",
     "dev": "sd concurrent \"stencil build --dev --watch\" \"stencil-dev-server\"",
     "publish": "npm run build && node scripts/publish.js && node scripts/publish.js && ../../node_modules/.bin/np --any-branch",
-    "test": "(jest --no-cache || true)"
+    "test": "jest --no-cache"
   },
   "author": "Ionic Team",
   "license": "MIT",

packages/core/src/global/ionic-global.ts

@@ -13,6 +13,10 @@ Context.config = createConfigController(
 );
 
 
-// get the mode via config settings and set it to
+// first see if the mode was set as an attribute on <html>
-// both Ionic and the Core global
+// which could have been set by the user, or by prerendering
-Context.mode = Context.mode || Context.config.get('mode', 'md');
+// otherwise get the mode via config settings, and fallback to md
+Context.mode = document.documentElement.getAttribute('mode') || Context.config.get('mode', 'md');
+
+// ensure we've got the mode attribute set on <html>
+document.documentElement.setAttribute('mode', Context.mode);