diff --git a/.circleci/config.yml b/.circleci/config.yml index a7411c170a..97b0ba0faa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,40 +14,6 @@ aliases: - ~/.cache/yarn key: root-yarn-{{ .Branch }}-{{ checksum "yarn.lock" }} - - &v1-yarn | - cd v1 - yarn install --non-interactive --cache-folder ~/.cache/yarn - - - &v1-restore-yarn-cache - keys: - - v1-yarn-{{ .Branch }}-{{ checksum "yarn.lock" }} - # Fallback in case checksum fails - - v1-yarn-{{ .Branch }}- - - - &v1-save-yarn-cache - paths: - - v1/node_modules - - ~/.cache/yarn - key: v1-yarn-{{ .Branch }}-{{ checksum "yarn.lock" }} - - - &v2-yarn | - cd v2 - yarn install --non-interactive --cache-folder ~/.cache/yarn - cd ../v2-website - yarn install --non-interactive --cache-folder ~/.cache/yarn - - - &v2-restore-yarn-cache - keys: - - v2-yarn-{{ .Branch }}-{{ checksum "yarn.lock" }} - # Fallback in case checksum fails - - v2-yarn-{{ .Branch }}- - - - &v2-save-yarn-cache - paths: - - v2/node_modules - - ~/.cache/yarn - key: v2-yarn-{{ .Branch }}-{{ checksum "yarn.lock" }} - - &filter-only-master branches: only: @@ -65,45 +31,43 @@ defaults: &defaults version: 2 jobs: - prettier: + lint-prettier: <<: *defaults steps: - checkout - restore-cache: *root-restore-yarn-cache - run: *root-yarn - save-cache: *root-save-yarn-cache + - run: + name: Check ESLint + command: yarn lint - run: name: Check Prettier - command: | - yarn install - yarn prettier:diff + command: yarn prettier:diff - v1-tests: + tests: <<: *defaults steps: - checkout - - restore-cache: *v1-restore-yarn-cache - - run: *v1-yarn - - save-cache: *v1-save-yarn-cache - - run: - name: Check ESLint - command: cd v1 && yarn lint + - restore-cache: *root-restore-yarn-cache + - run: *root-yarn + - save-cache: *root-save-yarn-cache - run: name: Run Test Suites - command: cd v1 && yarn test + command: yarn test - run: - name: Test Static Website Builds - command: cd v1/website && yarn build + name: Test v1 static website Builds + command: cd website-1.x && yarn build + - run: + name: Test v2 static website Builds + command: cd website && yarn build # The CIRCLE_ variables are defined during the CircleCI build process # https://circleci.com/docs/1.0/environment-variables/ - v1-deploy-website: + deploy-website: <<: *defaults steps: - checkout - - restore-cache: *v1-restore-yarn-cache - - run: *v1-yarn - - save-cache: *v1-save-yarn-cache - run: name: Configure GitHub Bot # Do not do this if we don't have the right org (facebook), or if this is just a pull request @@ -120,7 +84,7 @@ jobs: if [[ $CIRCLE_PROJECT_USERNAME == "facebook" && -z $CI_PULL_REQUEST && -z $CIRCLE_PR_USERNAME ]]; then echo "Deploying website..." # install Docusaurus and generate file of English strings - cd v1 && yarn && cd website && yarn run write-translations + cd website-1.x && yarn run write-translations # install Crowdin sudo apt-get update sudo apt-get install default-jre rsync @@ -136,68 +100,20 @@ jobs: echo "Skipping deploy." fi - v2-tests: - <<: *defaults - steps: - - checkout - - restore-cache: *v2-restore-yarn-cache - - run: *v2-yarn - - save-cache: *v2-save-yarn-cache - - run: - name: Check ESLint - command: cd v2 && yarn lint - - run: - name: Run Test Suites - command: cd v2 && yarn test - - run: - name: Test Static Website Builds - command: cd v2-website && yarn build - - publish-npm: - <<: *defaults - steps: - - checkout - - restore-cache: *v1-restore-yarn-cache - - run: *v1-yarn - - save-cache: *v1-save-yarn-cache - - ? run - name: Publish Docusaurus Package - command: | - if [ -z "$CIRCLE_PULL_REQUEST" ]; then - echo "//registry.npmjs.org/:_authToken=${CIRCLE_NPM_TOKEN}" > ~/.npmrc - node ./scripts/publish-npm.js - else - echo "Skipping publication." - fi - # Workflows enables us to run multiple jobs in parallel workflows: version: 2 - prettier: + lint-prettier: jobs: - - prettier: + - lint-prettier: filters: *filter-ignore-gh-pages - v1: + tests-and-deploy: jobs: - - v1-tests: + - tests: filters: *filter-ignore-gh-pages - - v1-deploy-website: + - deploy-website: requires: - - v1-tests - filters: *filter-only-master - - v2: - jobs: - - v2-tests: - filters: *filter-ignore-gh-pages - - deploy: - jobs: - - hold: - type: approval - - publish-npm: - requires: - - hold - filters: *filter-only-master + - tests + filters: *filter-only-master \ No newline at end of file diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000000..691f67e41c --- /dev/null +++ b/.eslintignore @@ -0,0 +1,9 @@ +__fixtures__ +dist +node_modules +build +jest.config.js +jest.transform.js +website-1.x/ +website/ +scripts diff --git a/v2/.eslintrc.js b/.eslintrc.js similarity index 100% rename from v2/.eslintrc.js rename to .eslintrc.js diff --git a/v2/babel.config.js b/babel.config.js similarity index 68% rename from v2/babel.config.js rename to babel.config.js index 8d9313c391..a6af74e165 100644 --- a/v2/babel.config.js +++ b/babel.config.js @@ -7,4 +7,8 @@ module.exports = { presets: ['@babel/env', '@babel/react'], + plugins: [ + '@babel/plugin-proposal-class-properties', + '@babel/plugin-proposal-object-rest-spread', + ], }; diff --git a/jest.config.js b/jest.config.js new file mode 100644 index 0000000000..36e32c34ed --- /dev/null +++ b/jest.config.js @@ -0,0 +1,22 @@ +/** + * 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. + */ + +const path = require('path'); + +module.exports = { + rootDir: path.resolve(__dirname), + verbose: true, + testURL: 'http://localhost/', + testEnvironment: 'node', + moduleNameMapper: { + '^@lib/(.*)$': '/packages/docusaurus/lib/$1', + }, + testPathIgnorePatterns: ['/node_modules/', '__fixtures__'], + transform: { + '^.+\\.js$': '/jest.transform.js', + }, +}; diff --git a/v1/jest.transform.js b/jest.transform.js similarity index 100% rename from v1/jest.transform.js rename to jest.transform.js diff --git a/lerna.json b/lerna.json new file mode 100644 index 0000000000..87d0fc7316 --- /dev/null +++ b/lerna.json @@ -0,0 +1,6 @@ +{ + "lerna": "3.13.1", + "version": "independent", + "npmClient": "yarn", + "useWorkspaces": true +} diff --git a/package.json b/package.json index 92df84ea16..a661e67008 100644 --- a/package.json +++ b/package.json @@ -1,27 +1,42 @@ { - "keywords": ["documentation", "websites", "open source", "docusaurus"], - "repository": { - "type": "git", - "url": "https://github.com/facebook/Docusaurus.git" - }, + "private": true, + "workspaces": [ + "packages/*", + "website", + "website-1.x" + ], "scripts": { - "lint:v1": "cd v1 && yarn lint", - "lint:v2": "cd v2 && yarn lint", - "prettier:v1": "cd v1 && yarn prettier", - "prettier:v2": "cd v2 && yarn prettier", - "prettier": "yarn prettier:v1 && yarn prettier:v2", + "prettier": "prettier --config .prettierrc --write \"**/*.js\"", "prettier:diff": "prettier --config .prettierrc --list-different \"**/*.js\"", - "start": "cd v1/website && yarn start" + "lint": "eslint --cache \"**/*.js\"", + "lerna": "lerna", + "test": "jest" }, "devDependencies": { + "lerna": "^3.13.1", "husky": "^1.3.1", "lint-staged": "^7.2.0", - "prettier": "^1.13.7" + "prettier": "^1.13.7", + "babel-core": "^7.0.0-bridge.0", + "babel-eslint": "8", + "eslint": "4.x", + "eslint-config-airbnb": "17.1.0", + "eslint-config-prettier": "^2.9.0", + "eslint-plugin-import": "^2.14.0", + "eslint-plugin-jsx-a11y": "^6.0.3", + "eslint-plugin-react": "^7.11.1", + "eslint-plugin-react-hooks": "^0.0.0", + "jest": "^24.1.0", + "react": "^16.8.4", + "react-dom": "^16.8.4", + "filepath": "^1.1.0", + "front-matter": "^2.3.0", + "rimraf": "^2.6.2", + "glob-promise": "^3.3.0" }, "lint-staged": { "linters": { - "v1/**/*.js": ["yarn lint:v1 --fix", "yarn prettier:v1", "git add"], - "v2/**/*.js": ["yarn lint:v2 --fix", "yarn prettier:v2", "git add"] + "*.js": ["yarn lint --fix", "yarn prettier", "git add"] } }, "husky": { diff --git a/v1/.eslintignore b/packages/docusaurus-1.x/.eslintignore similarity index 100% rename from v1/.eslintignore rename to packages/docusaurus-1.x/.eslintignore diff --git a/v1/.eslintrc.js b/packages/docusaurus-1.x/.eslintrc.js similarity index 100% rename from v1/.eslintrc.js rename to packages/docusaurus-1.x/.eslintrc.js diff --git a/v1/.gitignore b/packages/docusaurus-1.x/.gitignore similarity index 100% rename from v1/.gitignore rename to packages/docusaurus-1.x/.gitignore diff --git a/v1/.npmignore b/packages/docusaurus-1.x/.npmignore similarity index 100% rename from v1/.npmignore rename to packages/docusaurus-1.x/.npmignore diff --git a/v1/README.md b/packages/docusaurus-1.x/README.md similarity index 70% rename from v1/README.md rename to packages/docusaurus-1.x/README.md index 107e01e5ce..a2a3849c7d 100644 --- a/v1/README.md +++ b/packages/docusaurus-1.x/README.md @@ -4,12 +4,15 @@

