From 1eef74db3454300d65b315d5f4aac9122b97392c Mon Sep 17 00:00:00 2001 From: Krati Ahuja Date: Fri, 9 Jun 2017 18:16:19 -0700 Subject: [PATCH] Prepare for FastBoot 1.0 --- index.js | 37 ++++++++++----------- package.json | 1 + yarn.lock | 94 +++++++++++++++++++++++----------------------------- 3 files changed, 59 insertions(+), 73 deletions(-) diff --git a/index.js b/index.js index d6a82c5ec..b740d1328 100644 --- a/index.js +++ b/index.js @@ -8,6 +8,7 @@ var autoprefixer = require('broccoli-autoprefixer'); var mergeTrees = require('broccoli-merge-trees'); var Funnel = require('broccoli-funnel'); var AngularScssFilter = require('./lib/angular-scss-filter'); +var fastbootTransform = require('fastboot-transform'); module.exports = { name: 'ember-paper', @@ -30,11 +31,9 @@ module.exports = { } while (current.parent.parent && (current = current.parent)); } - if (!process.env.EMBER_CLI_FASTBOOT) { - app.import('vendor/hammerjs/hammer.js'); - app.import('vendor/matchmedia-polyfill/matchMedia.js'); - app.import('vendor/propagating-hammerjs/propagating.js'); - } + app.import('vendor/hammerjs/hammer.js'); + app.import('vendor/matchmedia-polyfill/matchMedia.js'); + app.import('vendor/propagating-hammerjs/propagating.js'); }, config(env, baseConfig) { @@ -64,21 +63,19 @@ module.exports = { treeForVendor: function(tree) { var trees = []; - if (!process.env.EMBER_CLI_FASTBOOT) { - var hammerJs = new Funnel(this.pathBase('hammerjs'), { - files: [ 'hammer.js' ], - destDir: 'hammerjs' - }); - var matchMediaPolyfill = new Funnel(this.pathBase('matchmedia-polyfill'), { - files: [ 'matchMedia.js' ], - destDir: 'matchmedia-polyfill' - }); - var propagatingHammerJs = new Funnel(this.pathBase('propagating-hammerjs'), { - files: [ 'propagating.js' ], - destDir: 'propagating-hammerjs' - }); - trees = trees.concat([hammerJs, matchMediaPolyfill, propagatingHammerJs]); - } + var hammerJs = fastbootTransform(new Funnel(this.pathBase('hammerjs'), { + files: [ 'hammer.js' ], + destDir: 'hammerjs' + })); + var matchMediaPolyfill = fastbootTransform(new Funnel(this.pathBase('matchmedia-polyfill'), { + files: [ 'matchMedia.js' ], + destDir: 'matchmedia-polyfill' + })); + var propagatingHammerJs = fastbootTransform(new Funnel(this.pathBase('propagating-hammerjs'), { + files: [ 'propagating.js' ], + destDir: 'propagating-hammerjs' + })); + trees = trees.concat([hammerJs, matchMediaPolyfill, propagatingHammerJs]); if (tree) { trees.push(tree); diff --git a/package.json b/package.json index 38274f0eb..aa7faa5ae 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "ember-css-transitions": "0.1.10", "ember-power-select": "1.2.0", "ember-wormhole": "0.5.1", + "fastboot-transform": "^0.1.0", "hammerjs": "^2.0.8", "matchmedia-polyfill": "^0.3.0", "propagating-hammerjs": "^1.4.6", diff --git a/yarn.lock b/yarn.lock index a1c929011..f7fc4cbd9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -593,7 +593,7 @@ babel-plugin-dead-code-elimination@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz#5f7c451274dcd7cccdbfbb3e0b85dd28121f0f65" -babel-plugin-debug-macros@^0.1.1, babel-plugin-debug-macros@^0.1.6, babel-plugin-debug-macros@^0.1.7: +babel-plugin-debug-macros@^0.1.1, babel-plugin-debug-macros@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.1.7.tgz#69f5a3dc7d72f781354f18c611a3b007bb223511" dependencies: @@ -918,40 +918,6 @@ babel-preset-env@1.3.3: browserslist "^1.4.0" invariant "^2.2.2" -babel-preset-env@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a" - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^1.4.0" - invariant "^2.2.2" - babel-register@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f" @@ -1273,6 +1239,18 @@ broccoli-config-replace@^1.1.2: debug "^2.2.0" fs-extra "^0.24.0" +broccoli-debug@^0.6.1: + version "0.6.2" + resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.2.tgz#4c6e89459fc3de7d5d4fc7b77e57f46019f44db1" + dependencies: + broccoli-plugin "^1.2.1" + fs-tree-diff "^0.5.2" + heimdalljs "^0.2.1" + heimdalljs-logger "^0.1.7" + minimatch "^3.0.3" + symlink-or-copy "^1.1.8" + tree-sync "^1.2.2" + broccoli-file-creator@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-1.1.1.tgz#1b35b67d215abdfadd8d49eeb69493c39e6c3450" @@ -1477,6 +1455,25 @@ broccoli-stew@^1.2.0, broccoli-stew@^1.3.3, broccoli-stew@^1.4.2: symlink-or-copy "^1.1.8" walk-sync "^0.3.0" +broccoli-stew@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-1.5.0.tgz#d7af8c18511dce510e49d308a62e5977f461883c" + dependencies: + broccoli-debug "^0.6.1" + broccoli-funnel "^1.0.1" + broccoli-merge-trees "^1.0.0" + broccoli-persistent-filter "^1.1.6" + broccoli-plugin "^1.3.0" + chalk "^1.1.3" + debug "^2.4.0" + ensure-posix-path "^1.0.1" + fs-extra "^2.0.0" + minimatch "^3.0.2" + resolve "^1.1.6" + rsvp "^3.0.16" + symlink-or-copy "^1.1.8" + walk-sync "^0.3.0" + broccoli-uglify-sourcemap@^1.0.0: version "1.5.2" resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.2.tgz#04f84ab0db539031fa868ccfa563c9932d50cedb" @@ -2278,22 +2275,7 @@ ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-c ember-cli-version-checker "^1.0.2" resolve "^1.1.2" -ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.1.0.tgz#d9c83a7d0c67cc8a3ccb9bd082971c3593e54fad" - dependencies: - amd-name-resolver "0.0.6" - babel-plugin-debug-macros "^0.1.6" - babel-plugin-transform-es2015-modules-amd "^6.24.0" - babel-polyfill "^6.16.0" - babel-preset-env "^1.2.0" - broccoli-babel-transpiler "^6.0.0" - broccoli-funnel "^1.0.0" - broccoli-source "^1.1.0" - clone "^2.0.0" - ember-cli-version-checker "^1.2.0" - -ember-cli-babel@^6.3.0: +ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.3.0.tgz#ecb9533bc924b73594fe7bd96a99b4b2bb71c4fb" dependencies: @@ -3372,6 +3354,12 @@ fastboot-filter-initializers@0.0.2: dependencies: broccoli-funnel "^1.0.1" +fastboot-transform@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.0.tgz#c00c3c4f376b4e788278cec5cb8d35488e083c07" + dependencies: + broccoli-stew "^1.5.0" + fastboot@^1.0.0-rc.3: version "1.0.0-rc.6" resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.0.0-rc.6.tgz#09af88b41d1b31fda96be425c857e34b2323115b" @@ -4842,7 +4830,7 @@ minimatch@0.3: lru-cache "2" sigmund "~1.0.0" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@~3.0.2: +"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@~3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" dependencies: @@ -6420,7 +6408,7 @@ tough-cookie@~2.3.0: dependencies: punycode "^1.4.1" -tree-sync@^1.2.1: +tree-sync@^1.2.1, tree-sync@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.2.2.tgz#2cf76b8589f59ffedb58db5a3ac7cb013d0158b7" dependencies: