Merge branch 'master' of https://github.com/Quramy/typed-css-modules

Author: Quramy

.npmignore

@@ -1,2 +1,10 @@
-src/
-gulpfile.js
+# ignore everything
+*
+
+# include these:
+!/lib/**/*
+!LICENSE.md
+!README.md
+
+# exclude hidden files from the includes:
+.*

.travis.yml

@@ -7,7 +7,8 @@ env:
 language: node_js
 node_js:
 - 8
-- 9
+- 10
+- 12
 before_script:
 - yarn install --frozen-lockfile
 script:

package.json

@@ -5,7 +5,8 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc && chmod +x lib/cli.js",
+    "clean": "rm -rf lib/",
+    "build": "yarn clean && tsc && chmod +x lib/cli.js",
     "test": "jest",
     "test:watch": "jest --watch",
     "test:ci": "jest --coverage",
@@ -40,13 +41,30 @@
   },
   "devDependencies": {
     "@types/glob": "^7.1.1",
+    "@types/jest": "^24.0.15",
     "@types/mkdirp": "^0.5.1",
-    "@types/node": "^12.0.3",
+    "@types/node": "^12.0.8",
     "@types/yargs": "^8.0.2",
-    "jest": "^23.6.0",
+    "jest": "^24.8.0",
+    "ts-jest": "^24.0.2",
     "typescript": "^3.5.1"
   },
   "jest": {
-    "transform": {}
+    "transform": {
+      "^.+\\.ts$": "ts-jest"
+    },
+    "testRegex": "(test/.*|(src/.*\\.test))\\.ts$",
+    "testPathIgnorePatterns": [
+      "/node_modules/",
+      "\\.d\\.ts$",
+      "lib/",
+      "example/",
+      "coverage/"
+    ],
+    "moduleFileExtensions": [
+      "js",
+      "ts",
+      "json"
+    ]
   }
 }

src/cli.ts

@@ -2,11 +2,14 @@
 
 import * as path from 'path';
 import * as chokidar from 'chokidar';
-import glob from 'glob';
+import _glob from 'glob';
 import * as yargs from 'yargs';
 import chalk from 'chalk';
-import {DtsCreator} from './DtsCreator';
-import {DtsContent} from "./DtsContent";
+import {DtsCreator} from './dts-creator';
+import {DtsContent} from "./dts-content";
+import * as util from "util";
+
+const glob = util.promisify(_glob);
 
 const yarg = yargs.usage('Create .css.d.ts from CSS modules *.css files.\nUsage: $0 [options] <input directory>')
   .example('$0 src/styles', '')
@@ -39,7 +42,7 @@ async function writeFile(f: string): Promise<void> {
   }
 };
 
-function main() {
+async function main() {
   let rootDir: string;
   let searchDir: string;
   if(argv.h) {
@@ -66,14 +69,8 @@ function main() {
   });
 
   if(!argv.w) {
-    glob(filesPattern, {}, (err, files) => {
-      if(err) {
-        console.error(err);
-        return;
-      }
-      if(!files || !files.length) return;
-      files.forEach(writeFile);
-    });
+    const files = await glob(filesPattern);
+    files.forEach(writeFile);
   } else {
     console.log('Watch ' + filesPattern + '...');
 

src/DtsContent.ts renamed to src/dts-content.ts

@@ -2,8 +2,8 @@ import * as process from 'process';
 import * as path from'path';
 import * as os from 'os';
 import camelcase from "camelcase"
-import FileSystemLoader from './FileSystemLoader';
-import {DtsContent} from "./DtsContent";
+import FileSystemLoader from './file-system-loader';
+import {DtsContent} from "./dts-content";
 import {Plugin} from "postcss";
 
 

src/DtsCreator.ts renamed to src/dts-creator.ts

@@ -1,2 +1,2 @@
-import { DtsCreator } from './DtsCreator';
+import { DtsCreator } from './dts-creator';
 export = DtsCreator;

src/FileSystemLoader.ts renamed to src/file-system-loader.ts

@@ -1,9 +1,10 @@
 'use strict';
 
-var path = require('path');
-var assert = require('assert');
-var DtsCreator = require('../lib/DtsCreator').DtsCreator;
-var os = require('os');
+import * as path from 'path';
+
+import * as assert from 'assert';
+import * as os from 'os';
+import { DtsCreator } from '../src/dts-creator';
 
 describe('DtsCreator', () => {
   var creator = new DtsCreator();

src/index.ts

@@ -3,12 +3,13 @@
     "module": "commonjs",
     "target": "es2015",
     "declaration": true,
-    "sourceMap": false,
+    "sourceMap": true,
     "strict": true,
     "noImplicitAny": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "outDir": "lib"
+    "outDir": "lib",
+    "allowSyntheticDefaultImports": true
   },
   "include": [
     "src/**/*.ts"