- npm version + + + npm version CircleCI Status PRs Welcome Chat code style: prettier Tested with Jest + Netlify Status

## Introduction @@ -26,6 +29,22 @@ Docusaurus is available as the [`docusaurus` package](https://www.npmjs.com/pack We have also released the [`docusaurus-init` package](https://www.npmjs.com/package/docusaurus-init) to make [getting started](https://docusaurus.io/docs/en/installation.html) with Docusaurus even easier. +## Contributing + +We've released Docusaurus because it helps us better scale and support the many OSS projects at Facebook. We hope that other organizations can benefit from the project. We are thankful for any contributions from the community. + +### [Code of Conduct](https://code.fb.com/codeofconduct) + +Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.fb.com/codeofconduct) so that you can understand what actions will and will not be tolerated. + +### Contributing Guide + +Read our [contributing guide](https://github.com/facebook/Docusaurus/blob/master/CONTRIBUTING.md) to learn about our development process, how to propose bugfixes and improvements, and how to build and test your changes to Docusaurus. + +### Beginner Friendly Bugs + +To help you get your feet wet and get you familiar with our contribution process, we have a list of [beginner friendly bugs](https://github.com/facebook/Docusaurus/labels/good%20first%20issue) that contain bugs which are fairly easy to fix. This is a great place to get started. + ## Contact We have a few channels for contact: diff --git a/v1/crowdin.yaml b/packages/docusaurus-1.x/crowdin.yaml similarity index 100% rename from v1/crowdin.yaml rename to packages/docusaurus-1.x/crowdin.yaml diff --git a/v1/examples/basics/Dockerfile b/packages/docusaurus-1.x/examples/basics/Dockerfile similarity index 100% rename from v1/examples/basics/Dockerfile rename to packages/docusaurus-1.x/examples/basics/Dockerfile diff --git a/v1/examples/basics/README.md b/packages/docusaurus-1.x/examples/basics/README.md similarity index 100% rename from v1/examples/basics/README.md rename to packages/docusaurus-1.x/examples/basics/README.md diff --git a/v1/examples/basics/blog-examples-from-docusaurus/2016-03-11-blog-post.md b/packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2016-03-11-blog-post.md old mode 100755 new mode 100644 similarity index 100% rename from v1/examples/basics/blog-examples-from-docusaurus/2016-03-11-blog-post.md rename to packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2016-03-11-blog-post.md diff --git a/v1/examples/basics/blog-examples-from-docusaurus/2017-04-10-blog-post-two.md b/packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2017-04-10-blog-post-two.md similarity index 100% rename from v1/examples/basics/blog-examples-from-docusaurus/2017-04-10-blog-post-two.md rename to packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2017-04-10-blog-post-two.md diff --git a/v1/examples/basics/blog-examples-from-docusaurus/2017-09-25-testing-rss.md b/packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2017-09-25-testing-rss.md similarity index 100% rename from v1/examples/basics/blog-examples-from-docusaurus/2017-09-25-testing-rss.md rename to packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2017-09-25-testing-rss.md diff --git a/v1/examples/basics/blog-examples-from-docusaurus/2017-09-26-adding-rss.md b/packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2017-09-26-adding-rss.md similarity index 100% rename from v1/examples/basics/blog-examples-from-docusaurus/2017-09-26-adding-rss.md rename to packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2017-09-26-adding-rss.md diff --git a/v1/examples/basics/blog-examples-from-docusaurus/2017-10-24-new-version-1.0.0.md b/packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2017-10-24-new-version-1.0.0.md similarity index 100% rename from v1/examples/basics/blog-examples-from-docusaurus/2017-10-24-new-version-1.0.0.md rename to packages/docusaurus-1.x/examples/basics/blog-examples-from-docusaurus/2017-10-24-new-version-1.0.0.md diff --git a/v1/examples/basics/core/Footer.js b/packages/docusaurus-1.x/examples/basics/core/Footer.js similarity index 100% rename from v1/examples/basics/core/Footer.js rename to packages/docusaurus-1.x/examples/basics/core/Footer.js diff --git a/v1/examples/basics/docker-compose.yml b/packages/docusaurus-1.x/examples/basics/docker-compose.yml similarity index 100% rename from v1/examples/basics/docker-compose.yml rename to packages/docusaurus-1.x/examples/basics/docker-compose.yml diff --git a/v1/examples/basics/dockerignore b/packages/docusaurus-1.x/examples/basics/dockerignore similarity index 100% rename from v1/examples/basics/dockerignore rename to packages/docusaurus-1.x/examples/basics/dockerignore diff --git a/v1/examples/basics/docs-examples-from-docusaurus/doc1.md b/packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/doc1.md similarity index 100% rename from v1/examples/basics/docs-examples-from-docusaurus/doc1.md rename to packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/doc1.md diff --git a/v1/examples/basics/docs-examples-from-docusaurus/doc2.md b/packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/doc2.md similarity index 100% rename from v1/examples/basics/docs-examples-from-docusaurus/doc2.md rename to packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/doc2.md diff --git a/v1/examples/basics/docs-examples-from-docusaurus/doc3.md b/packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/doc3.md similarity index 100% rename from v1/examples/basics/docs-examples-from-docusaurus/doc3.md rename to packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/doc3.md diff --git a/v1/examples/basics/docs-examples-from-docusaurus/exampledoc4.md b/packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/exampledoc4.md similarity index 100% rename from v1/examples/basics/docs-examples-from-docusaurus/exampledoc4.md rename to packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/exampledoc4.md diff --git a/v1/examples/basics/docs-examples-from-docusaurus/exampledoc5.md b/packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/exampledoc5.md similarity index 100% rename from v1/examples/basics/docs-examples-from-docusaurus/exampledoc5.md rename to packages/docusaurus-1.x/examples/basics/docs-examples-from-docusaurus/exampledoc5.md diff --git a/v1/examples/basics/gitignore b/packages/docusaurus-1.x/examples/basics/gitignore similarity index 100% rename from v1/examples/basics/gitignore rename to packages/docusaurus-1.x/examples/basics/gitignore diff --git a/v1/examples/basics/pages/en/help.js b/packages/docusaurus-1.x/examples/basics/pages/en/help.js old mode 100755 new mode 100644 similarity index 100% rename from v1/examples/basics/pages/en/help.js rename to packages/docusaurus-1.x/examples/basics/pages/en/help.js diff --git a/v1/examples/basics/pages/en/index.js b/packages/docusaurus-1.x/examples/basics/pages/en/index.js old mode 100755 new mode 100644 similarity index 100% rename from v1/examples/basics/pages/en/index.js rename to packages/docusaurus-1.x/examples/basics/pages/en/index.js diff --git a/v1/examples/basics/pages/en/users.js b/packages/docusaurus-1.x/examples/basics/pages/en/users.js similarity index 100% rename from v1/examples/basics/pages/en/users.js rename to packages/docusaurus-1.x/examples/basics/pages/en/users.js diff --git a/v1/examples/basics/sidebars.json b/packages/docusaurus-1.x/examples/basics/sidebars.json similarity index 100% rename from v1/examples/basics/sidebars.json rename to packages/docusaurus-1.x/examples/basics/sidebars.json diff --git a/v1/examples/basics/siteConfig.js b/packages/docusaurus-1.x/examples/basics/siteConfig.js similarity index 100% rename from v1/examples/basics/siteConfig.js rename to packages/docusaurus-1.x/examples/basics/siteConfig.js diff --git a/v1/examples/basics/static/css/custom.css b/packages/docusaurus-1.x/examples/basics/static/css/custom.css similarity index 100% rename from v1/examples/basics/static/css/custom.css rename to packages/docusaurus-1.x/examples/basics/static/css/custom.css diff --git a/v1/examples/basics/static/img/docusaurus.svg b/packages/docusaurus-1.x/examples/basics/static/img/docusaurus.svg similarity index 100% rename from v1/examples/basics/static/img/docusaurus.svg rename to packages/docusaurus-1.x/examples/basics/static/img/docusaurus.svg diff --git a/v1/examples/basics/static/img/favicon.png b/packages/docusaurus-1.x/examples/basics/static/img/favicon.png similarity index 100% rename from v1/examples/basics/static/img/favicon.png rename to packages/docusaurus-1.x/examples/basics/static/img/favicon.png diff --git a/v1/examples/basics/static/img/favicon/favicon.ico b/packages/docusaurus-1.x/examples/basics/static/img/favicon/favicon.ico similarity index 100% rename from v1/examples/basics/static/img/favicon/favicon.ico rename to packages/docusaurus-1.x/examples/basics/static/img/favicon/favicon.ico diff --git a/v1/examples/basics/static/img/oss_logo.png b/packages/docusaurus-1.x/examples/basics/static/img/oss_logo.png similarity index 100% rename from v1/examples/basics/static/img/oss_logo.png rename to packages/docusaurus-1.x/examples/basics/static/img/oss_logo.png diff --git a/v1/examples/translations/crowdin.yaml b/packages/docusaurus-1.x/examples/translations/crowdin.yaml similarity index 100% rename from v1/examples/translations/crowdin.yaml rename to packages/docusaurus-1.x/examples/translations/crowdin.yaml diff --git a/v1/examples/translations/languages.js b/packages/docusaurus-1.x/examples/translations/languages.js similarity index 100% rename from v1/examples/translations/languages.js rename to packages/docusaurus-1.x/examples/translations/languages.js diff --git a/v1/examples/translations/pages/en/help-with-translations.js b/packages/docusaurus-1.x/examples/translations/pages/en/help-with-translations.js similarity index 100% rename from v1/examples/translations/pages/en/help-with-translations.js rename to packages/docusaurus-1.x/examples/translations/pages/en/help-with-translations.js diff --git a/v1/examples/versions/pages/en/versions.js b/packages/docusaurus-1.x/examples/versions/pages/en/versions.js similarity index 100% rename from v1/examples/versions/pages/en/versions.js rename to packages/docusaurus-1.x/examples/versions/pages/en/versions.js diff --git a/v1/lib/__tests__/build-files.test.js b/packages/docusaurus-1.x/lib/__tests__/build-files.test.js similarity index 94% rename from v1/lib/__tests__/build-files.test.js rename to packages/docusaurus-1.x/lib/__tests__/build-files.test.js index 2c1203179f..d307cf813d 100644 --- a/v1/lib/__tests__/build-files.test.js +++ b/packages/docusaurus-1.x/lib/__tests__/build-files.test.js @@ -17,8 +17,8 @@ const CWD = process.cwd(); const loadConfig = require('../server/config'); -const siteConfig = loadConfig(`${CWD}/website/siteConfig.js`); -const buildDir = `${CWD}/website/build`; +const siteConfig = loadConfig(`${CWD}/website-1.x/siteConfig.js`); +const buildDir = `${CWD}/website-1.x/build`; const docsDir = `${CWD}/docs`; let inputMarkdownFiles = []; @@ -27,7 +27,7 @@ let outputHTMLFiles = []; let outputAssetsFiles = []; function generateSite() { - shell.cd('website'); + shell.cd('website-1.x'); shell.exec('yarn build', {silent: true}); } diff --git a/v1/lib/build-files.js b/packages/docusaurus-1.x/lib/build-files.js old mode 100755 new mode 100644 similarity index 100% rename from v1/lib/build-files.js rename to packages/docusaurus-1.x/lib/build-files.js diff --git a/v1/lib/copy-examples.js b/packages/docusaurus-1.x/lib/copy-examples.js old mode 100755 new mode 100644 similarity index 100% rename from v1/lib/copy-examples.js rename to packages/docusaurus-1.x/lib/copy-examples.js diff --git a/v1/lib/core/BlogPageLayout.js b/packages/docusaurus-1.x/lib/core/BlogPageLayout.js similarity index 100% rename from v1/lib/core/BlogPageLayout.js rename to packages/docusaurus-1.x/lib/core/BlogPageLayout.js diff --git a/v1/lib/core/BlogPost.js b/packages/docusaurus-1.x/lib/core/BlogPost.js similarity index 100% rename from v1/lib/core/BlogPost.js rename to packages/docusaurus-1.x/lib/core/BlogPost.js diff --git a/v1/lib/core/BlogPostLayout.js b/packages/docusaurus-1.x/lib/core/BlogPostLayout.js similarity index 100% rename from v1/lib/core/BlogPostLayout.js rename to packages/docusaurus-1.x/lib/core/BlogPostLayout.js diff --git a/v1/lib/core/BlogSidebar.js b/packages/docusaurus-1.x/lib/core/BlogSidebar.js similarity index 100% rename from v1/lib/core/BlogSidebar.js rename to packages/docusaurus-1.x/lib/core/BlogSidebar.js diff --git a/v1/lib/core/CodeTabsMarkdownBlock.js b/packages/docusaurus-1.x/lib/core/CodeTabsMarkdownBlock.js similarity index 100% rename from v1/lib/core/CodeTabsMarkdownBlock.js rename to packages/docusaurus-1.x/lib/core/CodeTabsMarkdownBlock.js diff --git a/v1/lib/core/CompLibrary.js b/packages/docusaurus-1.x/lib/core/CompLibrary.js similarity index 100% rename from v1/lib/core/CompLibrary.js rename to packages/docusaurus-1.x/lib/core/CompLibrary.js diff --git a/v1/lib/core/Container.js b/packages/docusaurus-1.x/lib/core/Container.js similarity index 100% rename from v1/lib/core/Container.js rename to packages/docusaurus-1.x/lib/core/Container.js diff --git a/v1/lib/core/Doc.js b/packages/docusaurus-1.x/lib/core/Doc.js similarity index 100% rename from v1/lib/core/Doc.js rename to packages/docusaurus-1.x/lib/core/Doc.js diff --git a/v1/lib/core/DocsLayout.js b/packages/docusaurus-1.x/lib/core/DocsLayout.js similarity index 100% rename from v1/lib/core/DocsLayout.js rename to packages/docusaurus-1.x/lib/core/DocsLayout.js diff --git a/v1/lib/core/DocsSidebar.js b/packages/docusaurus-1.x/lib/core/DocsSidebar.js similarity index 100% rename from v1/lib/core/DocsSidebar.js rename to packages/docusaurus-1.x/lib/core/DocsSidebar.js diff --git a/v1/lib/core/GridBlock.js b/packages/docusaurus-1.x/lib/core/GridBlock.js old mode 100755 new mode 100644 similarity index 100% rename from v1/lib/core/GridBlock.js rename to packages/docusaurus-1.x/lib/core/GridBlock.js diff --git a/v1/lib/core/Head.js b/packages/docusaurus-1.x/lib/core/Head.js similarity index 80% rename from v1/lib/core/Head.js rename to packages/docusaurus-1.x/lib/core/Head.js index 4bf4afb14a..0cfc0b2c26 100644 --- a/v1/lib/core/Head.js +++ b/packages/docusaurus-1.x/lib/core/Head.js @@ -96,33 +96,30 @@ class Head extends React.Component { title={`${this.props.config.title} Blog RSS Feed`} /> )} - {this.props.config.gaTrackingId && - this.props.config.gaGtag && ( -