Merge pull request #16 from TrigenSoftware/enhancement/trigen-scripts

dangreen · web-flow · commit 71492121cca2 · 2019-06-09T02:13:23.000+07:00
trigen scripts
diff --git a/.babelrc b/.babelrc
@@ -6,10 +6,15 @@
 	"env": {
 		"test": {
 			"presets": [
-				["babel-preset-trigen", {
-					"targets": { "node": "current" },
-					"commonjs": true
-				}]
+				[
+					"babel-preset-trigen",
+					{
+						"targets": {
+							"node": "current"
+						},
+						"commonjs": true
+					}
+				]
 			]
 		}
 	}
diff --git a/.editorconfig b/.editorconfig
@@ -6,7 +6,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[package.json]
+[{package.json,manifest.json,*.yml}]
 indent_style = space
 indent_size = 2
 
diff --git a/.gitignore b/.gitignore
@@ -33,15 +33,19 @@ node_modules
 # Optional REPL history
 .node_repl_history
 
-# OS X stuff
+# OS stuff
+._*
 .DS_Store
 
 # Some caches
-.eslintcache
+.*cache
 
 # Compiled dist
 lib
+package
+build
+
+.env
 
 # Test artifacts
 test/artifacts/*
-
diff --git a/.lintstagedrc b/.lintstagedrc
@@ -1,3 +1,6 @@
 {
-	"src/**/*.js": ["eslint --cache", "git add"]
+	"src/**/*.{js,jsx}": [
+		"trigen-scripts lint:js",
+		"git add"
+	]
 }
diff --git a/.size-limit b/.size-limit
@@ -1,5 +1,8 @@
-[{
-	path:  "lib/index.js",
-	limit: "8 KB",
-	webpack: false
-}]
+[
+	{
+		"path": "lib/index.js",
+		"limit": "8 KB",
+		"webpack": false,
+		"running": false
+	}
+]
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-  - "node"
+  - "lts/*"
+  - "8"
 cache:
   directories:
     - node_modules
