diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..d8272b1 --- /dev/null +++ b/.babelrc @@ -0,0 +1,5 @@ +{ + presets: [ + ["es2015", { "loose": true }] + ] +} \ No newline at end of file diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..d8272b1 --- /dev/null +++ b/.babelrc @@ -0,0 +1,5 @@ +{ + presets: [ + ["es2015", { "loose": true }] + ] +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 23731fd..1c378a5 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ examples_old/ bin/ coverage/ +lib/ +dist/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..d8272b1 --- /dev/null +++ b/.babelrc @@ -0,0 +1,5 @@ +{ + presets: [ + ["es2015", { "loose": true }] + ] +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 23731fd..1c378a5 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ examples_old/ bin/ coverage/ +lib/ +dist/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/package.json b/package.json index 8ae4d07..1e01148 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "Chad Engler ", "Richard Davey " ], - "main": "./bin/pixi.min.js", + "main": "./lib/index.js", "homepage": "http://goodboydigital.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -18,31 +18,33 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "clean": "rimraf bin && mkdirp bin", + "clean": "rimraf dist lib && mkdirp dist && mkdir lib", "prestart": "npm run clean", "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", - "watch": "pixify -n PIXI -o pixi -w", + "watch": "npm run build -- --watch", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", + "watch:bundle": "npm run bundle -- -w", "test": "floss --path test/index.js", "test:debug": "npm test -- --debug", "prerenders": "npm --prefix scripts/renders i scripts/renders", "renders": "electron scripts/renders", "precoverage": "rimraf coverage && npm run build -- --noExternal", - "coverage": "npm test -- -c bin/pixi.js -s -h", + "coverage": "npm test -- -c dist/pixi.js -s -h", "lint": "eslint scripts src test --max-warnings 0", "lintfix": "npm run lint --fix", - "prebuild": "npm run lint && npm run clean", - "build": "pixify -n PIXI -o pixi", + "prebuild": "npm run lint", + "build": "babel src --out-dir lib", + "bundle": "pixify -d dist -n PIXI -o pixi", "docs": "jsdoc -c scripts/jsdoc.conf.json -R README.md", "publish:patch": "npm version patch --no-git-tag-version && npm publish", "publish:minor": "npm version minor --no-git-tag-version && npm publish", "publish:major": "npm version major --no-git-tag-version && npm publish", - "postversion": "npm run build && npm test", + "postversion": "npm run clean && npm run build && npm run bundle && npm test", "postpublish": "node scripts/release.js" }, "files": [ - "bin/", - "src/", + "dist/", + "lib/", "CONTRIBUTING.md", "LICENSE", "package.json", @@ -79,19 +81,7 @@ }, "browserify": { "transform": [ - [ - "babelify", - { - "presets": [ - [ - "es2015", - { - "loose": true - } - ] - ] - } - ], + "babelify", "glslify", "browserify-versionify" ] diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..d8272b1 --- /dev/null +++ b/.babelrc @@ -0,0 +1,5 @@ +{ + presets: [ + ["es2015", { "loose": true }] + ] +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 23731fd..1c378a5 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ examples_old/ bin/ coverage/ +lib/ +dist/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/package.json b/package.json index 8ae4d07..1e01148 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "Chad Engler ", "Richard Davey " ], - "main": "./bin/pixi.min.js", + "main": "./lib/index.js", "homepage": "http://goodboydigital.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -18,31 +18,33 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "clean": "rimraf bin && mkdirp bin", + "clean": "rimraf dist lib && mkdirp dist && mkdir lib", "prestart": "npm run clean", "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", - "watch": "pixify -n PIXI -o pixi -w", + "watch": "npm run build -- --watch", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", + "watch:bundle": "npm run bundle -- -w", "test": "floss --path test/index.js", "test:debug": "npm test -- --debug", "prerenders": "npm --prefix scripts/renders i scripts/renders", "renders": "electron scripts/renders", "precoverage": "rimraf coverage && npm run build -- --noExternal", - "coverage": "npm test -- -c bin/pixi.js -s -h", + "coverage": "npm test -- -c dist/pixi.js -s -h", "lint": "eslint scripts src test --max-warnings 0", "lintfix": "npm run lint --fix", - "prebuild": "npm run lint && npm run clean", - "build": "pixify -n PIXI -o pixi", + "prebuild": "npm run lint", + "build": "babel src --out-dir lib", + "bundle": "pixify -d dist -n PIXI -o pixi", "docs": "jsdoc -c scripts/jsdoc.conf.json -R README.md", "publish:patch": "npm version patch --no-git-tag-version && npm publish", "publish:minor": "npm version minor --no-git-tag-version && npm publish", "publish:major": "npm version major --no-git-tag-version && npm publish", - "postversion": "npm run build && npm test", + "postversion": "npm run clean && npm run build && npm run bundle && npm test", "postpublish": "node scripts/release.js" }, "files": [ - "bin/", - "src/", + "dist/", + "lib/", "CONTRIBUTING.md", "LICENSE", "package.json", @@ -79,19 +81,7 @@ }, "browserify": { "transform": [ - [ - "babelify", - { - "presets": [ - [ - "es2015", - { - "loose": true - } - ] - ] - } - ], + "babelify", "glslify", "browserify-versionify" ] diff --git a/scripts/release.js b/scripts/release.js index 57d800a..5d390e9 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -9,9 +9,9 @@ const options = { src: [ - 'bin/**/*', + 'dist/**/*', + 'lib/**/*', 'scripts/**/*', - 'src/**/*', 'test/**/*', '*.json', '*.md', diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..d8272b1 --- /dev/null +++ b/.babelrc @@ -0,0 +1,5 @@ +{ + presets: [ + ["es2015", { "loose": true }] + ] +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 23731fd..1c378a5 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,8 @@ examples_old/ bin/ coverage/ +lib/ +dist/ # jetBrains IDE ignores .idea \ No newline at end of file diff --git a/package.json b/package.json index 8ae4d07..1e01148 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "Chad Engler ", "Richard Davey " ], - "main": "./bin/pixi.min.js", + "main": "./lib/index.js", "homepage": "http://goodboydigital.com/", "bugs": "https://github.com/pixijs/pixi.js/issues", "license": "MIT", @@ -18,31 +18,33 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "clean": "rimraf bin && mkdirp bin", + "clean": "rimraf dist lib && mkdirp dist && mkdir lib", "prestart": "npm run clean", "start": "parallelshell \"npm run watch:lint\" \"npm run watch\"", - "watch": "pixify -n PIXI -o pixi -w", + "watch": "npm run build -- --watch", "watch:lint": "watch \"eslint scripts src test || exit 0\" src", + "watch:bundle": "npm run bundle -- -w", "test": "floss --path test/index.js", "test:debug": "npm test -- --debug", "prerenders": "npm --prefix scripts/renders i scripts/renders", "renders": "electron scripts/renders", "precoverage": "rimraf coverage && npm run build -- --noExternal", - "coverage": "npm test -- -c bin/pixi.js -s -h", + "coverage": "npm test -- -c dist/pixi.js -s -h", "lint": "eslint scripts src test --max-warnings 0", "lintfix": "npm run lint --fix", - "prebuild": "npm run lint && npm run clean", - "build": "pixify -n PIXI -o pixi", + "prebuild": "npm run lint", + "build": "babel src --out-dir lib", + "bundle": "pixify -d dist -n PIXI -o pixi", "docs": "jsdoc -c scripts/jsdoc.conf.json -R README.md", "publish:patch": "npm version patch --no-git-tag-version && npm publish", "publish:minor": "npm version minor --no-git-tag-version && npm publish", "publish:major": "npm version major --no-git-tag-version && npm publish", - "postversion": "npm run build && npm test", + "postversion": "npm run clean && npm run build && npm run bundle && npm test", "postpublish": "node scripts/release.js" }, "files": [ - "bin/", - "src/", + "dist/", + "lib/", "CONTRIBUTING.md", "LICENSE", "package.json", @@ -79,19 +81,7 @@ }, "browserify": { "transform": [ - [ - "babelify", - { - "presets": [ - [ - "es2015", - { - "loose": true - } - ] - ] - } - ], + "babelify", "glslify", "browserify-versionify" ] diff --git a/scripts/release.js b/scripts/release.js index 57d800a..5d390e9 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -9,9 +9,9 @@ const options = { src: [ - 'bin/**/*', + 'dist/**/*', + 'lib/**/*', 'scripts/**/*', - 'src/**/*', 'test/**/*', '*.json', '*.md', diff --git a/test/index.js b/test/index.js index bf50692..7e93d64 100755 --- a/test/index.js +++ b/test/index.js @@ -1,7 +1,7 @@ 'use strict'; /* eslint-disable global-require */ -require('../bin/pixi'); +require('../lib/'); PIXI.utils.skipHello(); // hide banner