Skip to content

Commit def394f

Browse files
author
Aleksey Filatev
committed
Align NPM package structure
1 parent 34f5100 commit def394f

24 files changed

+258
-144
lines changed

dist/index.html

-9
This file was deleted.

package-lock.json

+201-71
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
"name": "@agxmeister/asteroids",
3-
"version": "1.0.2",
3+
"version": "1.0.9",
44
"description": "A clone of the popular game Asteroids released in November 1979 by Atari, Inc.",
5-
"dependencies": {
6-
"webpack": "^5.16.0",
7-
"webpack-cli": "^4.4.0"
8-
},
95
"author": {
106
"name": "Aleksey Filatev",
117
"email": "[email protected]"
128
},
139
"license": "MIT",
14-
"repository": "https://github.com/agxmeister/asteroids.git"
10+
"main": "src/index.js",
11+
"repository": "https://github.com/agxmeister/asteroids.git",
12+
"devDependencies": {
13+
"webpack": "^5.3.2",
14+
"webpack-cli": "^4.1.0"
15+
}
1516
}

src/Application.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import {BlockCollection} from "./BlockCollection";
1+
import BlockCollection from "./BlockCollection";
22
import {BigAsteroidFactory, MediumAsteroidFactory, SmallAsteroidFactory} from "./factory/AsteroidFactory";
3-
import {FlashFactory} from "./factory/FlashFactory";
4-
import {BulletFactory} from "./factory/BulletFactory";
5-
import {ShipFactory} from "./factory/ShipFactory";
6-
import {ScoreLabel} from "./block/ScoreLabel";
7-
import {Pipeline} from "./Pipeline";
8-
import {CollisionProcessor} from "./processor/CollisionProcessor";
9-
import {AnimationProcessor} from "./processor/AnimationProcessor";
10-
import {GameProcessor} from "./processor/GameProcessor";
11-
import {GarbageProcessor} from "./processor/GarbageProcessor";
3+
import FlashFactory from "./factory/FlashFactory";
4+
import BulletFactory from "./factory/BulletFactory";
5+
import ShipFactory from "./factory/ShipFactory";
6+
import ScoreLabel from "./block/ScoreLabel";
7+
import Pipeline from "./Pipeline";
8+
import CollisionProcessor from "./processor/CollisionProcessor";
9+
import AnimationProcessor from "./processor/AnimationProcessor";
10+
import GameProcessor from "./processor/GameProcessor";
11+
import GarbageProcessor from "./processor/GarbageProcessor";
1212

