Skip to content

Commit e60a334

Browse files
authored
Merge pull request #2976 from IBM/docs-site-update
Update Website to use more secure libraries and switch to Yarn resolutions
2 parents af5bc23 + b89cc60 commit e60a334

10 files changed

Lines changed: 18795 additions & 26781 deletions

File tree

.github/workflows/site.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,19 @@ jobs:
6060
# Record the currect directory
6161
pushd $(pwd)
6262
cd fhir/docs/
63-
npm install -g gatsby-cli
63+
npm install yarn -g
64+
yarn install -g gatsby-cli
6465
gatsby telemetry --disable
6566
6667
# Install the packages
6768
# fsevents is not used on linux images, so use --no-optional (these plugins are suspect)
68-
npm install --no-optional --save react react-copy-to-clipboard react-dom react-ga classnames carbon @carbon/addons-website carbon-components carbon-components-react carbon-addons-cloud carbon-icons gatsby gatsby-theme-carbon-starter markdown-it gatsby-plugin-manifest gatsby-plugin-slug gatsby-plugin-sitemap gatsby-plugin-sharp
69-
npm install --save gatsby-transformer-remark gatsby-source-filesystem
69+
# npm install --no-optional --save react react-copy-to-clipboard react-dom react-ga classnames carbon @carbon/addons-website carbon-components carbon-components-react carbon-addons-cloud carbon-icons gatsby gatsby-theme-carbon-starter markdown-it gatsby-plugin-manifest gatsby-plugin-slug gatsby-plugin-sitemap gatsby-plugin-sharp
70+
# npm install --save gatsby-transformer-remark gatsby-source-filesystem
71+
yarn install
7072
7173
# don't use gatsby build directly per https://github.com/gatsbyjs/gatsby/issues/17557
7274
# use the suggestion as a workaround due to path/issues in the gatsby component dependency of fsevents
73-
npm --prefix-paths run build
75+
yarn run build
7476
cp -R public/ ../../public/
7577
7678
# Return to the prior directory

docs/.babelrc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
6+
"useBuiltIns": "usage"
7+
}
8+
]
9+
],
10+
"plugins": [
11+
[
12+
"@babel/plugin-transform-classes",
13+
{
14+
"loose": true
15+
}
16+
],
17+
"@babel/plugin-proposal-class-properties"
18+
]
19+
}

docs/_config.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,3 @@ description: >-
77
a focus on performance and configurability.
88
baseurl: ""
99
url: "https://ibm.github.io/fhir"
10-
11-
# Build settings
12-
plugins:
13-
- jekyll-github-metadata
14-
- jekyll-sitemap
15-
16-
source: ./_site/
17-
destination: ./_site/
18-
show_drafts: false
19-
future: false
20-
21-
markdown: kramdown
22-
23-
# Remote Theme - https://github.blog/2017-11-29-use-any-theme-with-github-pages/
24-
theme: jekyll-theme-slate
25-
26-
relative_links:
27-
enabled: true
28-
collections: false
29-
30-
include:
31-
- public/
32-
- _site/
33-
- index.html
34-
35-
repository: IBM/FHIR

docs/build-site.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
###############################################################################
88
set -ex
99

10-
# Steps that need to be executed
10+
nvm use 14.0
1111

12-
# install gatsby and plugins
13-
# npm install gatsby-plugin-slug --save
14-
npm install
12+
nvm install 14.0
1513

16-
gatsby build --prefix-paths
14+
npm install yarn -g
1715

18-
# Run gatsby serve to see what the site looks like.
16+
yarn install
17+
18+
yarn run build:dev

docs/create-fhir-validation-assembly.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)