Skip to content

Commit bb3ba5c

Browse files
committed
Fingerprint more stuff to avoid errors in prod
1 parent 88773c6 commit bb3ba5c

7 files changed

Lines changed: 23 additions & 14 deletions

File tree

app/index.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@
3131

3232
<script>
3333
window.assetMap = {
34-
testSupport: "{{rootURL}}assets/test-support.js"
34+
loader: "{{rootURL}}assets/loader.js",
35+
twiddleDeps: "{{rootURL}}assets/twiddle-deps.js",
36+
testem: "{{rootURL}}testem.js",
37+
testSupport: "{{rootURL}}assets/test-support.js",
38+
testSupportCss: "{{rootURL}}assets/test-support.css",
39+
testLoader: "{{rootURL}}assets/test-loader.js"
3540
};
3641
</script>
3742

app/services/ember-cli.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import Babel from 'babel-core';
22
import Path from 'path';
33
import HbsPlugin from '../plugins/hbs-plugin';
44
import blueprints from '../lib/blueprints';
5-
import config from '../config/environment';
65
import Ember from 'ember';
76
import moment from 'moment';
87
import _template from "lodash/string/template";
@@ -307,7 +306,7 @@ export default Ember.Service.extend({
307306

308307
let EmberENV = twiddleJSON.EmberENV || {};
309308
depScriptTags += `<script type="text/javascript">EmberENV = ${JSON.stringify(EmberENV)};</script>`;
310-
depScriptTags += `<script type="text/javascript" src="${config.assetsHost}assets/loader.js?${config.APP.version}"></script>`;
309+
depScriptTags += `<script type="text/javascript" src="${window.assetMap.loader}"></script>`;
311310

312311
Object.keys(deps).forEach(function(depKey) {
313312
let dep = deps[depKey];
@@ -322,18 +321,18 @@ export default Ember.Service.extend({
322321
}
323322
});
324323

325-
depScriptTags += `<script type="text/javascript" src="${config.assetsHost}assets/twiddle-deps.js?${config.APP.version}"></script>`;
324+
depScriptTags += `<script type="text/javascript" src="${window.assetMap.twiddleDeps}"></script>`;
326325

327326
if (testingEnabled(twiddleJSON)) {
328-
const testJSFiles = ['assets/test-loader.js', 'testem.js'];
327+
const testJSFiles = ['testLoader', 'testem'];
329328

330329
testJSFiles.forEach(jsFile => {
331-
depScriptTags += `<script type="text/javascript" src="${config.assetsHost}${jsFile}?${config.APP.version}"></script>`;
330+
depScriptTags += `<script type="text/javascript" src="${window.assetMap[jsFile]}"></script>`;
332331
});
333332

334333
depScriptTags += `<script type="text/javascript" src="${window.assetMap.testSupport}"></script>`;
335334

336-
depCssLinkTags += `<link rel="stylesheet" type="text/css" href="${config.assetsHost}assets/test-support.css?${config.APP.version}">`;
335+
depCssLinkTags += `<link rel="stylesheet" type="text/css" href="${window.assetMap.testSupportCss}">`;
337336

338337
testStuff += `
339338
<div id="qunit"></div>

blueprints/twiddle.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.12.0",
2+
"version": "0.12.1",
33
"EmberENV": {
44
"FEATURES": {}
55
},

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-twiddle",
3-
"version": "0.12.0",
3+
"version": "0.12.1",
44
"dependencies": {
55
"ember": "~2.10.2",
66
"ember-cli-shims": "0.1.3",

ember-cli-build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = function(defaults) {
2828
enabled: isProductionLikeBuild,
2929
prepend: prepend,
3030
extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg', 'eot', 'ttf', 'woff', 'woff2', 'ico'],
31-
exclude: ['test-loader', 'test-support.css', 'testem']
31+
exclude: []
3232
},
3333
codemirror: {
3434
modes: ['xml', 'javascript', 'handlebars', 'htmlmixed', 'css'],
@@ -156,7 +156,7 @@ module.exports = function(defaults) {
156156
outputFile: '/assets/twiddle-deps.js'
157157
});
158158

159-
return mergeTrees([app.toTree(), twiddleVendorTree, loaderTree, testLoaderTree]);
159+
return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree]));
160160
};
161161

162162
// This copies code out of ember-cli's blueprints into

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-twiddle",
3-
"version": "0.12.0",
3+
"version": "0.12.1",
44
"description": "https://ember-twiddle.com",
55
"private": true,
66
"directories": {
@@ -14,7 +14,7 @@
1414
},
1515
"repository": "https://github.com/ember-cli/ember-twiddle",
1616
"engines": {
17-
"node": ">= 0.12.0"
17+
"node": ">= 4"
1818
},
1919
"author": "Ember Twiddle Contributors",
2020
"license": "MIT",

tests/index.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@
3232

3333
<script>
3434
window.assetMap = {
35-
testSupport: "{{rootURL}}assets/test-support.js"
35+
loader: "{{rootURL}}assets/loader.js",
36+
twiddleDeps: "{{rootURL}}assets/twiddle-deps.js",
37+
testem: "{{rootURL}}testem.js",
38+
testSupport: "{{rootURL}}assets/test-support.js",
39+
testSupportCss: "{{rootURL}}assets/test-support.css",
40+
testLoader: "{{rootURL}}assets/test-loader.js"
3641
};
3742
</script>
3843

0 commit comments

Comments
 (0)