From 88a6cadd8816592c025d3120016028ce80770148 Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Wed, 3 Mar 2021 09:38:50 -0600 Subject: [PATCH 01/12] first commit on cicd branch --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c66a67b..7639a8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,8 @@ language: node_js node_js: - 12 - - 10 +install: + - npm install + - npm test +script: + - npm build \ No newline at end of file From 36206ca2434a2173628b1783b64d300e0344909f Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Wed, 3 Mar 2021 10:41:37 -0600 Subject: [PATCH 02/12] add build status image --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 75395ef..4934ed9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # use-models +[![Build Status](https://travis-ci.com/r3wt/use-models.svg?branch=master)](https://travis-ci.com/r3wt/use-models) + > advanced form model hooks for your functional react components. build huge, complex forms with validation using minimal boilerplate code. [![NPM](https://img.shields.io/npm/v/use-models.svg)](https://www.npmjs.com/package/use-models) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com) From 9190478c2082f548ad94d26ed99ef8f641af13d2 Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Wed, 3 Mar 2021 10:42:50 -0600 Subject: [PATCH 03/12] refactor readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4934ed9..9660099 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # use-models -[![Build Status](https://travis-ci.com/r3wt/use-models.svg?branch=master)](https://travis-ci.com/r3wt/use-models) +[![NPM](https://img.shields.io/npm/v/use-models.svg)](https://www.npmjs.com/package/use-models) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)[![Build Status](https://travis-ci.com/r3wt/use-models.svg?branch=master)](https://travis-ci.com/r3wt/use-models) + +advanced form model hooks for your functional react components. build huge, complex forms with validation using minimal boilerplate code. -> advanced form model hooks for your functional react components. build huge, complex forms with validation using minimal boilerplate code. -[![NPM](https://img.shields.io/npm/v/use-models.svg)](https://www.npmjs.com/package/use-models) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com) ## Install From ee64d2738a1362778be54b8fe181545b5d6445da Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Wed, 3 Mar 2021 10:43:35 -0600 Subject: [PATCH 04/12] refactor readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9660099..aeffb94 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # use-models -[![NPM](https://img.shields.io/npm/v/use-models.svg)](https://www.npmjs.com/package/use-models) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)[![Build Status](https://travis-ci.com/r3wt/use-models.svg?branch=master)](https://travis-ci.com/r3wt/use-models) +[![NPM](https://img.shields.io/npm/v/use-models.svg)](https://www.npmjs.com/package/use-models) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com) [![Build Status](https://travis-ci.com/r3wt/use-models.svg?branch=master)](https://travis-ci.com/r3wt/use-models) advanced form model hooks for your functional react components. build huge, complex forms with validation using minimal boilerplate code. From 52f27061f5712a517e6a3e90b736b20895c76ca6 Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Wed, 3 Mar 2021 10:51:41 -0600 Subject: [PATCH 05/12] setup ci and cd workflows on travis --- .travis.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7639a8e..1526762 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,20 @@ language: node_js node_js: - 12 -install: - - npm install - - npm test -script: - - npm build \ No newline at end of file +jobs: + include: + - stage: ci + script: + - npm install + - npm test + - npm build + - stage: cd + script: + - npm install + - npm build + # todo - release with npm, then commit the result to github +stages: + - name: ci + if: type = pull_request + - name: cd + if: type = push AND branch = master \ No newline at end of file From 3b0dc67b58385d7516f9a87e0ef829771f1d8273 Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Wed, 3 Mar 2021 10:57:54 -0600 Subject: [PATCH 06/12] setup ci and cd workflows on travis (2) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1526762..9b4095b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,11 @@ jobs: script: - npm install - npm test - - npm build + - npm run build - stage: cd script: - npm install - - npm build + - npm run build # todo - release with npm, then commit the result to github stages: - name: ci From e9e4a6e1250669f425534b5fa4c5fdd01aea4b31 Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Tue, 30 Mar 2021 17:19:51 -0500 Subject: [PATCH 07/12] test integration with coveralls --- .travis.yml | 5 ++++- README.md | 2 +- package-lock.json | 25 +++++++++++++++++++++++++ package.json | 4 +++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b4095b..d741dbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,16 @@ language: node_js node_js: - 12 +env: + - COVERALLS_REPO_TOKEN=2SwwqC8QDQVmE6FkT71w2DgLmd0kc5Dh3 jobs: include: - stage: ci script: - npm install - - npm test + - npm run test:coverage - npm run build + after_success: 'npm run coveralls' - stage: cd script: - npm install diff --git a/README.md b/README.md index aeffb94..9745539 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # use-models -[![NPM](https://img.shields.io/npm/v/use-models.svg)](https://www.npmjs.com/package/use-models) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com) [![Build Status](https://travis-ci.com/r3wt/use-models.svg?branch=master)](https://travis-ci.com/r3wt/use-models) +[![NPM](https://img.shields.io/npm/v/use-models.svg)](https://www.npmjs.com/package/use-models) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com) [![Build Status](https://travis-ci.com/r3wt/use-models.svg?branch=master)](https://travis-ci.com/r3wt/use-models) [![Coverage Status](https://coveralls.io/repos/github/r3wt/use-models/badge.svg)](https://coveralls.io/github/r3wt/use-models) advanced form model hooks for your functional react components. build huge, complex forms with validation using minimal boilerplate code. diff --git a/package-lock.json b/package-lock.json index 0ca1aae..e9ed083 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6292,6 +6292,19 @@ "yaml": "^1.10.0" } }, + "coveralls": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.0.tgz", + "integrity": "sha512-sHxOu2ELzW8/NC1UP5XVLbZDzO4S3VxfFye3XYCznopHy02YjNkHcj5bKaVw2O7hVaBdBjEdQGpie4II1mWhuQ==", + "dev": true, + "requires": { + "js-yaml": "^3.13.1", + "lcov-parse": "^1.0.0", + "log-driver": "^1.2.7", + "minimist": "^1.2.5", + "request": "^2.88.2" + } + }, "create-ecdh": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", @@ -14584,6 +14597,12 @@ "webpack-sources": "^1.1.0" } }, + "lcov-parse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz", + "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=", + "dev": true + }, "leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -14711,6 +14730,12 @@ "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", "dev": true }, + "log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", + "dev": true + }, "loglevel": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", diff --git a/package.json b/package.json index 1378fc6..40e4673 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,8 @@ "test:watch": "npm test -- --watchAll=true", "example": "cd example && npm start", "predeploy": "cd example && npm install && npm run build", - "deploy": "gh-pages -d example/build" + "deploy": "gh-pages -d example/build", + "coveralls": "cat ./coverage/lcov.info | coveralls" }, "peerDependencies": { "react": "^16.0.0", @@ -42,6 +43,7 @@ "@types/react": "^16.9.50", "@types/react-dom": "^16.9.8", "@types/react-syntax-highlighter": "^11.0.5", + "coveralls": "^3.1.0", "cross-env": "^7.0.2", "esbuild": "^0.7.8", "gh-pages": "^2.2.0", From 35b90fe12ed7fd0ea4ed0692ed0d08677490213c Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Tue, 30 Mar 2021 17:37:36 -0500 Subject: [PATCH 08/12] update build script --- build.js | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/build.js b/build.js index 2a337ab..70abbdd 100644 --- a/build.js +++ b/build.js @@ -1,8 +1,9 @@ const { build } = require('esbuild'); const pkg = require('./package.json'); -// build esnext -build({ +const modulesToBuild = [pkg.module,pkg.main]; + +Promise.all(modulesToBuild.map(moduleName=>build({ entryPoints: [pkg.source], format: 'esm', outfile: pkg.module, @@ -12,31 +13,11 @@ build({ logLevel: 'info', sourcemap: true, external: ['react', 'react-dom'] -}) +}).then(()=>console.log('`%s` built successfully',moduleName)))) .then(() => { - console.log('build succeeded'); + console.log('all modules built successfully'); }) -.catch((err) => { - console.warn('build failed', err); +.catch((errors) => { + console.warn('one or more module builds failed', errors); process.exit(1); -}); - -// build commonjs -build({ - entryPoints: [pkg.source], - format: 'cjs', - outfile: pkg.main, - tsconfig: './tsconfig.json', - minify: true, - bundle: true, - logLevel: 'info', - sourcemap: true, - external: ['react', 'react-dom'] -}) -.then(() => { - console.log('build succeeded'); -}) -.catch((err) => { - console.warn('build failed', err); - process.exit(1) -}); +}); \ No newline at end of file From 620f45db070e7030dfc73fababf13502fa1ce65f Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Tue, 30 Mar 2021 17:38:00 -0500 Subject: [PATCH 09/12] update build script (fix whoopsie) --- build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.js b/build.js index 70abbdd..1dc9b48 100644 --- a/build.js +++ b/build.js @@ -6,7 +6,7 @@ const modulesToBuild = [pkg.module,pkg.main]; Promise.all(modulesToBuild.map(moduleName=>build({ entryPoints: [pkg.source], format: 'esm', - outfile: pkg.module, + outfile: moduleName, tsconfig: './tsconfig.build.json', minify: true, bundle: true, From ca783dd60bb12fc733747a3c570daf86668ed50f Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Sat, 10 Apr 2021 10:48:46 -0500 Subject: [PATCH 10/12] test if deploy will work --- .travis.yml | 19 +++++++++++++------ package.json | 3 +++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index d741dbc..e3718f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,13 +11,20 @@ jobs: - npm run test:coverage - npm run build after_success: 'npm run coveralls' - - stage: cd - script: - - npm install - - npm run build - # todo - release with npm, then commit the result to github stages: - name: ci if: type = pull_request - name: cd - if: type = push AND branch = master \ No newline at end of file + if: branch = master AND commit_message =~ /^[0-9]*\.[0-9]*\.[0-9]*$/ + before_deploy: + - npm install + - npm run test:coverage + - npm run build + deploy: + edge: true + provider: npm + email: "$NPM_EMAIL" + api_key: "$NPM_TOKEN" + cleanup: true + after_success: + - npm run coveralls \ No newline at end of file diff --git a/package.json b/package.json index 40e4673..ea3ace3 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,9 @@ "homepage": "https://r3wt.github.io/use-models", "version": "1.2.1", "private": false, + "publishConfig": { + "access": "public" + }, "license": "MIT", "repository": { "type": "git", From 1e08ae929fd9abdb6abdadd22e089bb2a1b8ceab Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Sat, 10 Apr 2021 10:49:08 -0500 Subject: [PATCH 11/12] auto comment --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e9ed083..1d14ca4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "use-models", - "version": "1.2.1", + "version": "1.2.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index ea3ace3..6ef757e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "use-models", "homepage": "https://r3wt.github.io/use-models", - "version": "1.2.1", + "version": "1.2.2", "private": false, "publishConfig": { "access": "public" From b1516f8a83dad7656e66614b39f4dfc0b2c40f12 Mon Sep 17 00:00:00 2001 From: Garrett Morris Date: Sat, 10 Apr 2021 11:11:51 -0500 Subject: [PATCH 12/12] 1.2.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1d14ca4..7faccb4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "use-models", - "version": "1.2.2", + "version": "1.2.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6ef757e..3349971 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "use-models", "homepage": "https://r3wt.github.io/use-models", - "version": "1.2.2", + "version": "1.2.3", "private": false, "publishConfig": { "access": "public"