Skip to content

Commit 8e662d0

Browse files
committed
Use import/export instead of require()/module.exports
1 parent b700ca6 commit 8e662d0

File tree

226 files changed

+1030
-1158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+1030
-1158
lines changed

.eslintrc.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"ecmaVersion": 12
55
},
66
"rules": {
7+
/* To work towards no-build. */
8+
"import/extensions": ["warn", "always", { "js": "always" }],
9+
710
/* These rules are incompatible with ES5. */
811
"no-var": "off",
912
"object-shorthand": "off",
@@ -36,8 +39,14 @@
3639
The exception is that ES6 classes are used sparingly - see exceptions below. */
3740
"files": ["./src/**/*.js"],
3841
"parserOptions": {
39-
"sourceType": "script",
40-
"ecmaVersion": 5
42+
"sourceType": "module",
43+
"ecmaVersion": 6
44+
}
45+
},
46+
{
47+
"files": ["./src/utils/index.js"],
48+
"parserOptions": {
49+
"ecmaVersion": 11
4150
}
4251
},
4352
{

src/components/anchored.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global THREE, XRRigidTransform, localStorage */
2-
var registerComponent = require('../core/component').registerComponent;
3-
var utils = require('../utils/');
2+
import { registerComponent } from '../core/component.js';
3+
import * as utils from '../utils/index.js';
44
var warn = utils.debug('components:anchored:warn');
55

66
/**
@@ -9,7 +9,7 @@ var warn = utils.debug('components:anchored:warn');
99
* Once anchored the entity remains to a fixed position in real-world space.
1010
* If the anchor is persistent, the anchor positioned remains across sessions or until the browser data is cleared.
1111
*/
12-
module.exports.Component = registerComponent('anchored', {
12+
export var Component = registerComponent('anchored', {
1313
schema: {
1414
persistent: {default: false}
1515
},

src/components/animation.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
var anime = require('super-animejs').default;
2-
var components = require('../core/component').components;
3-
var registerComponent = require('../core/component').registerComponent;
4-
var THREE = require('../lib/three');
5-
var utils = require('../utils');
1+
import THREE from '../lib/three.js';
2+
import anime from 'super-animejs';
3+
import { registerComponent, components } from '../core/component.js';
4+
import * as utils from '../utils/index.js';
65

76
var colorHelperFrom = new THREE.Color();
87
var colorHelperTo = new THREE.Color();
@@ -39,7 +38,7 @@ var STRING_OBJECT3D = 'object3D';
3938
* @member {object} animation - anime.js instance.
4039
* @member {boolean} animationIsPlaying - Control if animation is playing.
4140
*/
42-
module.exports.Component = registerComponent('animation', {
41+
export var Component = registerComponent('animation', {
4342
schema: {
4443
autoplay: {default: true},
4544
delay: {default: 0},

src/components/camera.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
var registerComponent = require('../core/component').registerComponent;
2-
var THREE = require('../lib/three');
1+
import THREE from '../lib/three.js';
2+
import { registerComponent } from '../core/component.js';
33

44
/**
55
* Camera component.
66
* Pairs along with camera system to handle tracking the active camera.
77
*/
8-
module.exports.Component = registerComponent('camera', {
8+
export var Component = registerComponent('camera', {
99
schema: {
1010
active: {default: true},
1111
far: {default: 10000},

src/components/cursor.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global THREE, MouseEvent, TouchEvent */
2-
var registerComponent = require('../core/component').registerComponent;
3-
var utils = require('../utils/');
2+
import { registerComponent } from '../core/component.js';
3+
import * as utils from '../utils/index.js';
44

55
var EVENTS = {
66
CLICK: 'click',
@@ -41,7 +41,7 @@ var CANVAS_HOVER_CLASS = 'a-mouse-cursor-hover';
4141
* @member {Element} intersectedEl - Currently-intersected entity. Used to keep track to
4242
* emit events when unintersecting.
4343
*/
44-
module.exports.Component = registerComponent('cursor', {
44+
export var Component = registerComponent('cursor', {
4545
dependencies: ['raycaster'],
4646

4747
schema: {

src/components/generic-tracked-controller-controls.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
var registerComponent = require('../core/component').registerComponent;
2-
3-
var trackedControlsUtils = require('../utils/tracked-controls');
4-
var checkControllerPresentAndSetup = trackedControlsUtils.checkControllerPresentAndSetup;
5-
var emitIfAxesChanged = trackedControlsUtils.emitIfAxesChanged;
6-
var onButtonEvent = trackedControlsUtils.onButtonEvent;
1+
import { registerComponent } from '../core/component.js';
2+
import { checkControllerPresentAndSetup, emitIfAxesChanged, onButtonEvent } from '../utils/tracked-controls.js';
73

84
var GAMEPAD_ID_PREFIX = 'generic';
95

@@ -33,7 +29,7 @@ var INPUT_MAPPING = {
3329
* controller buttons: trackpad, trigger
3430
* Load a controller model and highlight the pressed buttons.
3531
*/
36-
module.exports.Component = registerComponent('generic-tracked-controller-controls', {
32+
export var Component = registerComponent('generic-tracked-controller-controls', {
3733
schema: {
3834
hand: {default: ''}, // This informs the degenerate arm model.
3935
defaultModel: {default: true},

src/components/geometry.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
var geometries = require('../core/geometry').geometries;
2-
var geometryNames = require('../core/geometry').geometryNames;
3-
var registerComponent = require('../core/component').registerComponent;
4-
var THREE = require('../lib/three');
1+
import THREE from '../lib/three.js';
2+
import { geometries, geometryNames } from '../core/geometry.js';
3+
import { registerComponent } from '../core/component.js';
54

65
var dummyGeometry = new THREE.BufferGeometry();
76

87
/**
98
* Geometry component. Combined with material component to make a mesh in 3D object.
109
* Extended with registered geometries.
1110
*/
12-
module.exports.Component = registerComponent('geometry', {
11+
export var Component = registerComponent('geometry', {
1312
schema: {
1413
buffer: {default: true},
1514
primitive: {default: 'box', oneOf: geometryNames, schemaChange: true},

src/components/gltf-model.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
var registerComponent = require('../core/component').registerComponent;
2-
var THREE = require('../lib/three');
3-
var utils = require('../utils/');
1+
import THREE from '../lib/three.js';
2+
import { registerComponent } from '../core/component.js';
3+
import * as utils from '../utils/index.js';
44
var warn = utils.debug('components:gltf-model:warn');
55

66
/**
77
* glTF model loader.
88
*/
9-
module.exports.Component = registerComponent('gltf-model', {
9+
export var Component = registerComponent('gltf-model', {
1010
schema: {type: 'model'},
1111

1212
init: function () {

src/components/grabbable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var registerComponent = require('../core/component').registerComponent;
1+
import { registerComponent } from '../core/component.js';
22

33
registerComponent('grabbable', {
44
init: function () {

src/components/hand-controls.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* global THREE */
2-
var registerComponent = require('../core/component').registerComponent;
2+
import { registerComponent } from '../core/component.js';
3+
import { AFRAME_CDN_ROOT } from '../constants/index.js';
34

4-
var AFRAME_CDN_ROOT = require('../constants').AFRAME_CDN_ROOT;
55
// Found at https://github.com/aframevr/assets.
66
var MODEL_URLS = {
77
toonLeft: AFRAME_CDN_ROOT + 'controllers/hands/leftHand.glb',
@@ -48,7 +48,7 @@ EVENTS[ANIMATIONS.point] = 'pointing';
4848
*
4949
* @property {string} Hand mapping (`left`, `right`).
5050
*/
51-
module.exports.Component = registerComponent('hand-controls', {
51+
export var Component = registerComponent('hand-controls', {
5252
schema: {
5353
color: {default: 'white', type: 'color'},
5454
hand: { default: 'left' },

0 commit comments

Comments
 (0)