Merge branch 'develop' into 1173-fix-mobile-onlyCover-flag

docsifyjs · Jun 23, 2020 · 4a7ff08 · 4a7ff08
2 parents 2d91a32 + b90c948
commit 4a7ff08
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/build/build.js b/build/build.js
@@ -29,7 +29,17 @@ async function build(opts) {
           __VERSION__: version,
           'process.env.SSR': false
         })
-      ])
+      ]),
+      onwarn: function (message) {
+        if (message.code === 'UNRESOLVED_IMPORT') {
+          throw new Error(
+            `Could not resolve module ` + 
+            message.source + 
+            `. Try running 'npm install' or using rollup's 'external' option if this is an external dependency. ` +
+            `Module ${message.source} is imported in ${message.importer}`
+            )
+        }
+      }
     })
     .then(function (bundle) {
       var dest = 'lib/' + (opts.output || opts.input)

diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -47,7 +47,7 @@ If you don't like `npm` or have trouble installing the tool, you can manually cr
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width,initial-scale=1">
   <meta charset="UTF-8">
-  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify/themes/vue.css">
+  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/themes/vue.css" />
 </head>
 <body>
   <div id="app"></div>
@@ -56,11 +56,31 @@ If you don't like `npm` or have trouble installing the tool, you can manually cr
       //...
     }
   </script>
-  <script src="//cdn.jsdelivr.net/npm/docsify/lib/docsify.min.js"></script>
+  <script src="//cdn.jsdelivr.net/npm/docsify@4"></script>
 </body>
 </html>
 ```
 
+### Specifying docsify versions
+
+?> Note that in both of the examples below, docsify URLs will need to be manually updated when a new major version of docsify is released (e.g. `v4.x.x` => `v5.x.x`). Check the docsify website periodically to see if a new major version has been released.
+
+Specifying a major version in the URL (`@4`) will allow your site will receive non-breaking enhancements (i.e. "minor" updates) and bug fixes (i.e. "patch" updates) automatically. This is the recommended way to load docsify resources.
+
+```html
+<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/docsify@4/themes/vue.css" />
+<script src="//cdn.jsdelivr.net/npm/docsify@4"></script>
+```
+
+If you prefer to lock docsify to a specific version, specify the full version after the `@` symbol in the URL. This is the safest way to ensure your site will look and behave the same way regardless of any changes made to future versions of docsify.
+
+```html
+<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/[email protected]/themes/vue.css">
+<script src="//cdn.jsdelivr.net/npm/[email protected]"></script>
+```
+
+### Manually preview your site
+
 If you installed python on your system, you can easily use it to run a static server to preview your site.
 
 ```bash
@@ -72,17 +92,17 @@ cd docs && python -m SimpleHTTPServer 3000
 If you want, you can show a loading dialog before docsify starts to render your documentation:
 
 ```html
-  <!-- index.html -->
+<!-- index.html -->
 
-  <div id="app">Please wait...</div>
+<div id="app">Please wait...</div>
 ```
 
 You should set the `data-app` attribute if you changed `el`:
 
 ```html
-  <!-- index.html -->
+<!-- index.html -->
 
-  <div data-app id="main">Please wait...</div>
+<div data-app id="main">Please wait...</div>
 
   <script>
     window.$docsify = {