Skip to content

Commit 5e18a16

Browse files
authored
Merge pull request #3 from explorable-viz/ship-article-website-1345
Ship article website + install script with NPM library #1345
2 parents 7bf2a9e + ebac97c commit 5e18a16

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+12
-1606
lines changed

.github/workflows/test-deploy.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ jobs:
2222
- name: run-test
2323
run: |
2424
yarn install
25+
yarn install-article
2526
set -x -e
26-
yarn fluid bundle-website -w article -l
27+
yarn bundle-website article
2728
export PUPPETEER_CACHE_DIR=$GITHUB_WORKSPACE/
2829
# requires Puppeteer to be installed at same version as used in Fluid
2930
yarn puppeteer browsers install chrome
@@ -41,7 +42,7 @@ jobs:
4142
run: |
4243
yarn install
4344
set -x -e
44-
yarn fluid bundle-website -w article -l
45+
yarn bundle-website article
4546
- name: gh-pages
4647
uses: peaceiris/actions-gh-pages@v3
4748
with:

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ Windows users may also require
2222

2323
1. Run `yarn install`
2424

25+
2. Run `yarn install-article` to copy the example site from `@exploreable-viz/fluid`
26+
2527
### Bundling website
2628

2729
To bundle a website:
28-
1. Run `yarn fluid bundle-website -w $WEBSITE_NAME -l`
30+
1. Run `yarn bundle-website $WEBSITE_NAME`
2931

3032
This will create a folder in `dist` called `$WEBSITE_NAME`.
3133

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
"url": "https://github.com/explorable-viz/fluid/issues"
1313
},
1414
"scripts": {
15-
"bundle": "yarn fluid bundle-website -w article -l",
15+
"bundle": "yarn bundle-website article",
1616
"bundle-serve": "yarn bundle && yarn serve",
1717
"serve": "npx http-serve dist/article",
1818
"test": "yarn website-test article"
1919
},
2020
"packageManager": "yarn@1.22.22",
2121
"dependencies": {
22-
"@explorable-viz/fluid": "^0.7.90"
22+
"@explorable-viz/fluid": "^0.7.99"
2323
},
2424
"devDependencies": {
2525
"puppeteer": "23.2.0"

website/article/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

website/article/convolution/index.html

Lines changed: 0 additions & 90 deletions
This file was deleted.

website/article/convolution/spec.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

website/article/css

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

website/article/favicon.ico

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

website/article/fluid/convolution.fld

Lines changed: 0 additions & 24 deletions
This file was deleted.

website/article/fluid/convolution/emboss.fld

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)