Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip 0.9.1, prepare for 0.9.2, fix textmate-grammar package #2963

Merged
merged 6 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ jobs:
working-directory: packages/ops
run: pnpm turbo build

# important so that we could bump System.version
- name: Build squiggle-lang
working-directory: packages/squiggle-lang
run: pnpm turbo build
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This step is not necessary anymore, System.version is now updated with ops/ script through babel.


# if there are existing changesets, PR will be created.
# Otherwise, `publish` command will be invoked.
- name: Create Release Pull Request or Publish to npm
Expand Down
2 changes: 1 addition & 1 deletion packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @quri/squiggle-components

## 0.9.1
## 0.9.2

- Top level navigation in viewer (Result/Variables) is represented as a dropdown ([#2909](https://github.com/quantified-uncertainty/squiggle/pull/2909))

Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quri/squiggle-components",
"version": "0.9.1",
"version": "0.9.2",
"license": "MIT",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/prettier-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @quri/prettier-plugin-squiggle

## 0.9.1
## 0.9.2

- Fixed Prettier bug where trailing comma after single-element dict key would be removed ([#2946](https://github.com/quantified-uncertainty/squiggle/pull/2946))

Expand Down
2 changes: 1 addition & 1 deletion packages/prettier-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quri/prettier-plugin-squiggle",
"version": "0.9.1",
"version": "0.9.2",
"license": "MIT",
"homepage": "https://squiggle-language.com",
"author": "Quantified Uncertainty Research Institute",
Expand Down
2 changes: 1 addition & 1 deletion packages/squiggle-lang/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# @quri/squiggle-lang

## 0.9.1
## 0.9.2

- Breaking: Deprecated `Plot` titles ([#2925](https://github.com/quantified-uncertainty/squiggle/pull/2925))

Expand Down
2 changes: 1 addition & 1 deletion packages/squiggle-lang/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quri/squiggle-lang",
"version": "0.9.1",
"version": "0.9.2",
"license": "MIT",
"homepage": "https://squiggle-language.com",
"author": "Quantified Uncertainty Research Institute",
Expand Down
2 changes: 1 addition & 1 deletion packages/squiggle-lang/src/library/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ImmutableMap } from "../utility/immutableMap.js";
import { Value, vString } from "../value/index.js";

// automatically updated on release by ops/ patch-js utils
const VERSION = "0.9.1";
const VERSION = "0.9.2";
export function makeVersionConstant(): ImmutableMap<string, Value> {
return ImmutableMap([["System.version", vString(VERSION)]]);
}
2 changes: 1 addition & 1 deletion packages/textmate-grammar/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# @quri/squiggle-textmate-grammar

## 0.9.1
## 0.9.2

Initial public release.
5 changes: 4 additions & 1 deletion packages/textmate-grammar/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quri/squiggle-textmate-grammar",
"version": "0.9.1",
"version": "0.9.2",
"scripts": {
"build": "mkdir -p dist && js-yaml src/squiggle.tmLanguage.yaml >dist/squiggle.tmLanguage.json && js-yaml src/squiggle.js.yaml >dist/squiggle.js.json",
"lint": "prettier --check .",
Expand All @@ -12,6 +12,9 @@
"prettier": "^3.1.1",
"vscode-tmgrammar-test": "^0.1.2"
},
"files": [
"dist"
],
"contributes": {
"languages": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/versioned-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quri/versioned-squiggle-components",
"version": "0.9.1",
"version": "0.9.2",
"private": true,
"scripts": {
"build:ts": "tsc -b",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
"use client";

import { FC, lazy, Suspense } from "react";

/*
* Please don't change the formatting of these imports and the following `componentByVersion` declaration unless you have to.
* It's edited with babel transformation in `publish-all.ts` script.
*/
import { type SquiggleChartProps as SquiggleChartProps_0_9_0 } from "squiggle-components-0.9.0";

import { type SquiggleChartProps as SquiggleChartProps_dev } from "@quri/squiggle-components";

import { LazyVersionedComponents, VersionedComponentProps } from "./types.js";
import { SquiggleVersion } from "./versions.js";

type SquiggleChartVersion = Exclude<SquiggleVersion, "0.8.5" | "0.8.6">;
const componentByVersion = {
"0.9.0": lazy(async () => ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"use client";

import { FC, lazy, Suspense } from "react";

/*
* Please don't change the formatting of these imports and the following `componentByVersion` declaration unless you have to.
* It's edited with babel transformation in `publish-all.ts` script.
*/
import { type SquigglePlaygroundProps as SquigglePlaygroundProps_0_9_0 } from "squiggle-components-0.9.0";

import { type SquigglePlaygroundProps as SquigglePlaygroundProps_dev } from "@quri/squiggle-components";

/*
Expand All @@ -21,6 +21,7 @@ import {
SquigglePlaygroundProps_0_8_6,
} from "./oldPlaygroundTypes.js";
import { LazyVersionedComponents, VersionedComponentProps } from "./types.js";

const componentByVersion = {
"0.8.5": lazy(async () => ({
default: (await import("squiggle-components-0.8.5")).SquigglePlayground,
Expand Down
11 changes: 6 additions & 5 deletions packages/versioned-components/src/versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ export function checkSquiggleVersion(
): version is SquiggleVersion {
return (squiggleVersions as readonly string[]).includes(version);
}

function excludeVersions<const T extends SquiggleVersion[]>(skipVersions: T) {
const guard = <Arg extends { version: SquiggleVersion }>(
function excludeVersions<T extends SquiggleVersion[]>(skipVersions: T) {
const guard = <
Arg extends {
version: SquiggleVersion;
},
>(
arg: Arg
): arg is Extract<
Arg,
{
version: Exclude<SquiggleVersion, T[number]>;
}
> => !skipVersions.includes(arg.version);

return guard;
}

Expand All @@ -29,5 +31,4 @@ function excludeVersions<const T extends SquiggleVersion[]>(skipVersions: T) {
* See `EditSquiggleSnippetModel` in the Squiggle Hub source code for an example how it's used.
*/
export const versionSupportsDropdownMenu = excludeVersions(["0.8.5"]);

export const versionSupportsExports = excludeVersions(["0.8.5", "0.8.6"]);
4 changes: 2 additions & 2 deletions packages/vscode-ext/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# vscode-squiggle

## 0.9.1
## 0.9.2

Use 0.9.1 Squiggle. No extension-specific changes.
Use 0.9.2 Squiggle. No extension-specific changes.

## 0.9.0

Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-ext/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Squiggle",
"description": "Squiggle language support",
"license": "MIT",
"version": "0.9.1",
"version": "0.9.2",
"private": true,
"publisher": "QURI",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/website/src/pages/docs/Changelog/_meta.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"v0.9.1":"v0.9.1","v0.9.0":"v0.9.0","v0.8.6":"v0.8.6","v0.8.5":"v0.8.5","v0.8.4":"v0.8.4","v0.8.0":"v0.8.0","v0.7.0":"v0.7.0","v0.6.0":"v0.6.0","v0.5.1":"v0.5.1","v0.5.0":"v0.5.0"}
{"v0.9.2":"v0.9.2","v0.9.0":"v0.9.0","v0.8.6":"v0.8.6","v0.8.5":"v0.8.5","v0.8.4":"v0.8.4","v0.8.0":"v0.8.0","v0.7.0":"v0.7.0","v0.6.0":"v0.6.0","v0.5.1":"v0.5.1","v0.5.0":"v0.5.0"}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 0.9.1
## 0.9.2

### [@quri/squiggle-lang](https://www.npmjs.com/package/@quri/squiggle-lang)

Expand Down Expand Up @@ -38,5 +38,4 @@ Initial public release. This package is used for highlighting Squiggle code in V

### [vscode-squiggle](https://marketplace.visualstudio.com/items?itemName=QURI.vscode-squiggle)

Use 0.9.1 Squiggle. No extension-specific changes.

Use 0.9.2 Squiggle. No extension-specific changes.