13-
export class Application {
13+
export default class Application {
1414
run(canvas) {
1515
const context = canvas.getContext('2d');
1616

src/BlockCollection.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export class BlockCollection {
1+
export default class BlockCollection {
22
constructor() {
33
this.blocks = [];
44
}

src/Pipeline.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export class Pipeline {
1+
export default class Pipeline {
22
constructor(...processors) {
33
this.processors = processors;
44
}

src/block/Asteroid.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Block} from "./Block";
1+
import Block from "./Block";
22

3-
export class Asteroid extends Block {
3+
export default class Asteroid extends Block {
44
constructor(canvasWidth, canvasHeight, size, asteroidFactory) {
55
const radius = size === 3 ? 20 : size === 2 ? 15 : 10;
66
super(canvasWidth, canvasHeight, radius);

src/block/Block.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export class Block {
1+
export default class Block {
22
constructor(canvasWidth, canvasHeight, radius) {
33
this.canvasWidth = canvasWidth;
44
this.canvasHeight = canvasHeight;

src/block/Bullet.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Block} from "./Block";
1+
import Block from "./Block";
22

3-
export class Bullet extends Block {
3+
export default class Bullet extends Block {
44
constructor(canvasWidth, canvasHeight, flashFactory) {
55
super(canvasWidth, canvasHeight, 2);
66
this.flashFactory = flashFactory;

src/block/Flash.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Block} from "./Block";
1+
import Block from "./Block";
22

3-
export class Flash extends Block {
3+
export default class Flash extends Block {
44
constructor(canvasWidth, canvasHeight) {
55
super(canvasWidth, canvasHeight, 2);
66
}

src/block/ScoreLabel.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Block} from "./Block";
1+
import Block from "./Block";
22

3-
export class ScoreLabel extends Block {
3+
export default class ScoreLabel extends Block {
44
constructor(canvasWidth, canvasHeight) {
55
super(canvasWidth, canvasHeight, 0);
66
this.score = 0;

src/block/Ship.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Block} from "./Block";
1+
import Block from "./Block";
22

3-
export class Ship extends Block {
3+
export default class Ship extends Block {
44
constructor(canvasWidth, canvasHeight, bulletFactory, flashFactory) {
55
super(canvasWidth, canvasHeight, 10);
66
this.bulletFactory = bulletFactory;

src/factory/AsteroidFactory.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {BlockFactory} from "./BlockFactory";
2-
import {Asteroid} from "../block/Asteroid";
1+
import BlockFactory from "./BlockFactory";
2+
import Asteroid from "../block/Asteroid";
33

44
export class AsteroidFactory extends BlockFactory {
55
constructor(canvasWidth, canvasHeight, collection, asteroidFactory) {

src/factory/BlockFactory.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export class BlockFactory {
1+
export default class BlockFactory {
22
constructor(canvasWidth, canvasHeight, collection) {
33
this.canvasWidth = canvasWidth;
44
this.canvasHeight = canvasHeight;

src/factory/BulletFactory.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {BlockFactory} from "./BlockFactory";
2-
import {Bullet} from "../block/Bullet";
1+
import BlockFactory from "./BlockFactory";
2+
import Bullet from "../block/Bullet";
33

4-
export class BulletFactory extends BlockFactory {
4+
export default class BulletFactory extends BlockFactory {
55
constructor(canvasWidth, canvasHeight, collection, flashFactory) {
66
super(canvasWidth, canvasHeight, collection);
77
this.flashFactory = flashFactory;

src/factory/FlashFactory.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {Flash} from "../block/Flash";
2-
import {BlockFactory} from "./BlockFactory";
1+
import Flash from "../block/Flash";
2+
import BlockFactory from "./BlockFactory";
33

4-
export class FlashFactory extends BlockFactory {
4+
export default class FlashFactory extends BlockFactory {
55
doCreate() {
66
return new Flash(this.canvasWidth, this.canvasHeight);
77
}

src/factory/ShipFactory.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {BlockFactory} from "./BlockFactory";
2-
import {Ship} from "../block/Ship";
1+
import BlockFactory from "./BlockFactory";
2+
import Ship from "../block/Ship";
33

4-
export class ShipFactory extends BlockFactory {
4+
export default class ShipFactory extends BlockFactory {
55
constructor(canvasWidth, canvasHeight, collection, bulletFactory, flashFactory) {
66
super(canvasWidth, canvasHeight, collection);
77
this.bulletFactory = bulletFactory;

src/index.js

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
import {Application} from './Application';
1+
import Application from "./Application";
22

3-
function createCanvas() {
4-
const canvas = document.createElement('canvas');
5-
canvas.setAttribute('width', '400');
6-
canvas.setAttribute('height', '400');
7-
return canvas;
3+
export default function init(canvas) {
4+
const application = new Application();
5+
application.run(canvas);
86
}
9-
const canvas = createCanvas();
10-
document.body.appendChild(canvas);
11-
12-
const application = new Application();
13-
application.run(canvas);

src/processor/AnimationProcessor.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Processor} from "./Processor";
1+
import Processor from "./Processor";
22

3-
export class AnimationProcessor extends Processor {
3+
export default class AnimationProcessor extends Processor {
44
constructor(context, ...blockCollection) {
55
super();
66
this.context = context;

src/processor/CollisionProcessor.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Processor} from "./Processor";
1+
import Processor from "./Processor";
22

3-
export class CollisionProcessor extends Processor {
3+
export default class CollisionProcessor extends Processor {
44
constructor(shipCollection, bulletCollection, asteroidCollection) {
55
super();
66
this.shipCollection = shipCollection;

src/processor/GameProcessor.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Processor} from "./Processor";
1+
import Processor from "./Processor";
22

3-
export class GameProcessor extends Processor {
3+
export default class GameProcessor extends Processor {
44
constructor(shipCollection, asteroidCollection, asteroidFactory, scoreLabel) {
55
super();
66
this.shipCollection = shipCollection;

src/processor/GarbageProcessor.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {Processor} from "./Processor";
1+
import Processor from "./Processor";
22

3-
export class GarbageProcessor extends Processor {
3+
export default class GarbageProcessor extends Processor {
44
constructor(...blockCollection) {
55
super();
66
this.blockCollection = blockCollection;

src/processor/Processor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export class Processor {
1+
export default class Processor {
22
run(time) {}
33
}

webpack.config.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ module.exports = {
44
entry: './src/index.js',
55
output: {
66
path: path.resolve(__dirname, 'dist'),
7-
filename: 'bundle.js'
7+
filename: 'asteroids.js'
88
},
9-
mode: "production"
109
};

0 commit comments

Comments
 (0)