diff --git a/.trigenscriptsrc b/.trigenscriptsrc
@@ -0,0 +1,8 @@
+[
+	"@trigen/scripts-plugin-babel",
+	"@trigen/scripts-plugin-eslint",
+	"@trigen/scripts-plugin-jest",
+	"@trigen/scripts-plugin-rollup",
+	"@trigen/scripts-preset-lib",
+	"@trigen/scripts-plugin-size-limit"
+]
diff --git a/.yo-rc.json b/.yo-rc.json
@@ -0,0 +1,20 @@
+{
+  "generator-trigen-lib": {
+    "editPackage": true,
+    "pkg": {
+      "name": "@flexis/workbox-webpack-plugin",
+      "version": "1.0.0-beta",
+      "description": "Webpack plugin to generate and inject precache manifest to ServiceWorker.",
+      "repository": "https://github.com/TrigenSoftware/flexis-workbox-webpack-plugin",
+      "author": "dangreen"
+    },
+    "type": "node",
+    "lang": "babel",
+    "rollup": true,
+    "jest": true,
+    "coverage": false,
+    "publishAsRoot": false,
+    "cleanPublish": true,
+    "checkSize": true
+  }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+<!--
+
+DO NOT TOUCH. SAVE IT ON TOP.
+
+## [semver] - date
+### Added
+- ...
+
+### Changed
+- ...
+
+### Fixed
+- ...
+
+### Removed
+- ...
+
+-->
+
 ## [1.0.0] - 2019-02-12
 ### Added
 - 🦄
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 - present, TrigenSoftware
+Copyright (c) 2019 - present, TrigenSoftware
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -2,17 +2,21 @@
 
 [![NPM version][npm]][npm-url]
 [![Node version][node]][node-url]
-[![Dependency status][deps]][deps-url]
+[![Peer dependencies status][peer-deps]][peer-deps-url]
+[![Dependencies status][deps]][deps-url]
 [![Build status][build]][build-url]
 [![Greenkeeper badge][greenkeeper]][greenkeeper-url]
 
-[npm]: https://img.shields.io/npm/v/%40flexis/workbox-webpack-plugin.svg
-[npm-url]: https://www.npmjs.com/package/@flexis/workbox-webpack-plugin
+[npm]: https://img.shields.io/npm/v/@flexis/workbox-webpack-plugin.svg
+[npm-url]: https://npmjs.com/package/@flexis/workbox-webpack-plugin
 
-[node]: https://img.shields.io/node/v/%40flexis/workbox-webpack-plugin.svg
+[node]: https://img.shields.io/node/v/@flexis/workbox-webpack-plugin.svg
 [node-url]: https://nodejs.org
 
-[deps]: https://img.shields.io/david/TrigenSoftware/flexis-workbox-webpack-plugin.svg
+[peer-deps]: https://david-dm.org/TrigenSoftware/flexis-workbox-webpack-plugin/peer-status.svg
+[peer-deps-url]: https://david-dm.org/TrigenSoftware/flexis-workbox-webpack-plugin?type=peer
+
+[deps]: https://david-dm.org/TrigenSoftware/flexis-workbox-webpack-plugin.svg
 [deps-url]: https://david-dm.org/TrigenSoftware/flexis-workbox-webpack-plugin
 
 [build]: http://img.shields.io/travis/com/TrigenSoftware/flexis-workbox-webpack-plugin.svg
diff --git a/jest.config.json b/jest.config.json
@@ -1,4 +1,17 @@
 {
 	"testEnvironment": "node",
-	"testRegex": "/test/.*\\.spec\\.js$"
+	"testRegex": "/test/.*\\.spec\\.(jsx?|tsx?)$",
+	"transform": {
+		"^.+\\.(jsx?|tsx?)$": "babel-jest"
+	},
+	"collectCoverage": true,
+	"collectCoverageFrom": [
+		"src/**/*.{js,jsx,ts,tsx}",
+		"!**/*.d.ts",
+		"!**/node_modules/**"
+	],
+	"coverageReporters": [
+		"lcovonly",
+		"text"
+	]
 }
diff --git a/package.json b/package.json
@@ -13,17 +13,17 @@
   },
   "main": "lib/index.js",
   "engines": {
-    "node": ">=6.0.0"
+    "node": ">=8.0.0"
   },
   "scripts": {
-    "lint": "eslint --cache 'src/**/*.js'",
-    "jest": "NODE_ENV=test jest -c jest.config.json",
-    "checkSize": "size-limit",
-    "test": "npm run lint && npm run jest && npm run build && npm run checkSize",
+    "lint": "trigen-scripts lint",
+    "jest": "trigen-scripts jest",
+    "checkSize": "trigen-scripts checkSize",
+    "test": "trigen-scripts test",
+    "start": "trigen-scripts start",
     "build:testBundle": "NODE_ENV=test babel-node test/buildTestBundle",
-    "build": "rollup -c",
-    "watch": "rollup -c -w",
-    "cleanPublish": "npm run test && clean-publish"
+    "build": "trigen-scripts build",
+    "cleanPublish": "trigen-scripts cleanPublish"
   },
   "keywords": [
     "serviceworker",
@@ -39,37 +39,28 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.2.0",
+    "core-js": "3",
     "service-worker-loader": "*",
     "webpack-sources": "^1.3.0",
-    "workbox-build": "^3.6.3",
-    "workbox-webpack-plugin": "^3.6.3"
+    "workbox-build": "^4.3.1",
+    "workbox-webpack-plugin": "^4.3.1"
   },
   "devDependencies": {
-    "@babel/core": "7.2.2",
-    "@babel/node": "^7.2.2",
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^24.1.0",
-    "babel-preset-trigen": "^1.8.0",
-    "browserslist-config-trigen": "^1.1.0",
-    "clean-publish": "^1.1.0",
-    "clean-webpack-plugin": "^1.0.1",
-    "eslint": "^5.11.1",
-    "eslint-config-trigen": "^3.2.1",
+    "@trigen/scripts": "2",
+    "@trigen/scripts-plugin-babel": "2",
+    "@trigen/scripts-plugin-eslint": "2",
+    "@trigen/scripts-plugin-jest": "2",
+    "@trigen/scripts-plugin-rollup": "2",
+    "@trigen/scripts-plugin-size-limit": "2",
+    "@trigen/scripts-preset-lib": "2",
+    "clean-webpack-plugin": "^3.0.0",
     "eslint-plugin-jest": "^22.1.2",
     "html-webpack-plugin": "^3.2.0",
-    "husky": "^1.3.1",
-    "jest": "^24.1.0",
-    "lint-staged": "^8.1.0",
     "memory-fs": "^0.4.1",
-    "rollup": "^1.0.1",
-    "rollup-plugin-babel": "^4.2.0",
-    "rollup-plugin-commonjs": "^9.1.3",
-    "rollup-plugin-eslint": "^5.0.0",
-    "rollup-plugin-json": "^3.1.0",
+    "rollup-plugin-eslint": "^6.0.0",
+    "rollup-plugin-json": "^4.0.0",
     "service-worker-loader": "^3.0.0",
-    "size-limit": "^0.21.1",
-    "webpack": "^4.28.3",
-    "workbox-sw": "^3.6.3"
+    "webpack": "^4.28.3"
   },
   "files": [
     "lib"
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,13 +1,16 @@
+import {
+	external
+} from '@trigen/scripts-plugin-rollup/helpers';
+import { eslint } from 'rollup-plugin-eslint';
+import json from 'rollup-plugin-json';
 import commonjs from 'rollup-plugin-commonjs';
 import babel from 'rollup-plugin-babel';
-import json from 'rollup-plugin-json';
-import { eslint } from 'rollup-plugin-eslint';
 import pkg from './package.json';
 
 const plugins = [
 	eslint({
 		exclude:      ['**/*.json', 'node_modules/**'],
-		throwOnError: process.env.ROLLUP_WATCH != 'true'
+		throwOnError: true
 	}),
 	json({
 		preferConst: true
@@ -17,26 +20,12 @@ const plugins = [
 		runtimeHelpers: true
 	})
 ];
-const dependencies = [].concat(
-	['path'],
-	Object.keys(pkg.dependencies),
-	Object.keys(pkg.peerDependencies)
-);
-
-function external(id) {
-	return dependencies.some(_ =>
-		_ == id || id.indexOf(`${_}/`) == 0
-	);
-}
 
 export default {
-	input:  'src/index.js',
-	watch:  {
-		include: 'src/**/*.js'
-	},
+	input:    'src/index.js',
 	plugins,
-	external,
-	output: {
+	external: external(pkg, true),
+	output:   {
 		file:      pkg.main,
 		format:    'cjs',
 		exports:   'named',
diff --git a/test/.eslintrc b/test/.eslintrc
@@ -1,10 +1,13 @@
 {
-	"plugins": ["jest"],
+	"plugins": [
+		"jest"
+	],
 	"env": {
 		"jest/globals": true
 	},
 	"rules": {
 		"no-magic-numbers": "off",
+		"max-nested-callbacks": "off",
 		"no-sync": "off"
 	}
 }
diff --git a/test/compile.js b/test/compile.js
@@ -1,7 +1,9 @@
 import path from 'path';
 import webpack from 'webpack';
 import MemoryFs from 'memory-fs';
-import CleanPlugin from 'clean-webpack-plugin';
+import {
+	CleanWebpackPlugin
+} from 'clean-webpack-plugin';
 import HtmlPlugin from 'html-webpack-plugin';
 import WorkboxPlugin from '../src/index';
 
@@ -33,7 +35,7 @@ export default function compile(fixtureEntry, options = {}, writeToFs = false) {
 			}]
 		},
 		plugins:      [
-			!IS_TEST && new CleanPlugin(path.join(pathToArtifacts, '**', '*')),
+			!IS_TEST && new CleanWebpackPlugin(path.join(pathToArtifacts, '**', '*')),
 			new HtmlPlugin({
 				template: 'index.html'
 			}),
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`{`
`2`		`- "src/*/.js": ["eslint --cache", "git add"]`
	`2`	`+ "src/*/.{js,jsx}": [`
	`3`	`+ "trigen-scripts lint:js",`
	`4`	`+ "git add"`
	`5`	`+ ]`
`3`	`6`	`}`