Move demo code into demo/src directory

wimpyprogrammer · wimpyprogrammer · commit dd71883083c2 · 2019-09-14T23:26:57.000-05:00
Begin a separate tsconfig file for the demo.
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,3 @@
 /coverage/
-/demo/demo.js
+/demo/lib/
 /lib/
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 coverage/
+demo/lib/
 lib/
 node_modules/
-demo/demo.js
diff --git a/demo/index.html b/demo/index.html
@@ -174,6 +174,6 @@
 			</footer>
 		</div>
 
-		<script type="text/javascript" src="demo.js"></script>
+		<script type="text/javascript" src="lib/demo.js"></script>
 	</body>
 </html>
diff --git a/demo/src/demo.ts b/demo/src/demo.ts
@@ -1,4 +1,4 @@
-import { condense, condenseIgnoreCase } from './index';
+import { condense, condenseIgnoreCase } from '../../src/index';
 import { parseString, WhitespaceHandling } from './utils/wordList';
 
 const { Preserve, TrimLeadingAndTrailing } = WhitespaceHandling;
diff --git a/demo/src/utils/wordList.spec.ts b/demo/src/utils/wordList.spec.ts
diff --git a/demo/src/utils/wordList.ts b/demo/src/utils/wordList.ts
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
@@ -0,0 +1,5 @@
+{
+	"compilerOptions": {},
+	"extends": "../tsconfig.json",
+	"include": ["../src", "./src", "./webpack.config.js"]
+}
diff --git a/demo/webpack.config.js b/demo/webpack.config.js
@@ -1,5 +1,8 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { resolve } = require('path');
+
 module.exports = {
-	entry: './src/demo.ts',
+	entry: './demo/src/demo.ts',
 	mode: 'production',
 	module: {
 		rules: [
@@ -9,15 +12,18 @@ module.exports = {
 				use: [
 					{
 						loader: 'ts-loader',
-						options: { compilerOptions: { noEmit: false } },
+						options: {
+							compilerOptions: { noEmit: false },
+							configFile: resolve(__dirname, './tsconfig.json'),
+						},
 					},
 				],
 			},
 		],
 	},
 	output: {
 		filename: 'demo.js',
-		path: __dirname,
+		path: resolve(__dirname, './lib'),
 	},
 	resolve: {
 		extensions: ['.ts', '.js'],
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "clean": "rimraf lib/*",
     "format": "prettier --write 'src/**'",
     "lint": "tsc; eslint . --report-unused-disable-directives --ext .js,.ts",
+    "lint-demo": "tsc -p ./demo/tsconfig.json; eslint . --report-unused-disable-directives --ext .js,.ts --parser-options=project:./demo/tsconfig.json",
     "precommit": "pretty-quick --staged",
     "test": "jest --coverage",
     "travisci": "npm run lint && npm run test"
@@ -29,7 +30,7 @@
     "collectCoverageFrom": [
       "**/src/**/?*.(js|ts)",
       "!**/src/**/?*.d.ts",
-      "!**/src/demo.ts"
+      "!demo/src/demo.ts"
     ],
     "restoreMocks": true,
     "transform": {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { condense, condenseIgnoreCase } from './index';`
	`1`	`+import { condense, condenseIgnoreCase } from '../../src/index';`
`2`	`2`	`import { parseString, WhitespaceHandling } from './utils/wordList';`
`3`	`3`
`4`	`4`	`const { Preserve, TrimLeadingAndTrailing } = WhitespaceHandling;`