2.0.45

.npmignore

@@ -3,6 +3,7 @@ node_modules
 /scripts
 /src
 /build/fyge.min.js.map
+/build/fyge.esm.js.map
 tsConfig.json
 package-lock.json
 webpack.config.js

build/FYGE.d.ts

-declare namespace FYGE{export  const VERSION = "2.0.44";
+declare namespace FYGE{export  const VERSION = "2.0.45";
 
 export  function cos(angle: number): number;
 

build/types.d.ts

-export  const VERSION = "2.0.44";
+export  const VERSION = "2.0.45";
 
 export  function cos(angle: number): number;
 

package.json

 {
     "name": "fyge",
-    "version": "2.0.44",
+    "version": "2.0.45",
     "description": "canvas渲染引擎",
     "main": "./build/fyge.min.js",
+    "module": "./build/fyge.esm.js",
     "types": "./build/types.d.ts",
     "dependencies": {},
     "scripts": {
@@ -10,9 +11,10 @@
         "declare1": "node scripts/declare1.js src/index.ts",
         "declare2": "tsc -d --declarationDir types --emitDeclarationOnly",
         "build": "webpack",
+        "buildR": "rollup -c --environment BUILD:production",
         "test": "echo \"Error: no test specified\" && exit 1",
         "dev": "webpack -w",
-        "dev1": "rollup -c -m -w",
+        "devR": "rollup -c -m -w",
         "watch": "webpack --watch",
         "typedoc": "typedoc src/index.ts"
     },
@@ -21,13 +23,14 @@
     "devDependencies": {
         "dts-bundle": "^0.7.3",
         "glob": "^7.1.6",
-        "rollup": "^1.32.1",
+        "rollup": "^2.55.1",
         "rollup-plugin-commonjs": "^10.1.0",
         "rollup-plugin-node-resolve": "^5.2.0",
         "rollup-plugin-progress": "^1.1.2",
         "rollup-plugin-typescript": "^1.0.1",
         "rollup-plugin-typescript2": "^0.25.2",
-        "rollup-plugin-uglify": "^6.0.3",
+        "rollup-plugin-terser": "^7.0.2",
+        "tslib": "^2.1.0",
         "ts-loader": "^4.0.0",
         "typedoc": "^0.20.20",
         "typescript": "^3.5.1",

record.txt

@@ -460,7 +460,6 @@
 
 2.0.43  Spine添加属性fps帧率，同时update方法里delta乘上fps/60
 
-还没发布
 2.0.44  引擎单独导出toDisplayDataURL，该文件移入renderers文件夹内
         const注释掉osType，tbminAdpate里新增getOsType方法，同时BatchRenderer、EditableText和InputText里osType改成getOsType()
         Stage关于osType和getEnv相关修改
@@ -469,6 +468,7 @@
         utile的index里去掉toDisplayDataURL导出，isWebGLSupported方法移到tbminAdpate里
         tbminAdpate里新增tt，改动较大，待测试，且新增getDevicePixelRatio，getOsType，预留initedByTtEnv方法
 
+2.0.45  使用rollup打包，（待测试，包括web和淘宝环境）
  
 
 

rollup.config.js

-/**
- * Created by rockyl on 2018/11/16.
- */
 
 const resolve = require('rollup-plugin-node-resolve');
 const commonjs = require('rollup-plugin-commonjs');
 const progress = require('rollup-plugin-progress');
 const typescript = require('rollup-plugin-typescript');
-const {uglify} = require('rollup-plugin-uglify');
-const fs = require('fs');
+const { terser } = require('rollup-plugin-terser');
 
-const tslibWrapper = 'var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate: __decorate,__param: __param,__metadata: __metadata,__awaiter: __awaiter,__generator: __generator,__exportStar: __exportStar,__values: __values,__read: __read,__spread: __spread,__spreadArrays: __spreadArrays,__await: __await,__asyncGenerator: __asyncGenerator,__asyncDelegator: __asyncDelegator,__asyncValues: __asyncValues,__makeTemplateObject: __makeTemplateObject,__importStar: __importStar,__importDefault: __importDefault};'
-const tslibCode = fs.readFileSync(__dirname + '/scripts/tslib.min.js');
+// const fs = require('fs');
+
+//rollup-plugin-typescript里有tslib
+//const tslibWrapper = 'var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate: __decorate,__param: __param,__metadata: __metadata,__awaiter: __awaiter,__generator: __generator,__exportStar: __exportStar,__values: __values,__read: __read,__spread: __spread,__spreadArrays: __spreadArrays,__await: __await,__asyncGenerator: __asyncGenerator,__asyncDelegator: __asyncDelegator,__asyncValues: __asyncValues,__makeTemplateObject: __makeTemplateObject,__importStar: __importStar,__importDefault: __importDefault};'
+//const tslibCode = fs.readFileSync(__dirname + '/scripts/tslib.min.js');
+
+// const isProd = process.env.BUILD === 'production';
 
 export default {
 	input: 'src/index.ts',
 	output: [
 		{
-			file: `debug/FYGE.js`,
+			file: "build/fyge.min.js",
 			format: 'umd',
 			name: 'FYGE',
 			globals: {
-				tslib: 'tslib'
+				//tslib: 'tslib'
+			},
+			//banner: tslibCode + '\n' + tslibWrapper,
+			sourcemap: true//!isProd,
+		},
+		{
+			file: `build/fyge.esm.js`,
+			format: 'esm',
+			globals: {
+				//tslib: 'tslib'
 			},
-			banner: tslibCode + '\n' + tslibWrapper,
+			//banner: tslibCode + '\n' + tslibWrapper,
+			sourcemap: true//!isProd,
 		},
 	],
 	plugins: [
-		// progress(),
+		progress(),
 		resolve({}),
-		typescript({
-			// useTsconfigDeclarationDir: true,
-		}),
+		typescript(),
 		commonjs(),
-		process.env.BUILD === 'production' && uglify({})
+		/*isProd &&*/ terser()
 	],
-	external: ['tslib'],
+	//external: ['tslib'],
 };

src/2d/const.ts

@@ -7,7 +7,7 @@
  * @name VERSION
  * @type {string}
  */
-export const VERSION = "2.0.44";
+export const VERSION = "2.0.45";
 
 
 /**