Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b6e24d7
Update parcel dependency
davenquinn Jun 25, 2025
6c28664
Started updating types
davenquinn Jun 25, 2025
9760069
Prepared several packages
davenquinn Jun 25, 2025
8d4c461
Update changelog for column views
davenquinn Jun 25, 2025
ec4e166
Update changelog for @macrostrat/data-sheet
davenquinn Jun 25, 2025
1672b4e
Handle strange typing errors
davenquinn Jun 25, 2025
867fcc6
Updated feedback components
davenquinn Jun 25, 2025
2b777b6
Prepare a few new packages
davenquinn Jun 25, 2025
c9adbf8
Updated version and changelog
davenquinn Jun 25, 2025
c6efc59
Updated GitHub workflows
davenquinn Jun 25, 2025
cf732cd
Updated GitHub workflows
davenquinn Jun 25, 2025
ab52980
Updated GitHub workflows
davenquinn Jun 25, 2025
888994d
Updated prepare script
davenquinn Jun 25, 2025
1224ad0
Added some release preparation logic
davenquinn Jun 25, 2025
85c9e94
Updated workflows
davenquinn Jun 26, 2025
517e34e
Renamed workflows
davenquinn Jun 26, 2025
27785e2
Set up auto formatting
davenquinn Jun 26, 2025
29f6501
Updated workflows (again)
davenquinn Jun 26, 2025
5a4f178
Updated workflows (yet again)
davenquinn Jun 26, 2025
d4425e6
Fixed code formatting workflow
davenquinn Jun 26, 2025
ecc554c
Updated github workflows
davenquinn Jun 26, 2025
aa96123
Updated pull request checks
davenquinn Jun 26, 2025
296ad7b
Updated workflows again
davenquinn Jun 26, 2025
14466dd
Move checkin list component to @macrostrat/data-components
davenquinn Jun 26, 2025
19aa237
Simplify checkin list component further
davenquinn Jun 26, 2025
bcebf2b
Create per-package TSConfig files
davenquinn Jun 26, 2025
3087488
Added yarn sdks
davenquinn Jun 26, 2025
93f83be
Works reasonably well but for some typescript errors
davenquinn Jun 26, 2025
dc1c5fd
Apply formatting changes
davenquinn Jun 26, 2025
8d3c301
Removed search bar component - too generic
davenquinn Jun 26, 2025
fd2d2d1
Updated package builds
davenquinn Jun 26, 2025
70f2506
Merge remote-tracking branch 'origin/prepare-release' into prepare-re…
davenquinn Jun 26, 2025
8576e3e
Updated yarn lock
davenquinn Jun 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,53 +1,79 @@
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write
name: Continuous integration and deployment

# On the main branch, successful commits will trigger a deployment to NPM
# and building the storybook.

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
group: "deployment"
cancel-in-progress: false

on:
# When pushing, we also want to deploy packages to NPM
push:
branches: [main]

env:
VITE_MAPBOX_API_TOKEN: ${{ secrets.VITE_MAPBOX_API_TOKEN }}

jobs:
test:
name: CI build
prepare-and-publish-packages:
name: Prepare and publish packages
runs-on: ubuntu-latest
environment: development
env:
# Ensure that Chalk uses colors in the output
FORCE_COLOR: 2
steps:

- name: Check out repository
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 22
cache: "yarn"

- name: Install dependencies
run: |
yarn install --frozen-lockfile

- name: Build all packages
run: |
yarn run build

- name: Publish and tag releases
run: |
yarn run publish
env:
YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}

- name: Pin react-docgen version
run: yarn add -D [email protected]
build-storybook:
name: Build and deploy storybook
runs-on: ubuntu-latest
environment: development
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 22
cache: "yarn"

- name: Install dependencies
run: |
yarn install
yarn install --frozen-lockfile

- name: Build storybook
run: |
yarn run build:storybook
env:
VITE_MAPBOX_API_TOKEN: ${{ secrets.VITE_MAPBOX_API_TOKEN }}

- name: Install rclone
run: |
curl https://rclone.org/install.sh | sudo bash

- name: Upload to S3
- name: Upload storybook to S3
env:
S3_BUCKET: ${{ vars.S3_BUCKET }}
S3_PATH: ${{ vars.S3_PATH }}
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/dev.pr.yaml

This file was deleted.

37 changes: 37 additions & 0 deletions .github/workflows/format-code.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Format code

on:
pull_request:
branches: [main]
push:
branches: [main]

jobs:
format-code:
name: Format code
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 22

- name: Install Prettier
# Use global install to ensure Prettier is available
# and that we don't modify the package.json
run: |
npm install -g prettier

# Prettify code and commit if changes
- name: Format code
run: |
prettier --write .

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply formatting changes
branch: ${{ github.head_ref }}
76 changes: 76 additions & 0 deletions .github/workflows/pull-request-checks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Continuous integration

# Group requests for the same pull request to avoid multiple builds
concurrency:
group: ${{ github.head_ref || github.ref_name }}
cancel-in-progress: true

on:
pull_request:
branches: [main]

