Skip to content

Commit bf676ab

Browse files
author
Romain Lenzotti
committed
Merge chore-use-monorepo-tools
2 parents 6b1e6b1 + e6c1247 commit bf676ab

19 files changed

+1220
-2889
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ language: node_js
22
cache: yarn
33

44
node_js:
5-
- '12'
6-
- '10'
5+
- 14
6+
- 12
7+
- 10
78

8-
script: yarn test && yarn travis:coveralls
9+
script: yarn test && (yarn coveralls || true)
910

1011
jobs:
1112
include:
1213
- stage: deploy
1314
name: 'Deploy packages'
1415
node_js: 12
1516
if: (NOT type IN (pull_request)) AND (branch = production)
16-
script: yarn semantic-release && yarn docs:publish
17+
script: yarn release && yarn docs:publish && yarn examples:publish
1718

1819
branches:
1920
except:

package.json

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,24 @@
44
"description": "A multi channel logger written in TypeScript.",
55
"private": true,
66
"scripts": {
7-
"prepublishOnly": "gflow release post",
8-
"gflow-release-pre": "",
9-
"semantic-release": "semantic-release",
10-
"semantic-release:dry-run": "semantic-release --dry-run",
11-
"clean": "gulp clean:workspace",
7+
"clean": "monorepo clean workspace",
128
"test": "yarn clean && yarn test:lint && yarn test:coverage",
139
"test:unit": "cross-env NODE_ENV=test mocha",
1410
"test:coverage": "cross-env NODE_ENV=test nyc mocha",
1511
"test:lint": "tslint --project tsconfig.json",
1612
"test:lint:fix": "tslint --project tsconfig.json --fix",
17-
"travis:deploy-once": "travis-deploy-once",
18-
"travis:coveralls": "nyc report --reporter=text-lcov | coveralls",
19-
"build": "lerna run build --stream && gulp repo:build",
20-
"publish:dryRun": "yarn build && gulp repo:publishDryRun",
21-
"docs:serve": "yarn api:build && yarn vuepress:serve ",
22-
"docs:build": "yarn api:build && yarn vuepress:build ",
23-
"docs:publish": "yarn docs:build && gulp docs:publish",
13+
"coveralls": "nyc report --reporter=text-lcov | coveralls",
14+
"build": "monorepo build",
15+
"sync:packages": "monorepo sync packages",
16+
"docs:serve": "yarn api:build && yarn vuepress:serve",
17+
"docs:build": "yarn api:build && yarn vuepress:build",
18+
"docs:publish": "yarn docs:build && monorepo publish ghpages",
2419
"api:build": "lerna run build && ts-doc",
2520
"vuepress:build": "cross-env NODE_ENV=production vuepress build docs",
2621
"vuepress:serve": "vuepress dev docs",
27-
"prettier": "prettier '{src,test}/**/*.ts' --write"
22+
"prettier": "prettier '{src,test}/**/*.ts' --write",
23+
"release": "semantic-release",
24+
"release:dryRun": "semantic-release --dry-run"
2825
},
2926
"repository": {
3027
"type": "git",
@@ -42,11 +39,12 @@
4239
"bugs": {
4340
"url": "https://github.com/TypedProject/logger/issues"
4441
},
45-
"homepage": "https://github.com/TypedProject//logger",
42+
"homepage": "https://github.com/TypedProject/logger",
4643
"dependencies": {
4744
"lerna": "3.18.4"
4845
},
4946
"devDependencies": {
47+
"@tsed/monorepo-utils": "1.8.3",
5048
"@typedproject/ts-doc": "4.0.6",
5149
"@types/chai": "^4.1.7",
5250
"@types/chai-as-promised": "7.1.0",
@@ -61,37 +59,24 @@
6159
"coveralls": "^3.0.3",
6260
"cross-env": "6.0.3",
6361
"execa": "3.3.0",
64-
"fancy-log": "1.3.3",
6562
"gflow": "^4.0.5",
66-
"gulp": "4.0.2",
67-
"gulp-clean": "0.4.0",
68-
"gulp-exec": "4.0.0",
69-
"gulp-json-editor": "2.2.1",
70-
"gulp-load-plugins": "2.0.0",
71-
"gulp-replace": "^1.0.0",
72-
"gulp-sourcemaps": "^2.6.4",
73-
"gulp-typescript": "^5.0.0",
7463
"husky": "^4.2.5",
7564
"lint-staged": "^8.1.0",
7665
"mocha": "7.1.0",
7766
"nyc": "^13.3.0",
7867
"prettier": "^1.13.5",
79-
"require-dir": "1.2.0",
80-
"rimraf": "^2.6.3",
8168
"semantic-release": "^15.13.18",
8269
"sinon": "^7.2.7",
8370
"sinon-chai": "^3.3.0",
8471
"source-map-support": "0.5.16",
85-
"travis-deploy-once": "^5.0.0",
8672
"ts-node": "^8.0.3",
8773
"tsconfig-paths": "3.9.0",
8874
"tslint": "^5.13.1",
8975
"typescript": "3.5.3",
9076
"vue": "2.6.11",
77+
"vuepress": "1.4.0",
9178
"vue-analytics": "5.17.2",
92-
"vue-template-compiler": "2.6.11",
93-
"vuepress": "1.3.0",
94-
"vuepress-theme-tsed": "2.6.0"
79+
"vuepress-theme-tsed": "2.8.3"
9580
},
9681
"husky": {
9782
"hooks": {
@@ -107,5 +92,18 @@
10792
"packages": [
10893
"packages/*"
10994
]
95+
},
96+
"resolutions": {
97+
"watchpack": "1.6.1"
98+
},
99+
"monorepo": {
100+
"productionBranch": "production",
101+
"npmAccess": "public",
102+
"ghpages": {
103+
"dir": "./docs/.vuepress/dist",
104+
"url": "https://github.com/TypedProject/logger.git",
105+
"branch": "gh-pages",
106+
"cname": "logger.tsed.io"
107+
}
110108
}
111109
}

release.config.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module.exports = {
2-
branch: 'production',
3-
verifyConditions: ['@semantic-release/github', '@semantic-release/npm'],
4-
analyzeCommits: ['@semantic-release/commit-analyzer'],
2+
branch: require('./package.json').monorepo.productionBranch,
3+
verifyConditions: ["@semantic-release/github", "@semantic-release/npm", "@tsed/monorepo-utils/semantic-release"],
4+
analyzeCommits: ["@semantic-release/commit-analyzer"],
55
verifyRelease: [],
6-
generateNotes: ['@semantic-release/release-notes-generator'],
7-
prepare: ['@semantic-release/npm', './tasks/semantic/repo.js', 'gflow/src/command/release'],
8-
publish: ['./tasks/semantic/repo.js', '@semantic-release/github'],
9-
success: ['@semantic-release/github', 'gflow/src/command/release', './tasks/semantic/repo.js'], // ,
10-
fail: ['@semantic-release/github'],
6+
generateNotes: ["@semantic-release/release-notes-generator"],
7+
prepare: ["@semantic-release/npm", "@tsed/monorepo-utils/semantic-release"],
8+
publish: ["@tsed/monorepo-utils/semantic-release", "@semantic-release/github"],
9+
success: ["@semantic-release/github", "@tsed/monorepo-utils/semantic-release"],
10+
fail: ["@semantic-release/github"],
1111
npmPublish: false
1212
};

repo.config.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

tasks/gulp/clean.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

tasks/gulp/docs.js

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)