diff --git a/package.json b/package.json index f679767..5ba85ca 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "rollup": "^0.52.0", "rollup-plugin-buble": "^0.18.0", "rollup-plugin-commonjs": "^8.2.4", - "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-sourcemaps": "^0.4.2", diff --git a/package.json b/package.json index f679767..5ba85ca 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "rollup": "^0.52.0", "rollup-plugin-buble": "^0.18.0", "rollup-plugin-commonjs": "^8.2.4", - "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-sourcemaps": "^0.4.2", diff --git a/packages/core/src/renderers/Renderer.js b/packages/core/src/renderers/Renderer.js index d062b10..c437741 100644 --- a/packages/core/src/renderers/Renderer.js +++ b/packages/core/src/renderers/Renderer.js @@ -134,6 +134,8 @@ this.renderingToScreen = true; sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL 1'); + + this.resize(this.options.width, this.options.height); } addSystem(_class, name) diff --git a/package.json b/package.json index f679767..5ba85ca 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "rollup": "^0.52.0", "rollup-plugin-buble": "^0.18.0", "rollup-plugin-commonjs": "^8.2.4", - "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-sourcemaps": "^0.4.2", diff --git a/packages/core/src/renderers/Renderer.js b/packages/core/src/renderers/Renderer.js index d062b10..c437741 100644 --- a/packages/core/src/renderers/Renderer.js +++ b/packages/core/src/renderers/Renderer.js @@ -134,6 +134,8 @@ this.renderingToScreen = true; sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL 1'); + + this.resize(this.options.width, this.options.height); } addSystem(_class, name) diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index e12eaef..83de0a5 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -26,11 +26,12 @@ ], "dependencies": { "@pixi/core": "^5.0.0-alpha", + "@pixi/loaders": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", "@pixi/utils": "^5.0.0-alpha", - "@pixi/loaders": "^5.0.0-alpha" + "url": "^0.11.0" }, "devDependencies": { "floss": "^2.1.3" } -} \ No newline at end of file +} diff --git a/package.json b/package.json index f679767..5ba85ca 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "rollup": "^0.52.0", "rollup-plugin-buble": "^0.18.0", "rollup-plugin-commonjs": "^8.2.4", - "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-sourcemaps": "^0.4.2", diff --git a/packages/core/src/renderers/Renderer.js b/packages/core/src/renderers/Renderer.js index d062b10..c437741 100644 --- a/packages/core/src/renderers/Renderer.js +++ b/packages/core/src/renderers/Renderer.js @@ -134,6 +134,8 @@ this.renderingToScreen = true; sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL 1'); + + this.resize(this.options.width, this.options.height); } addSystem(_class, name) diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index e12eaef..83de0a5 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -26,11 +26,12 @@ ], "dependencies": { "@pixi/core": "^5.0.0-alpha", + "@pixi/loaders": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", "@pixi/utils": "^5.0.0-alpha", - "@pixi/loaders": "^5.0.0-alpha" + "url": "^0.11.0" }, "devDependencies": { "floss": "^2.1.3" } -} \ No newline at end of file +} diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 8750945..650564a 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,4 +1,3 @@ -import * as path from 'path'; import { TextureCache } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import BitmapText from './BitmapText'; @@ -34,6 +33,31 @@ } /** + * Replacement for NodeJS's path.dirname + * @private + * @param {string} url Path to get directory for + */ + static dirname(url) + { + const dir = url + .replace(/\/$/, '') // replace trailing slash + .replace(/\/[^\/]*$/, ''); // remove everything after the last + + // File request is relative, use current directory + if (dir === url) + { + return '.'; + } + // Started with a slash + else if (dir === '') + { + return '/'; + } + + return dir; + } + + /** * Called after a resource is loaded. * @see PIXI.Loader~loaderMiddleware * @param {PIXI.LoaderResource} resource @@ -60,7 +84,7 @@ return; } - let xmlUrl = !resource.isDataUrl ? path.dirname(resource.url) : ''; + let xmlUrl = !resource.isDataUrl ? BitmapFontLoader.dirname(resource.url) : ''; if (resource.isDataUrl) { diff --git a/package.json b/package.json index f679767..5ba85ca 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "rollup": "^0.52.0", "rollup-plugin-buble": "^0.18.0", "rollup-plugin-commonjs": "^8.2.4", - "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-sourcemaps": "^0.4.2", diff --git a/packages/core/src/renderers/Renderer.js b/packages/core/src/renderers/Renderer.js index d062b10..c437741 100644 --- a/packages/core/src/renderers/Renderer.js +++ b/packages/core/src/renderers/Renderer.js @@ -134,6 +134,8 @@ this.renderingToScreen = true; sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL 1'); + + this.resize(this.options.width, this.options.height); } addSystem(_class, name) diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index e12eaef..83de0a5 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -26,11 +26,12 @@ ], "dependencies": { "@pixi/core": "^5.0.0-alpha", + "@pixi/loaders": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", "@pixi/utils": "^5.0.0-alpha", - "@pixi/loaders": "^5.0.0-alpha" + "url": "^0.11.0" }, "devDependencies": { "floss": "^2.1.3" } -} \ No newline at end of file +} diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 8750945..650564a 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,4 +1,3 @@ -import * as path from 'path'; import { TextureCache } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import BitmapText from './BitmapText'; @@ -34,6 +33,31 @@ } /** + * Replacement for NodeJS's path.dirname + * @private + * @param {string} url Path to get directory for + */ + static dirname(url) + { + const dir = url + .replace(/\/$/, '') // replace trailing slash + .replace(/\/[^\/]*$/, ''); // remove everything after the last + + // File request is relative, use current directory + if (dir === url) + { + return '.'; + } + // Started with a slash + else if (dir === '') + { + return '/'; + } + + return dir; + } + + /** * Called after a resource is loaded. * @see PIXI.Loader~loaderMiddleware * @param {PIXI.LoaderResource} resource @@ -60,7 +84,7 @@ return; } - let xmlUrl = !resource.isDataUrl ? path.dirname(resource.url) : ''; + let xmlUrl = !resource.isDataUrl ? BitmapFontLoader.dirname(resource.url) : ''; if (resource.isDataUrl) { diff --git a/packages/text-bitmap/test/BitmapFontLoader.js b/packages/text-bitmap/test/BitmapFontLoader.js index 7a64297..f0a6db5 100644 --- a/packages/text-bitmap/test/BitmapFontLoader.js +++ b/packages/text-bitmap/test/BitmapFontLoader.js @@ -84,6 +84,17 @@ expect(BitmapFontLoader.use).to.be.a('function'); }); + it('should process dirname correctly', function () + { + const { dirname } = BitmapFontLoader; + + expect(dirname('file.fnt')).to.equal('.'); + expect(dirname('/file.fnt')).to.equal('/'); + expect(dirname('foo/bar/file.fnt')).to.equal('foo/bar'); + expect(dirname('/foo/bar/file.fnt')).to.equal('/foo/bar'); + expect(dirname('../file.fnt')).to.equal('..'); + }); + it('should do nothing if the resource is not XML', function () { const spy = sinon.spy(); diff --git a/package.json b/package.json index f679767..5ba85ca 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "rollup": "^0.52.0", "rollup-plugin-buble": "^0.18.0", "rollup-plugin-commonjs": "^8.2.4", - "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-sourcemaps": "^0.4.2", diff --git a/packages/core/src/renderers/Renderer.js b/packages/core/src/renderers/Renderer.js index d062b10..c437741 100644 --- a/packages/core/src/renderers/Renderer.js +++ b/packages/core/src/renderers/Renderer.js @@ -134,6 +134,8 @@ this.renderingToScreen = true; sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL 1'); + + this.resize(this.options.width, this.options.height); } addSystem(_class, name) diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index e12eaef..83de0a5 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -26,11 +26,12 @@ ], "dependencies": { "@pixi/core": "^5.0.0-alpha", + "@pixi/loaders": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", "@pixi/utils": "^5.0.0-alpha", - "@pixi/loaders": "^5.0.0-alpha" + "url": "^0.11.0" }, "devDependencies": { "floss": "^2.1.3" } -} \ No newline at end of file +} diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 8750945..650564a 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,4 +1,3 @@ -import * as path from 'path'; import { TextureCache } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import BitmapText from './BitmapText'; @@ -34,6 +33,31 @@ } /** + * Replacement for NodeJS's path.dirname + * @private + * @param {string} url Path to get directory for + */ + static dirname(url) + { + const dir = url + .replace(/\/$/, '') // replace trailing slash + .replace(/\/[^\/]*$/, ''); // remove everything after the last + + // File request is relative, use current directory + if (dir === url) + { + return '.'; + } + // Started with a slash + else if (dir === '') + { + return '/'; + } + + return dir; + } + + /** * Called after a resource is loaded. * @see PIXI.Loader~loaderMiddleware * @param {PIXI.LoaderResource} resource @@ -60,7 +84,7 @@ return; } - let xmlUrl = !resource.isDataUrl ? path.dirname(resource.url) : ''; + let xmlUrl = !resource.isDataUrl ? BitmapFontLoader.dirname(resource.url) : ''; if (resource.isDataUrl) { diff --git a/packages/text-bitmap/test/BitmapFontLoader.js b/packages/text-bitmap/test/BitmapFontLoader.js index 7a64297..f0a6db5 100644 --- a/packages/text-bitmap/test/BitmapFontLoader.js +++ b/packages/text-bitmap/test/BitmapFontLoader.js @@ -84,6 +84,17 @@ expect(BitmapFontLoader.use).to.be.a('function'); }); + it('should process dirname correctly', function () + { + const { dirname } = BitmapFontLoader; + + expect(dirname('file.fnt')).to.equal('.'); + expect(dirname('/file.fnt')).to.equal('/'); + expect(dirname('foo/bar/file.fnt')).to.equal('foo/bar'); + expect(dirname('/foo/bar/file.fnt')).to.equal('/foo/bar'); + expect(dirname('../file.fnt')).to.equal('..'); + }); + it('should do nothing if the resource is not XML', function () { const spy = sinon.spy(); diff --git a/packages/utils/package.json b/packages/utils/package.json index e3e8e1b..bbbeab9 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -29,9 +29,10 @@ "@pixi/settings": "^5.0.0-alpha", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "remove-array-items": "^1.0.0" + "remove-array-items": "^1.0.0", + "url": "^0.11.0" }, "devDependencies": { "floss": "^2.1.3" } -} \ No newline at end of file +} diff --git a/package.json b/package.json index f679767..5ba85ca 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "rollup": "^0.52.0", "rollup-plugin-buble": "^0.18.0", "rollup-plugin-commonjs": "^8.2.4", - "rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-resolve": "^3.0.0", "rollup-plugin-replace": "^2.0.0", "rollup-plugin-sourcemaps": "^0.4.2", diff --git a/packages/core/src/renderers/Renderer.js b/packages/core/src/renderers/Renderer.js index d062b10..c437741 100644 --- a/packages/core/src/renderers/Renderer.js +++ b/packages/core/src/renderers/Renderer.js @@ -134,6 +134,8 @@ this.renderingToScreen = true; sayHello(this.context.webGLVersion === 2 ? 'WebGL 2' : 'WebGL 1'); + + this.resize(this.options.width, this.options.height); } addSystem(_class, name) diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index e12eaef..83de0a5 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -26,11 +26,12 @@ ], "dependencies": { "@pixi/core": "^5.0.0-alpha", + "@pixi/loaders": "^5.0.0-alpha", "@pixi/math": "^5.0.0-alpha", "@pixi/utils": "^5.0.0-alpha", - "@pixi/loaders": "^5.0.0-alpha" + "url": "^0.11.0" }, "devDependencies": { "floss": "^2.1.3" } -} \ No newline at end of file +} diff --git a/packages/text-bitmap/src/BitmapFontLoader.js b/packages/text-bitmap/src/BitmapFontLoader.js index 8750945..650564a 100644 --- a/packages/text-bitmap/src/BitmapFontLoader.js +++ b/packages/text-bitmap/src/BitmapFontLoader.js @@ -1,4 +1,3 @@ -import * as path from 'path'; import { TextureCache } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import BitmapText from './BitmapText'; @@ -34,6 +33,31 @@ } /** + * Replacement for NodeJS's path.dirname + * @private + * @param {string} url Path to get directory for + */ + static dirname(url) + { + const dir = url + .replace(/\/$/, '') // replace trailing slash + .replace(/\/[^\/]*$/, ''); // remove everything after the last + + // File request is relative, use current directory + if (dir === url) + { + return '.'; + } + // Started with a slash + else if (dir === '') + { + return '/'; + } + + return dir; + } + + /** * Called after a resource is loaded. * @see PIXI.Loader~loaderMiddleware * @param {PIXI.LoaderResource} resource @@ -60,7 +84,7 @@ return; } - let xmlUrl = !resource.isDataUrl ? path.dirname(resource.url) : ''; + let xmlUrl = !resource.isDataUrl ? BitmapFontLoader.dirname(resource.url) : ''; if (resource.isDataUrl) { diff --git a/packages/text-bitmap/test/BitmapFontLoader.js b/packages/text-bitmap/test/BitmapFontLoader.js index 7a64297..f0a6db5 100644 --- a/packages/text-bitmap/test/BitmapFontLoader.js +++ b/packages/text-bitmap/test/BitmapFontLoader.js @@ -84,6 +84,17 @@ expect(BitmapFontLoader.use).to.be.a('function'); }); + it('should process dirname correctly', function () + { + const { dirname } = BitmapFontLoader; + + expect(dirname('file.fnt')).to.equal('.'); + expect(dirname('/file.fnt')).to.equal('/'); + expect(dirname('foo/bar/file.fnt')).to.equal('foo/bar'); + expect(dirname('/foo/bar/file.fnt')).to.equal('/foo/bar'); + expect(dirname('../file.fnt')).to.equal('..'); + }); + it('should do nothing if the resource is not XML', function () { const spy = sinon.spy(); diff --git a/packages/utils/package.json b/packages/utils/package.json index e3e8e1b..bbbeab9 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -29,9 +29,10 @@ "@pixi/settings": "^5.0.0-alpha", "eventemitter3": "^2.0.0", "ismobilejs": "^0.4.0", - "remove-array-items": "^1.0.0" + "remove-array-items": "^1.0.0", + "url": "^0.11.0" }, "devDependencies": { "floss": "^2.1.3" } -} \ No newline at end of file +} diff --git a/rollup.config.js b/rollup.config.js index 8809677..6d4bba5 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -9,7 +9,6 @@ import { minify } from 'uglify-es'; import minimist from 'minimist'; import commonjs from 'rollup-plugin-commonjs'; -import builtins from 'rollup-plugin-node-builtins'; import replace from 'rollup-plugin-replace'; // Support --scope and --ignore globs @@ -35,9 +34,8 @@ sourcemaps(), resolve({ browser: true, - preferBuiltins: true, + preferBuiltins: false, }), - builtins(), commonjs({ namedExports: { 'resource-loader': ['Resource'],