jobs:
prepare-and-build-packages:
name: Prepare and build packages
runs-on: ubuntu-latest
env:
# Ensure that Chalk uses colors in the output
FORCE_COLOR: 2
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 22
cache: "yarn"

- name: Install dependencies
run: |
yarn install --frozen-lockfile

# We could probably get the release status
# without installing all dependencies,
# allowing this to be set up as another job.
- name: Get release status
id: status
run: |
yarn run status
if: always()

- name: Build all packages
id: build
run: |
yarn run build
if: always()

- name: Final check
if: always()
run: |
echo "Checking the outcome of build steps..."
if [ "${{ steps.status.outcome }}" != "success" ] || [ "${{ steps.build.outcome }}" != "success" ]; then
echo "One or more checks failed."
exit 1
fi

build-storybook:
name: Build storybook
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 22
cache: "yarn"

- name: Install dependencies
run: |
yarn install --frozen-lockfile

- name: Build storybook
run: |
yarn run build:storybook
5 changes: 1 addition & 4 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"recommendations": [
"arcanis.vscode-zipfs",
"esbenp.prettier-vscode"
]
"recommendations": ["arcanis.vscode-zipfs", "esbenp.prettier-vscode"]
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"**/.yarn": true,
"**/.pnp.*": true
},
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",
"prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
"files.exclude": {
"**/.git": true,
"**/.svn": true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire, register} = require(`module`);
const {resolve} = require(`path`);
const {pathToFileURL} = require(`url`);
const { existsSync } = require(`fs`);
const { createRequire, register } = require(`module`);
const { resolve } = require(`path`);
const { pathToFileURL } = require(`url`);

const relPnpApiPath = "../../../.pnp.cjs";
const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
Expand All @@ -16,7 +16,7 @@ const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require prettier/bin-prettier.js
// Setup the environment to be able to require prettier/bin/prettier.cjs
require(absPnpApiPath).setup();
if (isPnpLoaderEnabled && register) {
register(pathToFileURL(absPnpLoaderPath));
Expand All @@ -25,8 +25,8 @@ if (existsSync(absPnpApiPath)) {
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;
? (exports) => absRequire(absUserWrapperPath)(exports)
: (exports) => exports;

// Defer to the real prettier/bin-prettier.js your application uses
module.exports = wrapWithUserWrapper(absRequire(`prettier/bin-prettier.js`));
// Defer to the real prettier/bin/prettier.cjs your application uses
module.exports = wrapWithUserWrapper(absRequire(`prettier/bin/prettier.cjs`));
12 changes: 6 additions & 6 deletions .yarn/sdks/prettier/index.js → .yarn/sdks/prettier/index.cjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire, register} = require(`module`);
const {resolve} = require(`path`);
const {pathToFileURL} = require(`url`);
const { existsSync } = require(`fs`);
const { createRequire, register } = require(`module`);
const { resolve } = require(`path`);
const { pathToFileURL } = require(`url`);

const relPnpApiPath = "../../../.pnp.cjs";

Expand All @@ -25,8 +25,8 @@ if (existsSync(absPnpApiPath)) {
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;
? (exports) => absRequire(absUserWrapperPath)(exports)
: (exports) => exports;

// Defer to the real prettier your application uses
module.exports = wrapWithUserWrapper(absRequire(`prettier`));
6 changes: 3 additions & 3 deletions .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "prettier",
"version": "2.8.8-sdk",
"main": "./index.js",
"version": "3.6.1-sdk",
"main": "./index.cjs",
"type": "commonjs",
"bin": "./bin-prettier.js"
"bin": "./bin/prettier.cjs"
}
12 changes: 6 additions & 6 deletions .yarn/sdks/typescript/bin/tsc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire, register} = require(`module`);
const {resolve} = require(`path`);
const {pathToFileURL} = require(`url`);
const { existsSync } = require(`fs`);
const { createRequire, register } = require(`module`);
const { resolve } = require(`path`);
const { pathToFileURL } = require(`url`);

const relPnpApiPath = "../../../../.pnp.cjs";

Expand All @@ -25,8 +25,8 @@ if (existsSync(absPnpApiPath)) {
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;
? (exports) => absRequire(absUserWrapperPath)(exports)
: (exports) => exports;

// Defer to the real typescript/bin/tsc your application uses
module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`));
12 changes: 6 additions & 6 deletions .yarn/sdks/typescript/bin/tsserver
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire, register} = require(`module`);
const {resolve} = require(`path`);
const {pathToFileURL} = require(`url`);
const { existsSync } = require(`fs`);
const { createRequire, register } = require(`module`);
const { resolve } = require(`path`);
const { pathToFileURL } = require(`url`);

const relPnpApiPath = "../../../../.pnp.cjs";

Expand All @@ -25,8 +25,8 @@ if (existsSync(absPnpApiPath)) {
}

const wrapWithUserWrapper = existsSync(absUserWrapperPath)
? exports => absRequire(absUserWrapperPath)(exports)
: exports => exports;
? (exports) => absRequire(absUserWrapperPath)(exports)
: (exports) => exports;

// Defer to the real typescript/bin/tsserver your application uses
module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`));
Loading