From 6021f72dac00f4cb0c9812063101f16beb96014e Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Thu, 1 Nov 2018 14:19:22 -0700 Subject: [PATCH 1/2] Speed up builds by cutting corners given config and env --- ui/config/environment.js | 5 ++++- ui/ember-cli-build.js | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ui/config/environment.js b/ui/config/environment.js index 2c8f0c688..b2dc57f61 100644 --- a/ui/config/environment.js +++ b/ui/config/environment.js @@ -1,5 +1,7 @@ /* eslint-env node */ +const USE_MIRAGE = true; + module.exports = function(environment) { var ENV = { modulePrefix: 'nomad-ui', @@ -35,7 +37,8 @@ module.exports = function(environment) { // ENV.APP.LOG_VIEW_LOOKUPS = true; ENV['ember-cli-mirage'] = { - // enabled: false, + enabled: USE_MIRAGE, + excludeFilesFromBuild: !USE_MIRAGE, }; } diff --git a/ui/ember-cli-build.js b/ui/ember-cli-build.js index 87dfc3f0f..931e201f7 100644 --- a/ui/ember-cli-build.js +++ b/ui/ember-cli-build.js @@ -3,6 +3,7 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app'); const environment = EmberApp.env(); const isProd = environment === 'production'; +const isTest = environment === 'test'; module.exports = function(defaults) { var app = new EmberApp(defaults, { @@ -25,6 +26,14 @@ module.exports = function(defaults) { babel: { plugins: ['transform-object-rest-spread'], }, + 'ember-cli-babel': { + includePolyfill: isProd, + }, + hinting: isTest, + tests: isTest, + sourcemaps: { + enabled: false, + }, }); // Use `app.import` to add additional libraries to the generated From 68ef1660642ebaa3c31718dcf1958a3773f4956a Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Thu, 1 Nov 2018 14:37:39 -0700 Subject: [PATCH 2/2] Remove unused bourbon dependency --- ui/package.json | 1 - ui/yarn.lock | 14 +------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/ui/package.json b/ui/package.json index e47c7febf..a37ab166e 100644 --- a/ui/package.json +++ b/ui/package.json @@ -40,7 +40,6 @@ "ember-auto-import": "^1.0.1", "ember-cli": "~2.18.2", "ember-cli-babel": "^6.0.0", - "ember-cli-bourbon": "2.0.0-beta.1", "ember-cli-dependency-checker": "^2.1.0", "ember-cli-eslint": "^4.2.3", "ember-cli-funnel": "^0.6.0", diff --git a/ui/yarn.lock b/ui/yarn.lock index d29c333a7..425e02f5f 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -1298,10 +1298,6 @@ boom@2.x.x: dependencies: hoek "2.x.x" -bourbon@^4.3.3: - version "4.3.4" - resolved "https://registry.yarnpkg.com/bourbon/-/bourbon-4.3.4.tgz#4da380029e92c0c8f9764c779451a134b11e7cc3" - bower-config@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.0.tgz#16c38c1135f8071c19f25938d61b0d8cbf18d3f1" @@ -2990,7 +2986,7 @@ ember-basic-dropdown@^0.34.0: ember-native-dom-helpers "^0.5.4" ember-wormhole "^0.5.2" -ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7: +ember-cli-babel@^5.1.6: version "5.2.4" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.4.tgz#5ce4f46b08ed6f6d21e878619fb689719d6e8e13" dependencies: @@ -3018,14 +3014,6 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-be ember-cli-version-checker "^2.1.0" semver "^5.4.1" -ember-cli-bourbon@2.0.0-beta.1: - version "2.0.0-beta.1" - resolved "https://registry.yarnpkg.com/ember-cli-bourbon/-/ember-cli-bourbon-2.0.0-beta.1.tgz#9d9b07bd4c7da7b2806ea18fc5cb9b37dd15ad25" - dependencies: - bourbon "^4.3.3" - broccoli-funnel "^1.0.1" - ember-cli-babel "^5.1.7" - ember-cli-broccoli-sane-watcher@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-2.0.4.tgz#f43f42f75b7509c212fb926cd9aea86ae19264c6"