upd: rewrite with ts

Author: chenjiahan

.gitignore

@@ -1,6 +1,7 @@
-# IntelliJ project files
 .idea
 *.iml
 out
 gen
 node_modules
+*.log
+test/dist/

index.js renamed to lib/index.js

@@ -1,27 +1,30 @@
-const acorn = require('acorn');
-const escodegen = require('escodegen');
-
-module.exports = function(source) {
-    this.cacheable && this.cacheable();
-    const tree = acorn.parse(source, { sourceType: 'module' });
-    traverse(tree);
-    return escodegen.generate(tree);
-};
-
-function isObject(item) {
+"use strict";
+var acorn = require("acorn");
+var escodegen = require("escodegen");
+var isObject = function (item) {
     return Object.prototype.toString.call(item) === '[object Object]';
-}
-
+};
+var acornOptions = {
+    sourceType: 'module'
+};
 function traverse(input) {
     if (Array.isArray(input)) {
-        input.forEach(item => traverse(item));
-    } 
+        input.forEach(traverse);
+    }
     else if (isObject(input)) {
-        for (let key in input) {
+        for (var key in input) {
             if (typeof input[key] === 'string') {
                 input[key] = input[key].replace(/(\n\s+)/g, '');
             }
-            traverse(input[key]);
+            else {
+                traverse(input[key]);
+            }
         }
     }
 }
+module.exports = function (source) {
+    this.cacheable && this.cacheable();
+    var tree = acorn.parse(source, acornOptions);
+    traverse(tree);
+    return escodegen.generate(tree);
+};

package.json

@@ -1,26 +1,31 @@
 {
   "name": "template-string-optimize-loader",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "template string optimize loader module for webpack",
-  "main": "index.js",
+  "main": "lib/index.js",
   "scripts": {
-    "test": " webpack && webpack --config webpack.config.optimize.js",
-    "release": "npm publish"
+    "lib": "tsc -p tsconfig.json",
+    "test": "bash ./test/test.sh",
+    "release": "npm run lib && npm publish"
   },
   "author": "chenjiahan",
   "license": "ISC",
   "devDependencies": {
-    "babel": "^6.3.26",
-    "babel-loader": "^6.2.1",
-    "babel-preset-es2015": "^6.3.13",
-    "webpack": "^1.12.10"
+    "@types/acorn": "^4.0.2",
+    "@types/escodegen": "^0.0.6",
+    "babel": "^6.23.0",
+    "babel-core": "^6.24.1",
+    "babel-loader": "^6.4.1",
+    "babel-preset-es2015": "^6.24.1",
+    "typescript": "^2.2.2",
+    "webpack": "^2.4.1"
   },
   "bugs": {
     "url": "https://github.com/chenjiahan/template-string-optimize-loader/issues"
   },
   "homepage": "https://github.com/chenjiahan/template-string-optimize-loader#readme",
   "dependencies": {
-    "acorn": "^4.0.9",
+    "acorn": "^5.0.3",
     "escodegen": "^1.8.1"
   }
 }

src/index.ts

@@ -0,0 +1,30 @@
+import acorn = require('acorn');
+import escodegen = require('escodegen');
+
+const isObject = (item: any): boolean =>
+    Object.prototype.toString.call(item) === '[object Object]';
+
+const acornOptions = {
+    sourceType: 'module'
+} as acorn.Options;
+
+export = function (source: string): string {
+    this.cacheable && this.cacheable();
+    const tree = acorn.parse(source, acornOptions);
+    traverse(tree);
+    return escodegen.generate(tree);
+};
+
+function traverse(input: any): void {
+    if (Array.isArray(input)) {
+        input.forEach(traverse);
+    } else if (isObject(input)) {
+        for (let key in input) {
+            if (typeof input[key] === 'string') {
+                input[key] = input[key].replace(/(\n\s+)/g, '');
+            } else {
+                traverse(input[key]);
+            }
+        }
+    }
+}

test/dist/test.js

@@ -0,0 +1,9 @@
+#!/bin/sh
+npm run lib
+
+mkdir node_modules/template-string-optimize-loader
+cp -r ./package.json ./node_modules/template-string-optimize-loader
+cp -r ./lib ./node_modules/template-string-optimize-loader
+
+webpack
+webpack --config webpack.config.optimize.js

test/dist/test.min.js

@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "target": "es5",
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "outDir": "lib",
+        "isolatedModules": false,
+        "experimentalDecorators": true,
+        "noImplicitAny": true,
+        "removeComments": true,
+        "suppressImplicitAnyIndexErrors": true,
+        "allowSyntheticDefaultImports": true,
+        "types": [
+            "acorn",
+            "escodegen"
+        ],
+        "lib": [
+            "es2015"
+        ]
+    },
+    "include": [
+        "./src/*.ts"
+    ],
+    "compileOnSave": false
+}

test/test.sh

@@ -1,14 +1,21 @@
+const path = require('path');
+
 module.exports = {
-    entry: "./test/src/test.js",
+    entry: './test/src/test.js',
     output: {
-        path: "test/dist",
-        filename: "test.js"
+        path: path.resolve(__dirname, './test/dist'),
+        filename: 'test.js'
     },
     module: {
-        loaders: [
+        rules: [
             { 
                 test: /\.js$/, 
-                loader: "babel?presets[]=es2015"
+                use: {
+                    loader: 'babel-loader',
+                    options: {
+                        presets: ['es2015']
+                    }
+                }
             }
         ]
     }

tsconfig.json

@@ -1,14 +1,24 @@
+const path = require('path');
+
 module.exports = {
-    entry: "./test/src/test.js",
+    entry: './test/src/test.js',
     output: {
-        path: "test/dist",
-        filename: "test.min.js"
+        path: path.resolve(__dirname, './test/dist'),
+        filename: 'test.optimize.js'
     },
     module: {
-        loaders: [
+        rules: [
             { 
                 test: /\.js$/, 
-                loader: "template-string-optimize!babel?presets[]=es2015"
+                use: [
+                    'template-string-optimize-loader',
+                    {
+                        loader: 'babel-loader',
+                        options: {
+                            presets: ['es2015']
+                        }
+                    }
+                ]
             }
         ]
     }