Skip to content

Commit

Permalink
Commit older changes: CI fixes and no-op package adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
spautz committed Aug 31, 2024
1 parent 93a321d commit 485c258
Show file tree
Hide file tree
Showing 10 changed files with 296 additions and 257 deletions.
19 changes: 4 additions & 15 deletions .github/reusable-workflows/setup-repo/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,25 @@ inputs:
runs:
using: composite
steps:
- uses: pnpm/action-setup@v4.0.0

- uses: actions/setup-node@v4.0.3
if: ${{ inputs.node-version == 'nvmrc' }}
with:
node-version-file: .nvmrc
registry-url: 'https://registry.npmjs.org'
cache: 'pnpm'
- uses: actions/setup-node@v4.0.3
if: ${{ inputs.node-version != 'nvmrc' }}
with:
node-version: ${{ inputs.node-version }}
registry-url: 'https://registry.npmjs.org'
cache: 'pnpm'

- uses: oven-sh/setup-bun@v2.0.1
with:
bun-version: latest

- uses: pnpm/action-setup@v4.0.0

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4.0.2
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Remove lockfile to loosen dependency tree
if: ${{ inputs.use-lockfile == 'false' }}
shell: bash
Expand Down
11 changes: 9 additions & 2 deletions docs-website/src/pages/demo.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,19 @@ function Demo() {
`;

export const LiveDemoArea = () => {
// React in Production mode gives us a default export, which causes a syntax error with 'react-live'
// when it tries to bind a local variable for its scope.
delete demoScope.default;

return (
<section>
<LiveProvider code={demoCode} scope={demoScope}>
<LiveProvider
code={demoCode}
scope={demoScope}
>
<LiveEditor />
<LiveError />
<div class="padding-vert--md">
<div className="padding-vert--md">
<LivePreview />
</div>
</LiveProvider>
Expand Down
2 changes: 1 addition & 1 deletion packages/node-library-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"build:clean": "rimraf --glob ./dist ./legacy-types ./*.tgz",
"build:cjs": "tsup src/index.ts --format cjs --dts --outDir=./dist/cjs/ --tsconfig=./tsconfig.build-cjs.json",
"build:cjs:watch": "pnpm run build:cjs --watch",
"build:esm": "tsc -p tsconfig.build-esm.json",
"build:esm": "tsc -p tsconfig.build-esm.json --extendedDiagnostics",
"build:esm:watch": "pnpm run build:esm --watch",
"build:legacytypes": "pnpm run build:legacytypes:3.5 && pnpm run build:legacytypes:4.0 && pnpm run build:legacytypes:4.5",
"build:legacytypes:3.5": "downlevel-dts ./dist ./legacy-types/ts3.5/dist --to=3.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/node-library-template/tsconfig.build-cjs.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"extends": "../../tsconfig-base.build-cjs.json",
"compilerOptions": {
"outDir": "dist/cjs",
"declarationDir": "dist/cjs"
"outDir": "dist/cjs/",
"declarationDir": "dist/cjs/"
},
"include": ["src"]
}
4 changes: 2 additions & 2 deletions packages/node-library-template/tsconfig.build-esm.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"extends": "../../tsconfig-base.build-esm.json",
"compilerOptions": {
"outDir": "dist/esm",
"declarationDir": "dist/esm"
"outDir": "dist/esm/",
"declarationDir": "dist/esm/"
},
"include": ["src"]
}
2 changes: 1 addition & 1 deletion packages/react-library-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"build:clean": "rimraf --glob ./dist ./legacy-types ./*.tgz",
"build:cjs": "tsup src/index.ts --format cjs --dts --outDir=./dist/cjs/ --tsconfig=./tsconfig.build-cjs.json",
"build:cjs:watch": "pnpm run build:cjs --watch",
"build:esm": "tsc -p tsconfig.build-esm.json",
"build:esm": "tsc -p tsconfig.build-esm.json --extendedDiagnostics",
"build:esm:watch": "pnpm run build:esm --watch",
"build:legacytypes": "pnpm run build:legacytypes:3.5 && pnpm run build:legacytypes:4.0 && pnpm run build:legacytypes:4.5",
"build:legacytypes:3.5": "downlevel-dts ./dist ./legacy-types/ts3.5/dist --to=3.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-library-template/tsconfig.build-cjs.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"extends": "../../tsconfig-base.build-cjs.json",
"compilerOptions": {
"outDir": "dist/cjs",
"declarationDir": "dist/cjs"
"outDir": "dist/cjs/",
"declarationDir": "dist/cjs/"
},
"include": ["src"]
}
4 changes: 2 additions & 2 deletions packages/react-library-template/tsconfig.build-esm.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"extends": "../../tsconfig-base.build-esm.json",
"compilerOptions": {
"outDir": "dist/esm",
"declarationDir": "dist/esm"
"outDir": "dist/esm/",
"declarationDir": "dist/esm/"
},
"include": ["src"]
}
Loading

0 comments on commit 485c258

Please sign in to comment.