Skip to content

Commit 70b88d0

Browse files
edwarduptonedwardupton
committed
Merge branch 'master' into littledata-docs-update
2 parents 4c371b0 + d880201 commit 70b88d0

File tree

311 files changed

+54408
-20970
lines changed

Some content is hidden

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

311 files changed

+54408
-20970
lines changed

‎.buildkite/pipeline.yml

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

‎.env.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
PLATFORM_API_TOKEN=look for me in chamber
1+
PLATFORM_API_TOKEN=look for me in chamber
2+
PAPI_TOKEN=get one from a papi-enabled workspace

‎.github/workflows/link-check.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Link Check
4+
5+
# Controls when the action will run.
6+
on:
7+
# Triggers the workflow on push or pull request events but only for the master branch
8+
pull_request:
9+
10+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
11+
jobs:
12+
markdown-link-check:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@master
16+
- uses: gaurav-nelson/github-action-markdown-link-check@v1
17+
with:
18+
use-quiet-mode: 'yes'
19+
config-file: '.mlc-config.json'
20+
use-verbose-mode: 'yes'
21+
check-modified-files-only: 'yes'

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ src/assets/docs.bundle.js
1212
yarn-error.log
1313
# Make sure to update `analytics` to the full path to your Typewriter client.
1414
.vscode/spellright.dict
15+
16+
# Local Netlify folder
17+
.netlify

‎.mlc-config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"replacementPatterns": [
3+
{
4+
"pattern": "^/docs",
5+
"replacement": "/github/workspace/src"
6+
},
7+
{
8+
"pattern": "(\\S+?)\/(\\S+?)\/?$",
9+
"replacement": "$1/$2.md"
10+
}
11+
]
12+
}

‎.vale.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ StylesPath = vale-styles
33
Vocab = Docs
44

55
[*.md]
6-
BasedOnStyles = write-good, Segment
6+
BasedOnStyles = write-good, segment
7+
TokenIgnores = ({% .* %})

‎.vscode/launch.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": []
7+
}

‎Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ group :jekyll_plugins do
1818
gem "premonition", "~> 2.0.0"
1919
gem "jekyll-include-cache"
2020
gem 'jekyll-algolia'
21+
gem 'jekyll-dotenv'
2122
end
2223

2324
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

‎Gemfile.lock

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ GEM
6060
jekyll-commonmark (1.3.1)
6161
commonmarker (~> 0.14)
6262
jekyll (>= 3.7, < 5.0)
63+
jekyll-dotenv (0.2.0)
64+
dotenv (~> 2.7)
65+
jekyll (~> 4)
6366
jekyll-include-cache (0.2.1)
6467
jekyll (>= 3.7, < 5.0)
6568
jekyll-last-modified-at (1.3.0)
@@ -85,12 +88,14 @@ GEM
8588
rb-fsevent (~> 0.10, >= 0.10.3)
8689
rb-inotify (~> 0.9, >= 0.9.10)
8790
mercenary (0.4.0)
88-
mini_portile2 (2.5.0)
91+
mini_portile2 (2.5.1)
8992
multipart-post (2.1.1)
90-
nokogiri (1.11.1)
93+
nokogiri (1.11.4)
9194
mini_portile2 (~> 2.5.0)
9295
racc (~> 1.4)
93-
nokogiri (1.11.1-x86_64-linux)
96+
nokogiri (1.11.4-x86_64-darwin)
97+
racc (~> 1.4)
98+
nokogiri (1.11.4-x86_64-linux)
9499
racc (~> 1.4)
95100
pathutil (0.16.2)
96101
forwardable-extended (~> 2.6)
@@ -103,7 +108,7 @@ GEM
103108
rb-fsevent (0.10.4)
104109
rb-inotify (0.10.1)
105110
ffi (~> 1.0)
106-
rexml (3.2.4)
111+
rexml (3.2.5)
107112
rouge (3.25.0)
108113
ruby-enum (0.8.0)
109114
i18n
@@ -124,6 +129,7 @@ GEM
124129

125130
PLATFORMS
126131
ruby
132+
x86_64-darwin-20
127133
x86_64-linux
128134

129135
DEPENDENCIES
@@ -132,6 +138,7 @@ DEPENDENCIES
132138
jekyll!
133139
jekyll-algolia
134140
jekyll-commonmark
141+
jekyll-dotenv
135142
jekyll-include-cache
136143
jekyll-last-modified-at
137144
jekyll-redirect-from

‎Makefile

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,34 @@ package: build
4949
serve: package
5050
@docker run -p 4000:80 segment-docs:latest
5151

52+
# gives us user-transparent way to swap between two different systems
5253
.PHONY: catalog
53-
catalog: vendor/bundle
54-
@node scripts/catalog.js
54+
catalog: catalog-papi
55+
56+
# uses the old configapi
57+
.PHONY: capi
58+
capi: vendor/bundle
59+
@node scripts/catalog-capi.js
60+
61+
# shorter alias
62+
.PHONY: catalog-capi
63+
catalog-capi: vendor/bundle
64+
@node scripts/catalog-capi.js
65+
66+
# uses the new public api
67+
.PHONY: catalog-papi
68+
catalog-papi: vendor/bundle
69+
@node scripts/catalog_papi.js
70+
71+
# shorter alias
72+
.PHONY: papi
73+
papi: vendor/bundle
74+
@node scripts/catalog_papi.js
75+
76+
77+
.PHONY: changelog
78+
changelog: vendor/bundle
79+
@node scripts/changelog.js
5580

5681
.PHONY: sidenav
5782
sidenav: vendor/bundle

0 commit comments

Comments
 (0)