wimpyprogrammer · wimpyprogrammer · May 23, 2021 · May 16, 2021 · May 16, 2021 · May 22, 2021
diff --git a/.babelrc b/.babelrc
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1,4 @@
 /coverage/
+/demo/lib/
 /lib/
+webpack.config.js
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -9,7 +9,8 @@
 		"prettier/@typescript-eslint"
 	],
 	"parserOptions": {
-		"ecmaVersion": 2018
+		"ecmaVersion": 2018,
+		"project": ["./**/tsconfig.json", "./**/tsconfig.test.json"]
 	},
 	"rules": {
 		"import/extensions": [

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -32,7 +32,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: yarn --frozen-lockfile
       - run: yarn run lint
-      - run: yarn run build && yarn run build-types
+      - run: yarn run build
       - run: yarn test
 
       - name: Upload test coverage report to Codecov

diff --git a/demo/src/index.html b/demo/src/index.html
@@ -0,0 +1,26 @@
+<html>
+	<head>
+		<style>
+			body,
+			input {
+				font-size: 1.5em;
+			}
+			input {
+				text-align: center;
+				width: 5em;
+			}
+			[readonly] {
+				background-color: lightgray;
+			}
+		</style>
+	</head>
+	<body>
+		<input type="number" id="num1" value="0" required />
+		+
+		<input type="number" id="num2" value="0" required />
+		=
+		<input readonly id="sum" value="0" />
+
+		<script type="text/javascript" src="demo.js"></script>
+	</body>
+</html>
diff --git a/demo/src/index.ts b/demo/src/index.ts
@@ -0,0 +1,14 @@
+import add from '../../src';
+
+const num1 = document.getElementById('num1') as HTMLInputElement;
+const num2 = document.getElementById('num2') as HTMLInputElement;
+const sum = document.getElementById('sum') as HTMLInputElement;
+
+function recalculate() {
+	const value1 = parseFloat(num1.value);
+	const value2 = parseFloat(num2.value);
+	sum.value = add(value1, value2).toString();
+}
+
+num1.addEventListener('keyup', recalculate);
+num2.addEventListener('keyup', recalculate);
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"compilerOptions": {
+		"lib": ["dom", "es5"],
+		"noEmit": true,
+		"outDir": "./lib",
+		"rootDir": "./src",
+		"tsBuildInfoFile": "./lib/demo.tsbuildinfo"
+	},
+	"extends": "../tsconfig.json",
+	"include": ["src"],
+	"references": [{ "path": "../src" }]
+}
diff --git a/demo/webpack.config.js b/demo/webpack.config.js
@@ -0,0 +1,45 @@
+/// <reference types="node" />
+const { resolve } = require('path');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+const CopyPlugin = require("copy-webpack-plugin");
+
+module.exports = {
+	entry: './demo/src/index.ts',
+	mode: 'production',
+	plugins: [
+		new CleanWebpackPlugin(),
+		new CopyPlugin({
+			patterns: [
+				{
+					context: resolve(__dirname, 'src'),
+					from: '**/*.html',
+				},
+			],
+		}),
+	],
+	module: {
+		rules: [
+			{
+				exclude: /node_modules/,
+				test: /\.ts$/,
+				use: [
+					{
+						loader: 'ts-loader',
+						options: {
+							compilerOptions: { noEmit: false },
+							configFile: resolve(__dirname, './tsconfig.json'),
+							projectReferences: true,
+						},
+					},
+				],
+			}
+		],
+	},
+	output: {
+		filename: 'demo.js',
+		path: resolve(__dirname, './lib'),
+	},
+	resolve: {
+		extensions: ['.ts', '.js'],
+	},
+};
diff --git a/jest.config.js b/jest.config.js
@@ -1,6 +1,12 @@
 module.exports = {
-	collectCoverageFrom: ['**/src/**/?*.(js|ts)', '!**/src/**/?*.d.ts'],
+	collectCoverageFrom: ['./src/**/?*.(js|ts)', '!**/src/**/?*.d.ts'],
 	restoreMocks: true,
+	globals: {
+		'ts-jest': {
+			isolatedModules: true,
+			tsconfig: 'src/tsconfig.test.json',
+		},
+	},
 	preset: 'ts-jest',
 	testEnvironment: 'node',
 	verbose: true,

diff --git a/package.json b/package.json
@@ -10,31 +10,32 @@
     "node": ">=14"
   },
   "scripts": {
-    "build": "npm run clean && babel src -d lib --extensions '.js,.ts' --ignore '**/*.spec.js','**/*.spec.ts'",
-    "build-types": "tsc --emitDeclarationOnly",
-    "clean": "rimraf lib/*",
-    "lint": "tsc --noEmit && eslint . --ext .js,.ts --report-unused-disable-directives",
+    "build": "run-s build:*",
+    "build:src": "tsc -b --clean && tsc -b",
+    "build:demo": "wp --config demo/webpack.config.js",
+    "lint": "tsc -b && eslint . --report-unused-disable-directives",
+    "start": "npm run build:demo && npx http-server ./demo/lib/ -c-1 -p 80",
     "test": "jest --coverage"
   },
   "devDependencies": {
-    "@babel/cli": "^7.13.16",
-    "@babel/core": "^7.14.2",
-    "@babel/preset-env": "^7.14.2",
-    "@babel/preset-typescript": "^7.10.4",
     "@types/jest": "^26.0.5",
-    "@typescript-eslint/eslint-plugin": "^3.6.1",
-    "@typescript-eslint/parser": "^3.6.1",
-    "codecov": "^3.8.2",
+    "@typescript-eslint/eslint-plugin": "^4.23.0",
+    "@typescript-eslint/parser": "^4.23.0",
+    "clean-webpack-plugin": "^4.0.0-alpha.0",
+    "copy-webpack-plugin": "^9.0.0",
     "eslint": "^7.26.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^6.11.0",
     "eslint-import-resolver-typescript": "^2.0.0",
     "eslint-plugin-import": "^2.23.0",
     "eslint-plugin-jest": "^23.18.0",
     "jest": "^26.6.3",
+    "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
-    "rimraf": "^3.0.2",
     "ts-jest": "^26.5.6",
-    "typescript": "^3.9.9"
+    "ts-loader": "^9.2.1",
+    "typescript": "^4.2.4",
+    "webpack": "^5.37.1",
+    "webpack-nano": "^1.1.1"
   }
 }
