feat(v2): allow line highlighting

.eslintignore

@@ -16,3 +16,4 @@ packages/docusaurus-init/lib/
 packages/docusaurus-plugin-content-blog/lib/
 packages/docusaurus-plugin-content-docs/lib/
 packages/docusaurus-plugin-content-pages/lib/
+packages/docusaurus-plugin-sitemap/lib/

.gitignore

@@ -18,3 +18,4 @@ packages/docusaurus-init/lib/
 packages/docusaurus-plugin-content-blog/lib/
 packages/docusaurus-plugin-content-docs/lib/
 packages/docusaurus-plugin-content-pages/lib/
+packages/docusaurus-plugin-sitemap/lib/

.prettierignore

@@ -8,3 +8,4 @@ packages/docusaurus-init/lib/
 packages/docusaurus-plugin-content-blog/lib/
 packages/docusaurus-plugin-content-docs/lib/
 packages/docusaurus-plugin-content-pages/lib/
+packages/docusaurus-plugin-sitemap/lib/

CHANGELOG-2.x.md

@@ -1,16 +1,48 @@
 # Docusaurus 2 Changelog
 
+## Unreleased
+
+- Reduce memory usage consumption.
+- Slightly adjust search icon position to be more aligned on small width device.
+- Convert sitemap plugin to TypeScript.
+- Significantly reduce main bundle size and initial HTML payload on production build. Generated JS files from webpack is also shorter in name.
+- Refactor dark toggle into a hook.
+- Changed the way we read the `USE_SSH` env variable during deployment to be the same as in v1.
+- Add highlight specific lines in code blocks.
+
+## 2.0.0-alpha.31
+
+- Footer is now sticky/ pinned to the bottom of the viewport in desktop browsers.
+- Footer is now also displayed in docs page for consistency.
+- Remove empty doc sidebar container if sidebar for a particular doc page does not exist. Otherwise, it will cause an additional empty space.
+- Default PostCSS loader now only polyfills stage 3+ features (previously it was stage 2) like Create React App. Stage 2 CSS is considered relatively unstable and subject to change while Stage 3 features will likely become a standard.
+- Fix search bar focus bug. When you put the focus on search input, previously the focus will remain although we have clicked to other area outside of the search input.
+- New themeConfig option `sidebarCollapsible`. It is on by default. If explicitly set to `false`, all doc items in sidebar is expanded. Otherwise, it will still be a collapsible sidebar.
+- Disable adding hashes to the generated class names of CSS modules in dev mode. Generating unique identifiers takes some time, which can be saved since including paths to files in class names is enough to avoid collisions.
+- Fix showing sidebar category with empty items.
+- Update infima from 0.2.0-alpha.2 to 0.2.0-alpha.3
+  - Fix pagination nav and right sidebar color contrast ratio
+  - Fix sidebar arrow color in dark mode
+  - Fix footer mobile issue
+  - Increase sidebar width
+  - etc
+
 ## 2.0.0-alpha.30
