Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modules #9310

Merged
merged 5 commits into from
Jul 22, 2016
Merged

Modules #9310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3c6512
convert to ES modules
Rich-Harris Jul 9, 2016
fea0abc
rebuild
Rich-Harris Jul 9, 2016
3b51752
move shaders back into glsl files
Rich-Harris Jul 9, 2016
fafaa01
reinstate polyfills
Rich-Harris Jul 9, 2016
bb402a6
merge dev -> modules
Rich-Harris Jul 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51,311 changes: 25,599 additions & 25,712 deletions build/three.js
View file
Open in desktop

Large diffs are not rendered by default.

1,007 changes: 14 additions & 993 deletions build/three.min.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"test": "test"
},
"scripts": {
"build": "node utils/build/build.js --include common --include extras",
"build-min": "node utils/build/build.js --include common --include extras --minify",
"dev": "chokidar \"./src/**/*.*\" \"./utils/build/includes/*.*\" --initial -c \"npm run build\"",
"build": "rollup -c",
"build-min": "rollup -c && uglifyjs build/three.js -cm > build/three.min.js",
"dev": "rollup -c -w",
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
Expand All @@ -45,6 +45,8 @@
"argparse": "^1.0.3",
"chokidar-cli": "1.2.0",
"jscs": "^1.13.1",
"rollup": "^0.33.1",
"rollup-plugin-string": "^2.0.2",
"uglify-js": "^2.6.0"
}
}
26 changes: 26 additions & 0 deletions rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import * as fs from 'fs';
import string from 'rollup-plugin-string';

var outro = `
Object.defineProperty( exports, 'AudioContext', {
get: function () {
return exports.getAudioContext();
}
});`;

var footer = fs.readFileSync( 'src/Three.Legacy.js', 'utf-8' );

export default {
entry: 'src/Three.js',
dest: 'build/three.js',
moduleName: 'THREE',
format: 'umd',
plugins: [
string({
include: '**/*.glsl'
})
],

outro: outro,
footer: footer
};
Loading