diff --git a/src/tsconfig.json b/src/tsconfig.json
@@ -0,0 +1,10 @@
+{
+	"compilerOptions": {
+		"lib": ["es5"],
+		"outDir": "../lib",
+		"rootDir": "./"
+	},
+	"extends": "../tsconfig.json",
+	"exclude": ["../**/*.spec.ts", "../**/*.config.js"],
+	"include": ["./**/*"]
+}
diff --git a/src/tsconfig.test.json b/src/tsconfig.test.json
@@ -0,0 +1,12 @@
+{
+	"compilerOptions": {
+		"lib": ["es5"],
+		"noEmit": true,
+		"outDir": "../lib",
+		"tsBuildInfoFile": "../lib/test.tsbuildinfo",
+		"types": ["jest"]
+	},
+	"extends": "../tsconfig.json",
+	"include": ["./**/*.spec.ts", "../jest.config.js"],
+	"references": [{ "path": "./" }]
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,21 +1,28 @@
 {
 	"compilerOptions": {
 		"allowJs": true,
-		"baseUrl": "./",
+		"baseUrl": ".",
 		"checkJs": true,
+		"composite": true,
 		"declaration": true,
 		"esModuleInterop": true,
 		"forceConsistentCasingInFileNames": true,
-		"module": "es2015",
+		"module": "CommonJS",
 		"moduleResolution": "node",
 		"noImplicitReturns": true,
 		"noUnusedLocals": true,
 		"noUnusedParameters": true,
-		"outDir": "./lib",
 		"pretty": true,
+		"rootDir": ".",
 		"skipLibCheck": true,
 		"sourceMap": true,
-		"strict": true
+		"strict": true,
+		"types": []
 	},
-	"include": ["src"]
+	"files": [],
+	"references": [
+		{ "path": "./demo" },
+		{ "path": "./src" },
+		{ "path": "./src/tsconfig.test.json" }
+	]
 }