Skip to content

Commit

Permalink
chore: update to resolve documentation issues (#3329)
Browse files Browse the repository at this point in the history
* update to reconcile api files not being ignored and cleanup

* update to change build path to build from static

* update to tidy up for future name changes and correct static refs

* remove obsolete files

* update to increment minor not patch version
  • Loading branch information
awentzel authored Jun 17, 2020
1 parent 7317b41 commit 35e67bb
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 34 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cd-www-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
AZURE_WEBAPP_ACTIVE_STAGE_NAME: www-west-app
AZURE_WEBAPP_PASSIVE_STAGE_NAME: www-east-app
AZURE_WEBAPP_BUILD_PATH: sites/website
AZURE_WEBAPP_DIST_PATH: sites/website/static
AZURE_WEBAPP_DIST_PATH: sites/website/build
AZURE_WEBAPP_SLOT_NAME: stage

steps:
Expand All @@ -30,8 +30,8 @@ jobs:
cd ${{ env.AZURE_WEBAPP_BUILD_PATH }}
npm i
yarn build
cp ../site-utilities/statics/server/package.json ../site-utilities/statics/server/server.js static
cd static
cp ../site-utilities/statics/server/package.json ../site-utilities/statics/server/server.js build
cd build
npm i
ls -lta
Expand Down
14 changes: 2 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,10 @@ storybook-static
# npm package-locks
package-lock.json

# Docusaurus dependencies
lib/core/metadata.js
lib/core/MetadataBlog.js

# Docusaurus files to be ignored (legacy structure)
website/translated_docs
website/build/
website/yarn.lock
website/node_modules
website/i18n/

# Docusaurus files to ignore
sites/website/translated_docs
sites/website/build/
sites/website/docs/
sites/website/src/docs/api/
sites/website/yarn.lock
sites/website/node_modules
sites/website/i18n/
Expand Down
15 changes: 2 additions & 13 deletions sites/website/.gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
# Dependencies
/node_modules

# Production
/build
/docs
/src/docs/api
node_modules

# Generated files
.docusaurus
.cache-loader

# Misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down
6 changes: 3 additions & 3 deletions sites/website/docusaurus.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module.exports = {
title: "FAST-DNA",
tagline: "The tagline of my site",
title: "FAST",
tagline: "The adaptive interface system for modern web experiences",
url: "https://www.fast.design",
baseUrl: "/",
favicon: "img/favicon/favicon.ico",
organizationName: "microsoft",
projectName: "fast-dna",
scripts: [
{
src: "https://static.fast.design/assets/scripts/packages/fast-components.js",
src: "https://unpkg.com/@microsoft/fast-components",
type: "module",
async: true,
},
Expand Down
4 changes: 2 additions & 2 deletions sites/website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fast-dna-site",
"version": "0.0.0",
"name": "fast-site",
"version": "0.1.0",
"private": true,
"scripts": {
"clean": "node ../../build/clean.js docs",
Expand Down
1 change: 0 additions & 1 deletion sites/website/static/CNAME

This file was deleted.

Binary file removed sites/website/static/img/oss_logo.png
Binary file not shown.

0 comments on commit 35e67bb

Please sign in to comment.