Skip to content

Commit

Permalink
Fingerprint more stuff to avoid errors in prod
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaurav0 committed Mar 21, 2017
1 parent 88773c6 commit bb3ba5c
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 14 deletions.
7 changes: 6 additions & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@

<script>
window.assetMap = {
testSupport: "{{rootURL}}assets/test-support.js"
loader: "{{rootURL}}assets/loader.js",
twiddleDeps: "{{rootURL}}assets/twiddle-deps.js",
testem: "{{rootURL}}testem.js",
testSupport: "{{rootURL}}assets/test-support.js",
testSupportCss: "{{rootURL}}assets/test-support.css",
testLoader: "{{rootURL}}assets/test-loader.js"
};
</script>

Expand Down
11 changes: 5 additions & 6 deletions app/services/ember-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Babel from 'babel-core';
import Path from 'path';
import HbsPlugin from '../plugins/hbs-plugin';
import blueprints from '../lib/blueprints';
import config from '../config/environment';
import Ember from 'ember';
import moment from 'moment';
import _template from "lodash/string/template";
Expand Down Expand Up @@ -307,7 +306,7 @@ export default Ember.Service.extend({

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

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

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

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

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

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

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

testStuff += `
<div id="qunit"></div>
Expand Down
2 changes: 1 addition & 1 deletion blueprints/twiddle.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.12.0",
"version": "0.12.1",
"EmberENV": {
"FEATURES": {}
},
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-twiddle",
"version": "0.12.0",
"version": "0.12.1",
"dependencies": {
"ember": "~2.10.2",
"ember-cli-shims": "0.1.3",
Expand Down
4 changes: 2 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = function(defaults) {
enabled: isProductionLikeBuild,
prepend: prepend,
extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg', 'eot', 'ttf', 'woff', 'woff2', 'ico'],
exclude: ['test-loader', 'test-support.css', 'testem']
exclude: []
},
codemirror: {
modes: ['xml', 'javascript', 'handlebars', 'htmlmixed', 'css'],
Expand Down Expand Up @@ -156,7 +156,7 @@ module.exports = function(defaults) {
outputFile: '/assets/twiddle-deps.js'
});

return mergeTrees([app.toTree(), twiddleVendorTree, loaderTree, testLoaderTree]);
return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree]));
};

// This copies code out of ember-cli's blueprints into
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-twiddle",
"version": "0.12.0",
"version": "0.12.1",
"description": "https://ember-twiddle.com",
"private": true,
"directories": {
Expand All @@ -14,7 +14,7 @@
},
"repository": "https://github.com/ember-cli/ember-twiddle",
"engines": {
"node": ">= 0.12.0"
"node": ">= 4"
},
"author": "Ember Twiddle Contributors",
"license": "MIT",
Expand Down
7 changes: 6 additions & 1 deletion tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@

<script>
window.assetMap = {
testSupport: "{{rootURL}}assets/test-support.js"
loader: "{{rootURL}}assets/loader.js",
twiddleDeps: "{{rootURL}}assets/twiddle-deps.js",
testem: "{{rootURL}}testem.js",
testSupport: "{{rootURL}}assets/test-support.js",
testSupportCss: "{{rootURL}}assets/test-support.css",
testLoader: "{{rootURL}}assets/test-loader.js"
};
</script>

Expand Down

0 comments on commit bb3ba5c

Please sign in to comment.