Merge branch 'main' into feat/starter-example

pmndrs · Dec 28, 2024 · c6bcd51 · c6bcd51
2 parents 0c41dbe + 0e7975b
commit c6bcd51
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 21 deletions.
diff --git a/.github/workflows/compressed-size-action.yml b/.github/workflows/compressed-size-action.yml
@@ -12,7 +12,6 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
       - uses: preactjs/compressed-size-action@v2
         with:
           pattern: './dist/**/*.{js,mjs}'
diff --git a/.github/workflows/cr.yml b/.github/workflows/cr.yml
@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: corepack enable
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
       - run: pnpm install
       - run: pnpm build
-      - run: pnpx pkg-pr-new publish './dist' --compact --template './examples/*'
+      - run: pnpm dlx pkg-pr-new publish './dist' --compact --template './examples/*'
diff --git a/.github/workflows/lint-and-type.yml b/.github/workflows/lint-and-type.yml
@@ -16,8 +16,7 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm test:format
       - run: pnpm test:types
       - run: pnpm test:lint
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -15,8 +15,7 @@ jobs:
           node-version: 20
           registry-url: 'https://registry.npmjs.org'
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm test
       - run: pnpm build
       - run: npm publish

diff --git a/.github/workflows/test-multiple-builds.yml b/.github/workflows/test-multiple-builds.yml
@@ -21,8 +21,7 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm build
       - name: Patch for DEV-ONLY
         if: ${{ matrix.env == 'development' }}

diff --git a/.github/workflows/test-multiple-versions.yml b/.github/workflows/test-multiple-versions.yml
@@ -16,8 +16,7 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm build # we don't have any other workflows to test build
       - run: pnpm test:spec
 
@@ -41,8 +40,7 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm build # for macro test
       - name: Install legacy testing-library
         if: ${{ startsWith(matrix.react, '16.') || startsWith(matrix.react, '17.') }}

diff --git a/.github/workflows/test-old-typescript.yml b/.github/workflows/test-old-typescript.yml
@@ -31,8 +31,7 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          cache-dependency-path: '**/pnpm-lock.yaml'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm install
       - run: pnpm build
       - name: Patch for all TS
         run: |

diff --git a/examples/counter/package.json b/examples/counter/package.json
@@ -10,7 +10,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@types/lowlight": "^0.0.7",
     "highlight.js": "^11.11.0",
+    "lowlight": "^3.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-lowlight": "^3.0.1",

diff --git a/examples/counter/pnpm-lock.yaml b/examples/counter/pnpm-lock.yaml
diff --git a/website/styles/prism-theme.css b/website/styles/prism-theme.css
@@ -35,9 +35,14 @@ pre {
 }
 
 :not(pre) > code[class*="language-"],
-code {
+pre[class*="language-"] {
+  background: #2e3440;
+  padding: 1em;
+}
+
+code:not([class*="language-"]) {
+  padding: 0.1em 0.3em;
   background: #2e3440;
-  padding: 0.1em;
 }
 
 code {
@@ -164,7 +169,3 @@ blockquote {
 .important {
   border-left: 5px solid #a3be8c;
 }
-
-code {
-
-}