From a654cd20e1ad5d65e442d628e5c00cc7c06bc9f9 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sun, 14 Jan 2018 20:46:20 +0800 Subject: [PATCH 1/3] fix import three.js --- src/model.js | 2 +- src/orbit_controls.js | 2 +- src/viewer.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model.js b/src/model.js index 1350cae..012c630 100644 --- a/src/model.js +++ b/src/model.js @@ -1,4 +1,4 @@ -import THREE from "three"; +import * as THREE from "three"; function toFaceVertices(x1, y1, x2, y2, w, h) { return [ diff --git a/src/orbit_controls.js b/src/orbit_controls.js index ec082a6..08f8af2 100644 --- a/src/orbit_controls.js +++ b/src/orbit_controls.js @@ -1,4 +1,4 @@ -import THREE from "three"; +import * as THREE from "three"; class OrbitControls extends THREE.EventDispatcher { /** diff --git a/src/viewer.js b/src/viewer.js index 1af5839..2d6283f 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -1,4 +1,4 @@ -import THREE from "three"; +import * as THREE from "three"; import { PlayerObject } from "./model"; import { OrbitControls } from "./orbit_controls"; import { invokeAnimation } from "./animation"; From 62534ac31703c76fdb22524dedf739cb2c761934 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Mon, 15 Jan 2018 18:46:30 +0800 Subject: [PATCH 2/3] add rollup-plugin-node-resolve --- package-lock.json | 38 ++++++++++++++++++++++++++++++++++++++ package.json | 1 + tools/rollup-util.js | 16 +++++++++++----- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3f0d1e9..844c65d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -852,6 +852,12 @@ "electron-to-chromium": "1.3.30" } }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, "caller-path": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", @@ -2564,6 +2570,12 @@ "is-extglob": "1.0.0" } }, + "is-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", + "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", + "dev": true + }, "is-number": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", @@ -2919,6 +2931,12 @@ "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", "dev": true }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -3153,6 +3171,15 @@ "resolve-from": "1.0.1" } }, + "resolve": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + }, "resolve-from": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", @@ -3193,6 +3220,17 @@ "rollup-pluginutils": "1.5.2" } }, + "rollup-plugin-node-resolve": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.2.tgz", + "integrity": "sha512-ZwmMip/yqw6cmDQJuCQJ1G7gw2z11iGUtQNFYrFZHmqadRHU+OZGC3nOXwXu+UTvcm5lzDspB1EYWrkTgPWybw==", + "dev": true, + "requires": { + "builtin-modules": "1.1.1", + "is-module": "1.0.0", + "resolve": "1.5.0" + } + }, "rollup-plugin-uglify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-plugin-uglify/-/rollup-plugin-uglify-2.0.1.tgz", diff --git a/package.json b/package.json index efec211..62c5518 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "eslint": "^4.14.0", "rollup": "^0.50.0", "rollup-plugin-babel": "^3.0.2", + "rollup-plugin-node-resolve": "^3.0.2", "rollup-plugin-uglify": "^2.0.1", "uglify-es": "^3.1.3" } diff --git a/tools/rollup-util.js b/tools/rollup-util.js index ec9782b..75a8dd2 100644 --- a/tools/rollup-util.js +++ b/tools/rollup-util.js @@ -1,17 +1,23 @@ import uglify from "rollup-plugin-uglify"; import { minify } from "uglify-es"; import babel from "rollup-plugin-babel"; +import resolve from "rollup-plugin-node-resolve"; + let buildType = config => { let options = { input: "src/skinview3d.js", indent: "\t", sourcemap: true, - external: ["three"], - globals: { - three: "THREE" - }, output: [], - plugins: [] + external:[ + "three" + ], + globals: { + "three": "THREE" + }, + plugins: [ + resolve() + ] }; switch (config.format) { From 2324d0490938454e1e48015a6c333e42ad916a80 Mon Sep 17 00:00:00 2001 From: yushijinhun Date: Mon, 15 Jan 2018 19:06:46 +0800 Subject: [PATCH 3/3] update dependencies --- package-lock.json | 56 +++++++++++++++++++++++++++----------------- package.json | 10 ++++---- tools/rollup-util.js | 16 +++++++------ 3 files changed, 49 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 844c65d..ad580cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1050,9 +1050,9 @@ } }, "doctrine": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz", - "integrity": "sha512-y0tm5Pq6ywp3qSTZ1vPgVdAnbDEoeoc5wlOHXoY1c4Wug/a7JvqHIl7BTvwodaHmejWkK/9dSb3sCYfyo/om8A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, "requires": { "esutils": "2.0.2" @@ -1080,9 +1080,9 @@ "dev": true }, "eslint": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz", - "integrity": "sha512-Ul6CSGRjKscEyg0X/EeNs7o2XdnbTEOD1OM8cTjmx85RPcBJQrEhZLevhuJZNAE/vS2iVl5Uhgiqf3h5uLMCJQ==", + "version": "4.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.15.0.tgz", + "integrity": "sha512-zEO/Z1ZUxIQ+MhDVKkVTUYpIPDTEJLXGMrkID+5v1NeQHtCz6FZikWuFRgxE1Q/RV2V4zVl1u3xmpPADHhMZ6A==", "dev": true, "requires": { "ajv": "5.5.2", @@ -1091,7 +1091,7 @@ "concat-stream": "1.6.0", "cross-spawn": "5.1.0", "debug": "3.1.0", - "doctrine": "2.0.2", + "doctrine": "2.1.0", "eslint-scope": "3.7.1", "eslint-visitor-keys": "1.0.0", "espree": "3.5.2", @@ -3206,15 +3206,15 @@ } }, "rollup": { - "version": "0.50.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.50.0.tgz", - "integrity": "sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==", + "version": "0.54.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.54.0.tgz", + "integrity": "sha512-lgW/RpP8e8HdkrgJtFeBwzuWfvj+eo7yWfJ8AXRfi6a3d0DeYxysr4CwvqnTxJbtvcQ19L0L2bLDQkVK1Db4JA==", "dev": true }, "rollup-plugin-babel": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-3.0.2.tgz", - "integrity": "sha512-ALGPBFtwJZcYHsNPM6RGJlEncTzAARPvZOGjNPZgDe5hS5t6sJGjiOWibEFVEz5LQN7S7spvCBILaS4N1Cql2w==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-3.0.3.tgz", + "integrity": "sha512-5kzM/Rr4jQSRPLc2eN5NuD+CI/6AAy7S1O18Ogu4U3nq1Q42VJn0C9EMtqnvxtfwf1XrezOtdA9ro1VZI5B0mA==", "dev": true, "requires": { "rollup-pluginutils": "1.5.2" @@ -3471,9 +3471,9 @@ "dev": true }, "three": { - "version": "0.87.1", - "resolved": "https://registry.npmjs.org/three/-/three-0.87.1.tgz", - "integrity": "sha1-Rmo07cRUNFnO2bnX0na2Uhb+K6g=" + "version": "0.89.0", + "resolved": "https://registry.npmjs.org/three/-/three-0.89.0.tgz", + "integrity": "sha1-RELYGaYWiHG40ss3rRKiQxDBcPU=" }, "through": { "version": "2.3.8", @@ -3518,13 +3518,27 @@ "dev": true }, "uglify-es": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.3.tgz", - "integrity": "sha512-Nuo5gkv/Q6PmLa+Ui2LvK+87YdMAcuXfRIWF0uVfkHVSfpT3Ue0euCSu4t0b8xv4Bt05lmXUT8bLI9OmnyPj8A==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.7.tgz", + "integrity": "sha512-fGMnE6SsDRsCjxm78C+lv7MuXsse/dtF7QuTUT43BYf4jlxPjd+XTnGB8YjaCQJ3sv2LT4zk0mwpp9+QJocU6g==", "dev": true, "requires": { - "commander": "2.11.0", - "source-map": "0.5.7" + "commander": "2.13.0", + "source-map": "0.6.1" + }, + "dependencies": { + "commander": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", + "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "user-home": { diff --git a/package.json b/package.json index 62c5518..8cc803b 100644 --- a/package.json +++ b/package.json @@ -20,17 +20,17 @@ }, "homepage": "https://github.com/to2mbn/skinview3d", "dependencies": { - "three": "^0.87.1" + "three": "^0.89.0" }, "devDependencies": { "babel-cli": "^6.26.0", "babel-plugin-external-helpers": "^6.22.0", "babel-preset-env": "^1.6.1", - "eslint": "^4.14.0", - "rollup": "^0.50.0", - "rollup-plugin-babel": "^3.0.2", + "eslint": "^4.15.0", + "rollup": "^0.54.0", + "rollup-plugin-babel": "^3.0.3", "rollup-plugin-node-resolve": "^3.0.2", "rollup-plugin-uglify": "^2.0.1", - "uglify-es": "^3.1.3" + "uglify-es": "^3.3.7" } } diff --git a/tools/rollup-util.js b/tools/rollup-util.js index 75a8dd2..8118214 100644 --- a/tools/rollup-util.js +++ b/tools/rollup-util.js @@ -6,15 +6,10 @@ import resolve from "rollup-plugin-node-resolve"; let buildType = config => { let options = { input: "src/skinview3d.js", - indent: "\t", - sourcemap: true, output: [], external:[ "three" ], - globals: { - "three": "THREE" - }, plugins: [ resolve() ] @@ -25,14 +20,21 @@ let buildType = config => { options.output.push({ format: "umd", name: "skinview3d", - file: `build/skinview3d${config.postfix}.js` + file: `build/skinview3d${config.postfix}.js`, + indent: "\t", + sourcemap: true, + globals: { + "three": "THREE" + } }); break; case "es": options.output.push({ format: "es", - file: `build/skinview3d${config.postfix}.js` + file: `build/skinview3d${config.postfix}.js`, + indent: "\t", + sourcemap: true, }); break;