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

[Release] 0.1.3-1 #93

Merged
merged 1 commit into from Jan 8, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/web.gradle
@@ -1,6 +1,6 @@
import groovy.json.JsonSlurper

def dockerMiskWebVersion = "0.1.2-alpha-0.2"
def dockerMiskWebVersion = "0.1.3-1"

task web(type: Exec) {
// -Pcmd='-d': pass in argument to misk-web shell script in Docker container
Expand Down
6 changes: 3 additions & 3 deletions misk-web/web/packages/@misk/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@misk/cli",
"version": "0.0.27",
"version": "0.1.3-1",
"license": "SEE LICENSE IN https://github.com/square/misk-web",
"description": "Misk-Web CLI Build Tool",
"author": "Square/Misk Authors (https://github.com/square/misk-web/graphs/contributors)",
Expand All @@ -24,8 +24,8 @@
"yargs": "^12.0.4"
},
"devDependencies": {
"@misk/dev": "^0.1.1",
"@misk/tslint": "^0.1.1",
"@misk/dev": "^0.1.3-1",
"@misk/tslint": "^0.1.3-1",
"@types/fs-extra": "^5.0.4",
"@types/inquirer": "0.0.43",
"@types/node": "^10.12.18",
Expand Down
15 changes: 13 additions & 2 deletions misk-web/web/packages/@misk/cli/src/utils/changelog.ts
@@ -1,6 +1,7 @@
export enum MiskVersion {
"latest" = "0.1.1",
"alpha" = "0.1.2-alpha-0.2",
"alpha" = "0.1.3-1",
"v013_1" = "0.1.3-1",
"v012alpha02" = "0.1.2-alpha-0.2",
"v012alpha01" = "0.1.2-alpha-0.1",
"v011" = "0.1.1",
Expand Down Expand Up @@ -47,14 +48,24 @@ export interface IMiskTabVersions {
}

export const MiskTabVersions: IMiskTabVersions = {
[MiskVersion.v013_1]: {
[MiskPkg.cli]: "0.1.3-1",
[MiskPkg.common]: "0.1.3-1",
[MiskPkg.core]: "0.1.3-1",
[MiskPkg.dev]: "0.1.3-1",
[MiskPkg.tslint]: "0.1.3-1",
date: "2019-01-08",
notes: "Fresh release of all using Rush"
},
[MiskVersion.v012alpha01]: {
[MiskPkg.cli]: "0.0.24",
[MiskPkg.common]: "0.1.1",
[MiskPkg.core]: "0.1.1",
[MiskPkg.dev]: "0.1.1",
[MiskPkg.tslint]: "0.1.1",
date: "2019-01-07",
notes: "Change Docker base image to use 10-alpine for Microsoft Rush support"
notes:
"Change Docker base image to use 10-alpine for Microsoft Rush support"
},
[MiskVersion.v012alpha01]: {
[MiskPkg.cli]: "0.0.24",
Expand Down
8 changes: 4 additions & 4 deletions misk-web/web/packages/@misk/common/package.json
@@ -1,6 +1,6 @@
{
"name": "@misk/common",
"version": "0.1.1",
"version": "0.1.3-1",
"license": "SEE LICENSE IN https://github.com/square/misk-web",
"description": "Misk-Web Common Libraries, Styles",
"author": "Square/Misk Authors (https://github.com/square/misk-web/graphs/contributors)",
Expand All @@ -25,7 +25,7 @@
"ci-build": "yarn run clean && yarn run lib",
"lib": "yarn run refresh; webpack --config webpack.config.js && webpack --config webpack.config.static.js && webpack --config webpack.config.vendors.js",
"lint": "prettier --write --config prettier.config.js \".{/src/**/,/}*.{md,css,sass,less,json,js,jsx,ts,tsx}\"",
"prepare": "cd ../../../../ && ./gradlew web -Pcmd='-ca' -Ptabs='@misk/common'",
"gradle": "cd ../../../../../ && ./gradlew web -Pcmd='-ca' -Ptabs='@misk/common'",
"refresh": "node refreshCachedUrls.js",
"reinstall": "rm -rf node_modules && yarn install",
"updateDevCache": "cd ..; ./updateLocalCache.sh",
Expand Down Expand Up @@ -60,8 +60,8 @@
"styled-components": "^4.1.2"
},
"devDependencies": {
"@misk/dev": "^0.1.1",
"@misk/tslint": "^0.1.1",
"@misk/dev": "^0.1.3-1",
"@misk/tslint": "^0.1.3-1",
"@types/history": "^4.7.2",
"@types/lodash-es": "^4.17.1",
"@types/node": "^10.12.18",
Expand Down
10 changes: 5 additions & 5 deletions misk-web/web/packages/@misk/core/package.json
@@ -1,6 +1,6 @@
{
"name": "@misk/core",
"version": "0.1.1",
"version": "0.1.3-1",
"license": "SEE LICENSE IN https://github.com/square/misk-web",
"description": "Misk-Web Core",
"author": "Square/Misk Authors (https://github.com/square/misk-web/graphs/contributors)",
Expand All @@ -24,14 +24,14 @@
"ci-build": "yarn run clean && yarn run lib",
"lib": "webpack",
"lint": "prettier --write --config prettier.config.js \".{/src/**/,/}*.{md,css,sass,less,json,js,jsx,ts,tsx}\"",
"prepare": "cd ../../../../ && ./gradlew web -Pcmd='-ca' -Ptabs='@misk/core'",
"gradle": "cd ../../../../../ && ./gradlew web -Pcmd='-ca' -Ptabs='@misk/core'",
"reinstall": "rm -rf node_modules && yarn install",
"start": "yarn run lint && cross-env NODE_ENV=development webpack-dev-server",
"test": "echo no tests",
"updateDevCache": "cd ..; ./updateLocalCache.sh"
},
"dependencies": {
"@misk/common": "^0.1.1",
"@misk/common": "^0.1.3-1",
"@blueprintjs/core": "^3.9.0",
"@blueprintjs/datetime": "^3.4.0",
"@blueprintjs/icons": "^3.3.0",
Expand Down Expand Up @@ -60,8 +60,8 @@
"styled-components": "^4.1.2"
},
"devDependencies": {
"@misk/dev": "^0.1.1",
"@misk/tslint": "^0.1.1",
"@misk/dev": "^0.1.3-1",
"@misk/tslint": "^0.1.3-1",
"@types/history": "^4.7.2",
"@types/lodash-es": "^4.17.1",
"@types/node": "^10.12.18",
Expand Down
2 changes: 1 addition & 1 deletion misk-web/web/packages/@misk/dev/package.json
@@ -1,6 +1,6 @@
{
"name": "@misk/dev",
"version": "0.1.1",
"version": "0.1.3-1",
"license": "SEE LICENSE IN https://github.com/square/misk-web",
"description": "Misk-Web Build and Dev Tools",
"author": "Square/Misk Authors (https://github.com/square/misk-web/graphs/contributors)",
Expand Down
4 changes: 2 additions & 2 deletions misk-web/web/packages/@misk/tslint/package.json
@@ -1,6 +1,6 @@
{
"name": "@misk/tslint",
"version": "0.1.1",
"version": "0.1.3-1",
"license": "SEE LICENSE IN https://github.com/square/misk-web",
"description": "Misk-Web TsLint",
"author": "Square/Misk Authors (https://github.com/square/misk-web/graphs/contributors)",
Expand All @@ -25,6 +25,6 @@
"tslint-immutable": "^5.0.0",
"tslint-react": "^3.6.0",
"tslint-sonarts": "^1.8.0",
"typescript": "^3.2.1"
"typescript": "^3.2.2"
}
}
30 changes: 18 additions & 12 deletions misk-web/web/packages/common/config/rush/version-policies.json
Expand Up @@ -3,12 +3,18 @@
* For full documentation, please see https://rushjs.io
*/

/**
* A list of version policy definitions. A "version policy" is a custom package versioning
* strategy that affets "rush change", "rush version", and "rush publish". The strategy applies
* to a set of projects that are specified using the "versionPolicyName" field in rush.json.
*/
/**
* A list of version policy definitions. A "version policy" is a custom package versioning
* strategy that affets "rush change", "rush version", and "rush publish". The strategy applies
* to a set of projects that are specified using the "versionPolicyName" field in rush.json.
*/
[
{
"definitionName": "lockStepVersion",
"policyName": "MiskWeb",
"version": "0.1.3-1",
"nextBump": "prerelease"
}
// {
// /**
// * (Required) Indicates the kind of version policy being defined ("lockStepVersion" or "individualVersion").
Expand All @@ -20,21 +26,21 @@
// * SemVer range is usually restricted to a single version.
// */
// "definitionName": "lockStepVersion",
//
//
// /**
// * (Required) The name that will be used for the "versionPolicyName" field in rush.json.
// * This name is also used command-line parameters such as "--version-policy"
// * and "--to-version-policy".
// */
// "policyName": "MyBigFramework",
//
//
// /**
// * (Required) The current version. All packages belonging to the set should have this version
// * in the current branch. When bumping versions, Rush uses this to determine the next version.
// * (The "version" field in package.json is NOT considered.)
// */
// "version": "1.0.0",
//
//
// /**
// * (Required) The type of bump that will be performed when publishing the next release.
// * When creating a release branch in Git, this field should be updated according to the
Expand All @@ -43,7 +49,7 @@
// * Valid values are: "prerelease", "release", "minor", "patch", "major"
// */
// "nextBump": "prerelease",
//
//
// /**
// * (Optional) If specified, all packages in the set share a common CHANGELOG.md file.
// * This file is stored with the specified "main" project, which must be a member of the set.
Expand All @@ -53,7 +59,7 @@
// */
// "mainProject": "my-app"
// },
//
//
// {
// /**
// * (Required) Indicates the kind of version policy being defined ("lockStepVersion" or "individualVersion").
Expand All @@ -66,9 +72,9 @@
// * is changed.
// */
// "definitionName": "individualVersion",
//
//
// "policyName": "MyRandomLibraries",
//
//
// /**
// * (Optional) This can be used to enforce that all packages in the set must share a common
// * major version number, e.g. because they are from the same major release branch.
Expand Down
15 changes: 10 additions & 5 deletions misk-web/web/packages/rush.json
Expand Up @@ -254,23 +254,28 @@
"projects": [
{
"packageName": "@misk/cli",
"projectFolder": "@misk/cli"
"projectFolder": "@misk/cli",
"versionPolicyName": "MiskWeb"
},
{
"packageName": "@misk/common",
"projectFolder": "@misk/common"
"projectFolder": "@misk/common",
"versionPolicyName": "MiskWeb"
},
{
"packageName": "@misk/core",
"projectFolder": "@misk/core"
"projectFolder": "@misk/core",
"versionPolicyName": "MiskWeb"
},
{
"packageName": "@misk/dev",
"projectFolder": "@misk/dev"
"projectFolder": "@misk/dev",
"versionPolicyName": "MiskWeb"
},
{
"packageName": "@misk/tslint",
"projectFolder": "@misk/tslint"
"projectFolder": "@misk/tslint",
"versionPolicyName": "MiskWeb"
}
// {
// /**
Expand Down