Skip to content

Commit

Permalink
Merge branch 'main' into bugfix/astroid-for-hydration-script-ignores-…
Browse files Browse the repository at this point in the history
…prop-differences
  • Loading branch information
matsdahlin committed Jul 24, 2021
2 parents 15d3acb + e2d37ca commit 2d728a0
Show file tree
Hide file tree
Showing 26 changed files with 55 additions and 278 deletions.
3 changes: 3 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,18 @@
"dull-queens-melt",
"eight-mangos-pretend",
"empty-otters-smell",
"empty-trainers-chew",
"fair-cats-count",
"fair-flowers-sleep",
"famous-bees-fry",
"five-bobcats-joke",
"flat-apes-pump",
"funny-beers-knock",
"good-teachers-relax",
"healthy-pants-rule",
"lemon-jars-poke",
"lemon-yaks-dream",
"lovely-cats-sin",
"odd-cameras-wave",
"silver-goats-repeat",
"strange-kids-sing",
Expand Down
20 changes: 5 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Changelog

on:
push:
paths:
- '.changeset/**'
branches:
- main

Expand All @@ -21,19 +19,11 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 14.x

- name: Get yarn cache directory
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Set dependencies cache
uses: actions/cache@v2
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('yarn.lock') }}
${{ runner.os }}-${{ matrix.node_version }}-

- name: Install dependencies
run: yarn --frozen-lockfile --ignore-engines
env:
CI: true

- name: Create release PR
uses: changesets/action@master
Expand Down
2 changes: 1 addition & 1 deletion examples/blog-multiple-authors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"devDependencies": {
"@astrojs/renderer-lit": "^0.1.0",
"astro": "^0.18.0-next.4"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.18.0-next.4",
"astro": "^0.18.0-next.5",
"@astrojs/renderer-solid": "0.1.0-next.0"
},
"snowpack": {
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/portfolio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/snowpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"devDependencies": {
"@contentful/rich-text-html-renderer": "^14.1.2",
"@contentful/rich-text-types": "^14.1.2",
"astro": "^0.18.0-next.4"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/with-markdown-plugins/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0",
"astro": "^0.18.0-next.5",
"rehype-add-classes": "^1.0.0",
"rehype-toc": "^3.0.2",
"remark-autolink-headings": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion examples/with-markdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"dependencies": {
"nanostores": "^0.3.3"
Expand Down
2 changes: 1 addition & 1 deletion examples/with-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"devDependencies": {
"tailwindcss": "^2.1.2",
"astro": "^0.17.0"
"astro": "^0.18.0-next.5"
},
"snowpack": {
"workspaceRoot": "../.."
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/snowpackjs/astro.git"
},
"scripts": {
"release": "yarn build && yarn changeset publish",
"release": "yarn build:all && npx changeset publish",
"benchmark": "yarn workspace astro run benchmark",
"build": "yarn build:core",
"build:one": "lerna run build --scope",
Expand All @@ -28,7 +28,6 @@
"packages/renderers/*",
"packages/*",
"examples/*",
"tools/*",
"scripts",
"www",
"docs",
Expand Down
8 changes: 8 additions & 0 deletions packages/astro-parser/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @astrojs/parser

## 0.18.0-next.5

### Patch Changes

- 294a656: Adds support for global style blocks via `<style global>`

Be careful with this escape hatch! This is best reserved for uses like importing styling libraries like Tailwind, or changing global CSS variables.

## 0.18.0-next.2

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/astro-parser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@astrojs/parser",
"version": "0.18.0-next.2",
"version": "0.18.0-next.5",
"author": "Skypack",
"license": "MIT",
"type": "commonjs",
Expand Down
13 changes: 13 additions & 0 deletions packages/astro/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# astro

## 0.18.0-next.5

### Patch Changes

- 294a656: Adds support for global style blocks via `<style global>`

Be careful with this escape hatch! This is best reserved for uses like importing styling libraries like Tailwind, or changing global CSS variables.

- 164489f: Fix for `false` being rendered in conditionals
- af935c1: Fix error when no renderers are passed
- Updated dependencies [294a656]
- @astrojs/parser@0.18.0-next.5

## 0.18.0-next.4

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/astro/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "astro",
"version": "0.18.0-next.4",
"version": "0.18.0-next.5",
"author": "Skypack",
"license": "MIT",
"type": "module",
Expand Down Expand Up @@ -44,7 +44,7 @@
},
"dependencies": {
"@astrojs/markdown-support": "0.2.0",
"@astrojs/parser": "0.18.0-next.2",
"@astrojs/parser": "0.18.0-next.5",
"@astrojs/prism": "0.2.2",
"@astrojs/renderer-preact": "0.2.0-next.0",
"@astrojs/renderer-react": "0.2.0-next.0",
Expand Down
2 changes: 1 addition & 1 deletion www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"build": "astro build"
},
"devDependencies": {
"astro": "^0.18.0-next.4"
"astro": "^0.18.0-next.5"
}
}
Loading

0 comments on commit 2d728a0

Please sign in to comment.