Skip to content

Commit

Permalink
Change Three and Babylon Imports to be a Versioned CDN
Browse files Browse the repository at this point in the history 
* Change all of the importing of both Babylon and Three packages in our examples and integration tests to point to a versioned CDN, rather than live.
* Update Package.json to point to the same version specified in the CDN
  • Loading branch information
@brhook-aws
brhook-aws authored Feb 10, 2022
2 parents 17dd65d + 0668b0c commit 1f33890
Show file tree
Hide file tree
Showing 11 changed files with 11,595 additions and 393 deletions.
2 changes: 1 addition & 1 deletion dist/host.babylon.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/host.core.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/host.three.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/babylon.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@
src="https://sdk.amazonaws.com/js/aws-sdk-2.645.0.min.js"
></script>
<!--Babylon.js dependencies-->
<script src="https://cdn.babylonjs.com/babylon.js"></script>
<script src="https://cdn.babylonjs.com/loaders/babylonjs.loaders.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/babylonjs@4.2.1/babylon.js"></script>
<script src="https://cdn.jsdelivr.net/npm/babylonjs-loaders@4.2.1/babylonjs.loaders.min.js"></script>
<!--Host build file-->
<script type="text/javascript" src="../dist/host.babylon.js"></script>
</head>
Expand Down
6 changes: 3 additions & 3 deletions examples/three.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
src="https://sdk.amazonaws.com/js/aws-sdk-2.645.0.min.js"
></script>
<!--Three.js dependencies-->
<script src="https://threejs.org/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<!--Host build file-->
<script type="text/javascript" src="../dist/host.three.js"></script>
</head>
Expand Down Expand Up @@ -177,8 +177,8 @@

<!--Create the Three.js scene-->
<script type="module">
import {OrbitControls} from 'https://threejs.org/examples/jsm/controls/OrbitControls.js';
import {GLTFLoader} from 'https://threejs.org/examples/jsm/loaders/GLTFLoader.js';
import { OrbitControls } from 'https://cdn.jsdelivr.net/npm/[email protected]/examples/jsm/controls/OrbitControls.js'
import { GLTFLoader } from 'https://cdn.jsdelivr.net/npm/[email protected]/examples/jsm/loaders/GLTFLoader.js'

const renderFn = [];
const speakers = new Map([
Expand Down
11,942 changes: 11,572 additions & 370 deletions package-lock.json
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"babel-eslint": "^10.1.0",
"babel-loader": "^8.0.6",
"babel-polyfill": "^6.26.0",
"babylonjs": "^4.1.0",
"babylonjs": "=4.2.1",
"eslint": "^8.3.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.10.0",
Expand All @@ -46,7 +46,7 @@
"karma-webpack": "^4.0.2",
"prettier": "^1.19.1",
"regenerator-runtime": "^0.13.5",
"three": "^0.137.0",
"three": "=0.127.0",
"webpack": "^4.41.6",
"webpack-cli": "^4.7.0",
"webpack-dev-server": "^4.7.3",
Expand Down
6 changes: 3 additions & 3 deletions test/integration_test/Babylon.js/babylon.animation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
</head>

<body>
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.min.js"></script>
<script src="https://threejs.org/examples/js/libs/dat.gui.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/babylonjs@4.2.1/babylon.js"></script>
<script src="https://cdn.jsdelivr.net/npm/babylonjs-loaders@4.2.1/babylonjs.loaders.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/examples/js/libs/dat.gui.min.js"></script>
<script type="text/javascript" src="../../../dist/host.babylon.js"></script>
<script>
async function main() {
Expand Down
4 changes: 2 additions & 2 deletions test/integration_test/Babylon.js/babylon.texttospeech.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
type="text/javascript"
src="https://sdk.amazonaws.com/js/aws-sdk-2.645.0.min.js"
></script>
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/babylonjs@4.2.1/babylon.js"></script>
<script src="https://cdn.jsdelivr.net/npm/babylonjs-loaders@4.2.1/babylonjs.loaders.min.js"></script>
<script type="text/javascript" src="../../../dist/host.babylon.js"></script>
<script>
async function main() {
Expand Down
10 changes: 5 additions & 5 deletions test/integration_test/three.js/three.animation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@

<body>
<div id="container"></div>
<script src="https://threejs.org/build/three.min.js"></script>
<script src="https://threejs.org/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://threejs.org/examples/js/controls/OrbitControls.js"></script>
<script src="https://threejs.org/examples/js/libs/dat.gui.min.js"></script>
<script src="https://threejs.org/examples/js/libs/stats.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/examples/js/controls/OrbitControls.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/examples/js/libs/dat.gui.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/examples/js/libs/stats.min.js"></script>
<script type="text/javascript" src="../../../dist/host.three.js"></script>
<script>
async function main() {
Expand Down
6 changes: 3 additions & 3 deletions test/integration_test/three.js/three.texttospeech.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
type="text/javascript"
src="https://sdk.amazonaws.com/js/aws-sdk-2.645.0.min.js"
></script>
<script src="https://threejs.org/build/three.min.js"></script>
<script src="https://threejs.org/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://threejs.org/examples/js/controls/OrbitControls.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/three.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/examples/js/controls/OrbitControls.js"></script>
<script type="text/javascript" src="../../../dist/host.three.js"></script>
<script>
async function main() {
Expand Down

0 comments on commit 1f33890

Please sign in to comment.