Merge pull request #740 from lumapps/fix/fix-export-types

fix(release): fix TS types generation, version and changelog update

Author: gcornut

.github/workflows/chromatic.yaml

@@ -6,6 +6,7 @@ on:
   push:
     tags:
         - v*
+        - '!v*-alpha.*' # ignore alpha versions
 
 env:
     node_version: '13.7.0'

CHANGELOG.md

@@ -80,15 +80,18 @@ This will produce the target build for `@lumx/core`, `@lumx/angularjs`, `@lumx/r
 
 ## How to publish packages
 
-1. Create a release branch (ex: `release/vX.Y.Z`)
+1. Create a release branch (ex: `release/vX.Y.Z`) based on `master`
 2. Push it to remote (`git push origin release/vX.Y.Z`)
 3. Login to NPM with an authorized account: `npm login`
 4. Make sure your packages are up to date: `yarn`
-5. (Optionnal) Make sure the build doesn't crash: `yarn build`
-6. Publish the packages to NPM: `yarn release`
-   (you will be asked what version bump to apply)
-7. Update the tag `git tag -f vX.Y.Z && git push --tags`
-8. Create a PR for the release branch to merge into master
+5. (Optional) Make sure the build doesn't crash: `yarn build`
+6. Publish the packages to NPM
+   * to release an alpha version:
+     `yarn release --dist-tag <npm-tag> vX.Y.Z-alpha.N`
+     * the `--dist-tag <npm-tag>` option is used to avoid replacing the `latest` tag on NPM
+   * to release a version: `yarn release`
+     (you will be asked what version bump to apply)
+7. Create a PR for the release branch to merge into master
 
 ## Copyright and license
 

README.md

@@ -8,7 +8,6 @@
         "@typescript-eslint/eslint-plugin": "^4.9.0",
         "@typescript-eslint/parser": "^4.9.0",
         "babel-eslint": "^10.1.0",
-        "changelog-verify": "^1.1.2",
         "es-abstract": "1.17.6",
         "eslint": "^7.14.0",
         "eslint-config-airbnb": "^18.2.1",
@@ -33,7 +32,6 @@
         "stylelint-prettier": "^1.1.2",
         "stylelint-scss": "^3.18.0",
         "typescript": "^4.1.2",
-        "version-changelog": "^3.1.1",
         "webpack": "^4.44.1",
         "webpack-cli": "^4.2.0",
         "yeoman-generator": "^4.1.0",
@@ -71,6 +69,9 @@
         "build": "lerna run --stream build",
         "build:site": "yarn workspace lumx-site-demo clean && yarn workspace lumx-site-demo build",
         "build:storybook": "yarn workspace @lumx/react build:storybook",
+        "build:react": "yarn workspace @lumx/react build",
+        "build:core": "yarn workspace @lumx/core build",
+        "build:angularjs": "yarn workspace @lumx/angularjs build",
         "chromatic": "npx chromatic -b build:storybook",
         "clean": "rm -rf packages/*/dist && lerna clean --yes && lerna run --stream clean",
         "clean:git-hooks": "yarn husky uninstall",
@@ -81,14 +82,14 @@
         "lint:style": "stylelint packages/**/*.{css,scss}",
         "lint:code": "eslint packages/**/*.{ts,tsx,js}",
         "prepare": "lerna run --stream prepare",
-        "preversion": "git symbolic-ref --short -q HEAD | egrep -q '^master$' && echo 'ERROR: You can not release from the master branch.' && exit 1 || true",
-        "version": "yarn --immutable && yarn version-changelog CHANGELOG.md && git add CHANGELOG.md",
         "release": "yarn lerna publish --force-publish",
         "scaffold": "yo ./packages/yo-generators --with-tests --with-demo",
         "setup:git-hooks": "yarn husky uninstall && yarn husky install || exit 0",
         "start": "yarn workspace lumx-site-demo start",
         "test": "lerna run --stream test",
         "storybook:react": "yarn workspace @lumx/react storybook",
+        "check:not-master": "git symbolic-ref --short -q HEAD | egrep -q '^master$' && echo 'ERROR: You can not release from the master branch.' && exit 1 || true",
+        "version": "yarn check:not-master && yarn && git add yarn.lock",
         "generate:design-tokens": "yarn workspace @lumx/core generate:design-tokens"
     },
     "workspaces": [

package.json

@@ -35,10 +35,11 @@
     },
     "scripts": {
         "generate:design-tokens": "yarn node style-dictionary",
-        "build": "webpack",
-        "postbuild": "rm -rf ./dist/*.js ./dist/*.js.map",
+        "build": "webpack && yarn clean:unwanted-dist",
+        "clean:unwanted-dist": "rm -rf ./dist/*.js ./dist/*.js.map",
         "prepare": "install-peers || exit 0",
-        "prepublishOnly": "yarn build"
+        "prepublishOnly": "yarn build",
+        "version": "yarn version-changelog ../../CHANGELOG.md && yarn changelog-verify ../../CHANGELOG.md && git add ../../CHANGELOG.md"
     },
     "sideEffects": false,
     "version": "2.1.5",
@@ -52,6 +53,7 @@
         "@babel/preset-env": "^7.8.3",
         "@babel/preset-typescript": "^7.12.7",
         "autoprefixer": "^9.7.4",
+        "changelog-verify": "^1.1.2",
         "clean-webpack-plugin": "^3.0.0",
         "copy-webpack-plugin": "^5.1.1",
         "core-js": "^3.6.4",
@@ -70,6 +72,7 @@
         "style-dictionary": "^2.10.0",
         "tinycolor2": "^1.4.1",
         "unminified-webpack-plugin": "^2.0.0",
+        "version-changelog": "^3.1.1",
         "webpack": "^4.44.1",
         "webpack-notifier": "^1.8.0",
         "webpackbar": "^4.0.0"

packages/lumx-core/package.json

@@ -115,8 +115,8 @@
         "url": "git+https://github.com/lumapps/design-system.git"
     },
     "scripts": {
-        "build": "rollup -c",
-        "postbuild": "dts-bundle-generator --no-check --external-types=react --external-imports=moment -o dist/types.d.ts src/index.ts",
+        "build": "rollup -c && yarn generate:types",
+        "generate:types": "dts-bundle-generator --no-check --external-types=react --external-imports=moment -o dist/types.d.ts src/index.ts",
         "prepare": "install-peers || exit 0",
         "prepublishOnly": "yarn build",
         "test": "jest --config jest/index.js --coverage --notify --passWithNoTests --detectOpenHandles --runInBand",

packages/lumx-react/package.json

@@ -5875,6 +5875,7 @@ __metadata:
     "@babel/preset-env": ^7.8.3
     "@babel/preset-typescript": ^7.12.7
     autoprefixer: ^9.7.4
+    changelog-verify: ^1.1.2
     classnames: ^2.2.6
     clean-webpack-plugin: ^3.0.0
     copy-webpack-plugin: ^5.1.1
@@ -5897,6 +5898,7 @@ __metadata:
     style-dictionary: ^2.10.0
     tinycolor2: ^1.4.1
     unminified-webpack-plugin: ^2.0.0
+    version-changelog: ^3.1.1
     webpack: ^4.44.1
     webpack-notifier: ^1.8.0
     webpackbar: ^4.0.0
@@ -5922,7 +5924,6 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^4.9.0
     "@typescript-eslint/parser": ^4.9.0
     babel-eslint: ^10.1.0
-    changelog-verify: ^1.1.2
     es-abstract: 1.17.6
     eslint: ^7.14.0
     eslint-config-airbnb: ^18.2.1
@@ -5947,7 +5948,6 @@ __metadata:
     stylelint-prettier: ^1.1.2
     stylelint-scss: ^3.18.0
     typescript: ^4.1.2
-    version-changelog: ^3.1.1
     webpack: ^4.44.1
     webpack-cli: ^4.2.0
     yeoman-generator: ^4.1.0