Merge next to master

.gitignore

@@ -164,4 +164,7 @@ pip-log.txt
 
 /lib
 /esm
-node_modules
+node_modules
+
+# rollup visualizer
+/stats.html

build/build.js

@@ -1,5 +1,6 @@
 // const typescript = require('@rollup/plugin-typescript');
 const typescript = require('rollup-plugin-typescript2');
+const replace = require('@rollup/plugin-replace');
 const rollup = require('rollup');
 const path = require('path');
 const processs = require('process');
@@ -12,24 +13,34 @@ function current() {
     return (new Date()).toLocaleString();
 }
 
-const inputOption = {
-    input: path.resolve(__dirname, '../index.ts'),
-    plugins: [typescript({
-        tsconfigOverride: {
-            compilerOptions: {
-                // Rollup don't use CommonJS by default.
-                module: 'ES2015',
-                sourceMap: true,
-                // Use the esm d.ts
-                declaration: false
-            }
-        }
-    }), progress({
-        scope: {
-            total: 0
-        }
-    })]
-};
+function createInputOption(env, isWatch) {
+    return {
+        input: path.resolve(__dirname, '../index.ts'),
+        plugins: [
+            typescript({
+                clean: !isWatch,
+                tsconfigOverride: {
+                    compilerOptions: {
+                        // Rollup don't use CommonJS by default.
+                        module: 'ES2015',
+                        sourceMap: true,
+                        // Use the esm d.ts
+                        declaration: false
+                    }
+                }
+            }),
+            replace({
+                preventAssignment: true,
+                'process.env.NODE_ENV': JSON.stringify(env)
+            }),
+            progress({
+                scope: {
+                    total: 0
+                }
+            })
+        ]
+    };
+}
 
 const outputOption = {
     format: 'umd',
@@ -39,18 +50,17 @@ const outputOption = {
 };
 
 function minify(outPath) {
-    const fileMinPath = outPath.replace(/.js$/, '.min.js');
     const code = fs.readFileSync(outPath, 'utf-8');
     const uglifyResult = UglifyJS.minify(code);
     if (uglifyResult.error) {
         throw new Error(uglifyResult.error);
     }
-    fs.writeFileSync(fileMinPath, uglifyResult.code, 'utf-8');
+    fs.writeFileSync(outPath, uglifyResult.code, 'utf-8');
 }
 
 if (processs.argv.includes('--watch')) {
     const watcher = rollup.watch({
-        ...inputOption,
+        ...createInputOption('development', true),
         output: [outputOption],
         watch: {
             clearScreen: true
@@ -83,13 +93,24 @@ if (processs.argv.includes('--watch')) {
     });
 }
 else {
+    // Unminified
     rollup.rollup({
-        ...inputOption
+        ...createInputOption('development', false)
     }).then(bundle => {
-        bundle.write(outputOption).then(function () {
-            if (process.argv.indexOf('--minify') >= 0) {
-                minify(outputOption.file);
-            }
-        });
+        bundle.write(outputOption);
     });
+    // Minified
+    if (process.argv.indexOf('--minify') >= 0) {
+        rollup.rollup({
+            ...createInputOption('production', false)
+        }).then(bundle => {
+            const file = outputOption.file.replace(/.js$/, '.min.js');
+            bundle.write(Object.assign(outputOption, {
+                file,
+                sourcemap: false
+            })).then(function () {
+                minify(file);
+            });
+        });
+    }
 }

build/processLib.js

@@ -0,0 +1,67 @@
+// Porcess generated lib files.
+// Like adding js extension in the import statement.
+
+const { transformImport } = require('./transformImport');
+const globby = require('globby');
+const path = require('path');
+const fs = require('fs');
+const chalk = require('chalk');
+const rollup = require('rollup');
+const nodeResolve = require('@rollup/plugin-node-resolve').default;
+
+function addJsExtension(moduleName) {
+    // Ignore 'tslib'
+    if (!(moduleName.startsWith('.'))) {
+        return moduleName;
+    }
+    if (moduleName.endsWith('.ts')) {
+        // Replace ts with js
+        return moduleName.replace(/\.ts$/, '.js');
+    }
+    else if (moduleName.endsWith('.js')) {
+        return moduleName;
+    }
+    else {
+        return moduleName + '.js'
+    }
+}
+
+async function transform() {
+    const libFiles = await globby([
+        '**/*.js'
+    ], {
+        cwd: path.join(__dirname, '../lib'),
+        absolute: true
+    });
+
+    if (libFiles.length === 0) {
+        throw new Error('No lib files found.')
+    }
+
+    for (let file of libFiles) {
+        const code = fs.readFileSync(file, 'utf-8');
+        fs.writeFileSync(file, transformImport(code, addJsExtension), 'utf-8');
+    }
+
+    // Transform index;
+    const indexFile = path.join(__dirname, '../index.js');
+    fs.writeFileSync(
+        indexFile,
+        transformImport(
+            fs.readFileSync(indexFile, 'utf-8'),
+            (mduleName) => addJsExtension(mduleName).replace('./src', './lib')
+        )
+    )
+}
+
+transform().then(() => {
+    console.log(chalk.green('Added .js extensions.'));
+    console.log(chalk.gray('Start testing generated libs...'));
+}).then(() => {
+    return rollup.rollup({
+        input: path.resolve(__dirname, '../index.js'),
+        plugins: [nodeResolve()]
+    });
+}).then(() => {
+    console.log(chalk.green('Libs can be bundled!'));
+});

build/transformImport.js

@@ -0,0 +1,115 @@
+// adding js extension in the import statement.
+
+// Reference:
+// https://regexr.com/47jlq
+// https://gist.github.com/manekinekko/7e58a17bc62a9be47172
+const regexp = /((?:(?:import)|(?:export))\s+?(?:(?:(?:[\w*\s{},\/]*)\s+from\s+?)|))(?:(?:"(.*?)")|(?:'(.*?)'))([\s]*?(?:;|$|))/g;
+
+module.exports.transformImport = function (code, processModuleName) {
+    return code.replace(regexp, (str, prefix, moduleNameA, moduleNameB, postfix) => {
+        let moduleName = (moduleNameA === undefined ? moduleNameB : moduleNameA).trim();
+        const quote = moduleNameA === undefined ? "'" : '"';
+        return prefix + quote + processModuleName(moduleName) + quote + postfix;
+        // Not support other extensions.
+    });
+}
+
+
+const testCases = `import videos from './videos/index.js'
+
+export default (socket, context) => {
+    // dynamically importing all the socket.io handler (it's dynamic import that happen at run time)
+  import {
+	something
+} from "./test/okbb"
+
+const f = 2;
+
+import test from 'obb'
+
+
+import {
+  Component
+} from '@angular2/core';
+
+import defaultMember from "module-0";
+
+import   *    as name from "module-1  ";
+
+import   {  member }   from "  module-2";
+
+import { member as alias } from "module-3";
+
+import { member1 , member2 } from "module-4";
+
+import { member1 , member2 as alias2 , member3 as alias3 } from "module-5";
+
+import defaultMember, { member, member } from "module-6";
+
+import defaultMember, * as name from "module-7";
+
+import "module-8";
+
+import "module-9"    // comment no problem
+
+import {
+    AAAA,
+    // BBB
+} from 'module-10';
+
+import "module-b' // doesn't match -> the opening and closing quation mark are different
+
+importing hya from 'ttt'
+
+import fbsfrom ''
+
+
+// Export expressions.
+export { aaa };
+
+export * from "module-11";
+
+export { aaa } from "module-12";
+
+// Should not be parsed
+export default aaa;
+
+export function bbb () {
+};
+`
+
+module.exports.runTest = function () {
+    const expected = [
+        './videos/index.js',
+        './test/okbb',
+        'obb',
+        '@angular2/core',
+        'module-0',
+        'module-1',
+        'module-2',
+        'module-3',
+        'module-4',
+        'module-5',
+        'module-6',
+        'module-7',
+        'module-8',
+        'module-9',
+        'module-10',
+        'module-11',
+        'module-12'
+    ]
+    let cursor = 0;
+    module.exports.transformImport(testCases, (moduleName) => {
+        if (expected[cursor] !== moduleName) {
+            throw new Error(`Expected ${expected[cursor]}. Actual ${moduleName}`);
+        }
+        cursor++;
+        return moduleName;
+    })
+    if (cursor !== expected.length) {
+        throw new Error('Test failed');
+    }
+    console.log('All test passed!')
+}
+
+// module.exports.runTest();

index.d.ts

@@ -1,2 +1,2 @@
-export * from './lib/zrender';
-export * from './lib/export';
+export * from './src/zrender';
+export * from './src/export';

index.js

@@ -1,8 +1 @@
-export * from './lib/zrender';
-export * from './lib/export';
-
-import {registerPainter} from './lib/zrender';
-import CanvasPainter from './lib/canvas/Painter';
-import SVGPainter from './lib/svg/Painter';
-registerPainter('canvas', CanvasPainter);
-registerPainter('svg', SVGPainter);
+export * from './lib/all.js'

index.ts

@@ -1,9 +1 @@
-export * from './src/zrender';
-export * from './src/export';
-
-import {registerPainter} from './src/zrender';
-import CanvasPainter from './src/canvas/Painter';
-import SVGPainter from './src/svg/Painter';
-registerPainter('canvas', CanvasPainter);
-registerPainter('svg', SVGPainter);
-// import './src/vml/vml';
+export * from './lib/all';