Merge pull request #100 from merkle-open/bugfix/functional-mistakes

Bugfix/functional mistakes

packages/ts-config-webpack-plugin/config/development.config.js

@@ -13,7 +13,7 @@ exports = module.exports = (options) => ({
 		rules: [
 			{
 				// .ts, .tsx, .d.ts
-				test: /\.(tsx?|d.ts)$/,
+				test: /\.(tsx?|d\.ts)$/,
 				use: [
 					{
 						// enable file based cache

packages/ts-config-webpack-plugin/config/production.config.js

@@ -14,7 +14,7 @@ exports = module.exports = (options) => ({
 		rules: [
 			{
 				// .ts, .tsx, .d.ts
-				test: /\.(tsx?|d.ts)$/,
+				test: /\.(tsx?|d\.ts)$/,
 				use: [
 					{
 						// enable file based cache

packages/ts-config-webpack-plugin/test/WebpackConfigFiles.test.js

@@ -0,0 +1,46 @@
+const productionConfig = require('../config/production.config');
+const developmentConfig = require('../config/development.config');
+
+function filesRegexTests(filesRegex) {
+	it('files regex matches .ts file ending', (done) => {
+		expect(filesRegex.test('demo.ts')).toBe(true);
+		done();
+	});
+
+	it('files regex matches .tsx file ending', (done) => {
+		expect(filesRegex.test('demo.tsx')).toBe(true);
+		done();
+	});
+
+	it('files regex matches .d.ts file ending', (done) => {
+		expect(filesRegex.test('demo.d.ts')).toBe(true);
+		done();
+	});
+
+	it('files regex doesn\'t match "asdfts" (escaping the first dot)', (done) => {
+		expect(filesRegex.test('asdfts')).toBe(false);
+		done();
+	});
+
+	it('files regex doesn\'t match "asdftsx" (escaping the first dot)', (done) => {
+		expect(filesRegex.test('asdftsx')).toBe(false);
+		done();
+	});
+
+	it('files regex doesn\'t match "demo.dxts" (escaping the second dot)', (done) => {
+		expect(filesRegex.test('demo.dxts')).toBe(false);
+		done();
+	});
+}
+
+describe('TsConfigWebpackPlugin production config file', () => {
+	const filesRegex = productionConfig({}).module.rules[0].test;
+
+	filesRegexTests(filesRegex);
+});
+
+describe('TsConfigWebpackPlugin development config file', () => {
+	const filesRegex = developmentConfig({}).module.rules[0].test;
+
+	filesRegexTests(filesRegex);
+});

webpage/src/components/Configurator.tsx

@@ -19,7 +19,7 @@ function getInitialState() {
 		configOptionKeys.forEach((key) => {
 			result[key] = initial[key] === true;
 		});
-		return initial;
+		return result;
 	} catch {
 		return {};
 	}