-- Fix babel transpilation include/exclude logic to be more efficient. This also fix a very weird bug `TypeError: Cannot assign to read only property 'exports' of object '#<Object>'` if your website path contains `docusaurus` word in it.
+
+- Fix babel transpilation include/exclude logic to be more efficient. This also fix a very weird bug `TypeError: Cannot assign to read only property 'exports' of object '#<Object>'`.([#1868](https://github.com/facebook/docusaurus/pull/1868))
+
+If you are still encountering the error. Please check whether you use `module.exports` for your `.js` file instead of doing `export` (mixing CJS and ES). See https://github.com/webpack/webpack/issues/4039#issuecomment-477779322 and https://github.com/webpack/webpack/issues/4039#issuecomment-273804003 for more context.
 
 ## 2.0.0-alpha.29
 
-**HOTFIX for 2.0.0-alpha.28**. 
+**HOTFIX for 2.0.0-alpha.28**.
+
 - Fix missing `core-js` dependencies on `@docusaurus/core`.
 - Fix wrong `@babel/env` preset configuration that causes build compilation error.
 - New UI for webpack compilation progress bar.
 
 ## 2.0.0-alpha.28
+
 - Further reduce memory usage to avoid heap memory allocation failure.
 - Fix `keywords` frontmatter for SEO not working properly.
 - Fix `swizzle` command not passing context properly to theme packages.
@@ -19,7 +51,7 @@
 - Fix logo URL in footer to be appended with baseUrl automatically.
 - Add the option `--no-open` for `start` command.
 - Set `@babel/env` useBuiltins to `usage`. This will automatically use browserlist and import polyfills required.
-- Modified TerserWebpackPlugin `terserOptions` for better cross-browser compatibility. 
+- Modified TerserWebpackPlugin `terserOptions` for better cross-browser compatibility.
 - **BREAKING** `withBaseUrl` is renamed to `useBaseUrl` because its a React Hooks. Make sure you import/rename it correctly. Eg: `import useBaseUrl from '@docusaurus/useBaseUrl`;
 - Fix potential security vulnerability because we're exposing the directory structure of the host machine.
 - Upgrade dependencies.
@@ -29,7 +61,7 @@
 - Add `@theme/Tabs` which can be used to implement multi-language code tabs.
 - Implement `custom_edit_url` and `hide_title` markdown header for docusaurus v1 feature parity.
 - Reduce memory usage and slightly faster production build.
-- Misc dependency upgrades. 
+- Misc dependency upgrades.
 
 ## 2.0.0-alpha.26
 

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.14.1",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

packages/docusaurus-1.x/lib/static/css/main.css

@@ -843,7 +843,7 @@ input[type='search'] {
   padding-left: 10px;
   position: absolute;
   right: 10px;
-  top: 15px;
+  top: 10px;
 }
 
 .navSearchWrapper:before {
@@ -1382,6 +1382,7 @@ input::placeholder {
     transition: background-color 0.2s cubic-bezier(0.68, -0.55, 0.265, 1.55),
       width 0.2s cubic-bezier(0.68, -0.55, 0.265, 1.55), color 0.2s ease;
     width: 100%;
+    height: 30px;
   }
 
   .reactNavSearchWrapper input#search_input_react:focus,
@@ -1977,7 +1978,8 @@ input::placeholder {
   color: #717171;
 }
 
-.onPageNav .toc-headings > li > a.active {
+.onPageNav .toc-headings > li > a.active,
+.onPageNav .toc-headings > li > a.hover {
   font-weight: 600;
   color: $primaryColor;
 }

packages/docusaurus-1.x/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "license": "MIT",
   "keywords": [
     "documentation",

packages/docusaurus-init/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/init",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "description": "Create Docusaurus app easily",
   "repository": {
     "type": "git",

packages/docusaurus-init/templates/classic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-template",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -10,8 +10,8 @@
     "deploy": "docusaurus deploy"
   },
   "dependencies": {
-    "@docusaurus/core": "^2.0.0-alpha.30",
-    "@docusaurus/preset-classic": "^2.0.0-alpha.30",
+    "@docusaurus/core": "^2.0.0-alpha.31",
+    "@docusaurus/preset-classic": "^2.0.0-alpha.31",
     "classnames": "^2.2.6",
     "react": "^16.8.4",
     "react-dom": "^16.8.4"

packages/docusaurus-mdx-loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/mdx-loader",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "description": "Docusaurus Loader for MDX",
   "main": "src/index.js",
   "publishConfig": {

packages/docusaurus-plugin-content-blog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "description": "Blog plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
@@ -11,11 +11,11 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@docusaurus/types": "^2.0.0-alpha.30"
+    "@docusaurus/types": "^2.0.0-alpha.31"
   },
   "dependencies": {
-    "@docusaurus/mdx-loader": "^2.0.0-alpha.30",
-    "@docusaurus/utils": "^2.0.0-alpha.30",
+    "@docusaurus/mdx-loader": "^2.0.0-alpha.31",
+    "@docusaurus/utils": "^2.0.0-alpha.31",
     "fs-extra": "^8.1.0",
     "globby": "^10.0.1",
     "loader-utils": "^1.2.3",

packages/docusaurus-plugin-content-docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "description": "Docs content plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
@@ -11,11 +11,11 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@docusaurus/types": "^2.0.0-alpha.30"
+    "@docusaurus/types": "^2.0.0-alpha.31"
   },
   "dependencies": {
-    "@docusaurus/mdx-loader": "^2.0.0-alpha.30",
-    "@docusaurus/utils": "^2.0.0-alpha.30",
+    "@docusaurus/mdx-loader": "^2.0.0-alpha.31",
+    "@docusaurus/utils": "^2.0.0-alpha.31",
     "cross-spawn": "^7.0.1",
     "fs-extra": "^8.1.0",
     "globby": "^10.0.1",

packages/docusaurus-plugin-content-pages/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-pages",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "description": "Pages content plugin for Docusaurus",
   "main": "lib/index.js",
   "scripts": {
@@ -11,8 +11,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/types": "^2.0.0-alpha.30",
-    "@docusaurus/utils": "^2.0.0-alpha.30",
+    "@docusaurus/types": "^2.0.0-alpha.31",
+    "@docusaurus/utils": "^2.0.0-alpha.31",
     "globby": "^10.0.1"
   },
   "peerDependencies": {

packages/docusaurus-plugin-google-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-google-analytics",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "description": "Global analytics (analytics.js) plugin for Docusaurus",
   "main": "src/index.js",
   "publishConfig": {

packages/docusaurus-plugin-google-gtag/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-google-gtag",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "description": "Global Site Tag (gtag.js) plugin for Docusaurus",
   "main": "src/index.js",
   "publishConfig": {

packages/docusaurus-plugin-ideal-image/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-ideal-image",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "description": "Docusaurus Plugin to generate an almost ideal image (responsive, lazy-loading, and low quality placeholder)",
   "main": "src/index.js",
   "publishConfig": {

packages/docusaurus-plugin-sitemap/package.json

@@ -1,13 +1,17 @@
 {
   "name": "@docusaurus/plugin-sitemap",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.31",
   "description": "Simple sitemap generation plugin for Docusaurus",
-  "main": "src/index.js",
+  "main": "lib/index.js",
+  "scripts": {
+    "tsc": "tsc"
+  },
   "publishConfig": {
     "access": "public"
   },
   "license": "MIT",
   "dependencies": {
+    "@docusaurus/types": "^2.0.0-alpha.30",
     "sitemap": "^3.2.2"
   },
   "peerDependencies": {

packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.js → packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts

@@ -6,23 +6,30 @@
  */
 
 import createSitemap from '../createSitemap';
+import {DocusaurusConfig} from '@docusaurus/types';
+import DEFAULT_OPTIONS from '../index';
 
 describe('createSitemap', () => {
   test('simple site', () => {
-    const sitemap = createSitemap({
-      siteConfig: {
+    const sitemap = createSitemap(
+      {
         url: 'https://example.com',
+      } as DocusaurusConfig,
+      ['/', '/test'],
+      {
+        cacheTime: 600,
+        changefreq: 'daily',
+        priority: 0.7,
       },
-      routesPaths: ['/', '/test'],
-    });
-    expect(sitemap).toContain(
+    );
+    expect(sitemap.toString()).toContain(
       `<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">`,
     );
   });
 
   test('empty site', () => {
     expect(() => {
-      createSitemap({});
+      createSitemap({} as any, [], {} as any);
     }).toThrowErrorMatchingInlineSnapshot(
       `"Url in docusaurus.config.js cannot be empty/undefined"`,
     );

packages/docusaurus-plugin-sitemap/src/createSitemap.ts

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import sitemap, {SitemapItemOptions} from 'sitemap';
+import {PluginOptions} from './types';
+import {DocusaurusConfig} from '@docusaurus/types';
+
+export default function createSitemap(
+  siteConfig: DocusaurusConfig,
+  routesPaths: string[],
+  options: PluginOptions,
+) {
+  const {url: hostname} = siteConfig;
+  if (!hostname) {
+    throw new Error('Url in docusaurus.config.js cannot be empty/undefined');
+  }
+
+  const urls = routesPaths.map(
+    routesPath =>
+      ({
+        url: routesPath,
+        changefreq: options.changefreq,
+        priority: options.priority,
+      } as SitemapItemOptions),
+  );
+
+  return sitemap.createSitemap({
+    hostname,
+    cacheTime: options.cacheTime,
+    urls,
+  });
+}