From f0bb2993060e42b7569e9cd7042f1807fc93e273 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 24 Oct 2023 17:25:46 +0200 Subject: [PATCH] test(ember): Test that prod builds & source maps work --- packages/ember/ember-cli-build.js | 9 ++++++ packages/ember/package.json | 4 +-- yarn.lock | 49 +++++++++++++------------------ 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/packages/ember/ember-cli-build.js b/packages/ember/ember-cli-build.js index 366cbe507834..1d3c053ee219 100644 --- a/packages/ember/ember-cli-build.js +++ b/packages/ember/ember-cli-build.js @@ -3,8 +3,17 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function (defaults) { + const environment = process.env.EMBER_ENV || 'development'; + const isProd = environment === 'production'; + const app = new EmberAddon(defaults, { // Add options here + sourcemaps: { + enabled: isProd, + }, + 'ember-cli-terser': { + enabled: isProd, + }, }); /* diff --git a/packages/ember/package.json b/packages/ember/package.json index 3d537ac5cabf..1190e52f7575 100644 --- a/packages/ember/package.json +++ b/packages/ember/package.json @@ -27,7 +27,7 @@ "fix:eslint": "eslint . --format stylish --fix", "fix:prettier": "prettier --write \"{addon,app,tests,config}/**/**.{ts,js}\"", "start": "ember serve", - "test": "ember test", + "test": "ember b --prod && ember test", "test:all": "ember try:each", "prepack": "ember ts:precompile", "postpack": "ember ts:clean" @@ -61,7 +61,7 @@ "ember-cli-inject-live-reload": "~2.1.0", "ember-cli-sri": "~2.1.1", "ember-cli-typescript-blueprints": "~3.0.0", - "ember-cli-uglify": "~3.0.0", + "ember-cli-terser": "~4.0.2", "ember-disable-prototype-extensions": "~1.1.3", "ember-load-initializers": "~2.1.1", "ember-maybe-import-regenerator": "~1.0.0", diff --git a/yarn.lock b/yarn.lock index a3a2ea6673c7..1ee62d9e6a00 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9833,22 +9833,21 @@ broccoli-stew@^3.0.0: symlink-or-copy "^1.2.0" walk-sync "^1.1.3" -broccoli-uglify-sourcemap@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c" - integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g== +broccoli-terser-sourcemap@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/broccoli-terser-sourcemap/-/broccoli-terser-sourcemap-4.1.1.tgz#4c26696e07a822e1fc91fb48c5b6d6c70d5ca9b2" + integrity sha512-8sbpRf0/+XeszBJQM7vph2UNj4Kal0lCI/yubcrBIzb2NvYj5gjTHJABXOdxx5mKNmlCMu2hx2kvOtMpQsxrfg== dependencies: async-promise-queue "^1.0.5" - broccoli-plugin "^1.2.1" - debug "^4.1.0" + broccoli-plugin "^4.0.7" + convert-source-map "^2.0.0" + debug "^4.3.1" lodash.defaultsdeep "^4.6.1" - matcher-collection "^2.0.0" - mkdirp "^0.5.0" - source-map-url "^0.4.0" - symlink-or-copy "^1.0.1" - terser "^4.3.9" - walk-sync "^1.1.3" - workerpool "^5.0.1" + matcher-collection "^2.0.1" + symlink-or-copy "^1.3.1" + terser "^5.7.0" + walk-sync "^2.2.0" + workerpool "^6.1.5" broccoli@^3.5.2: version "3.5.2" @@ -13149,6 +13148,13 @@ ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0: resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1" integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE= +ember-cli-terser@~4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/ember-cli-terser/-/ember-cli-terser-4.0.2.tgz#c436a9e4159f76a615b051cba0584844652b7dcd" + integrity sha512-Ej77K+YhCZImotoi/CU2cfsoZaswoPlGaM5TB3LvjvPDlVPRhxUHO2RsaUVC5lsGeRLRiHCOxVtoJ6GyqexzFA== + dependencies: + broccoli-terser-sourcemap "^4.1.0" + ember-cli-test-info@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz#ed4e960f249e97523cf891e4aed2072ce84577b4" @@ -13259,14 +13265,6 @@ ember-cli-typescript@^5.2.1: stagehand "^1.0.0" walk-sync "^2.2.0" -ember-cli-uglify@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-3.0.0.tgz#8819665b2cc5fe70e3ba9fe7a94645209bc42fd6" - integrity sha512-n3QxdBfAgBdb2Cnso82Kt/nxm3ppIjnYWM8uhOEhF1aYxNXfM7AJrc+yiqTCDUR61Db8aCpHfAMvChz3kyme7g== - dependencies: - broccoli-uglify-sourcemap "^3.1.0" - lodash.defaultsdeep "^4.6.0" - ember-cli-valid-component-name@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-valid-component-name/-/ember-cli-valid-component-name-1.0.0.tgz#71550ce387e0233065f30b30b1510aa2dfbe87ef" @@ -19956,7 +19954,7 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.defaultsdeep@^4.6.0, lodash.defaultsdeep@^4.6.1: +lodash.defaultsdeep@^4.6.1: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== @@ -29173,7 +29171,7 @@ terser@5.3.0: source-map "~0.6.1" source-map-support "~0.5.12" -terser@^4.1.2, terser@^4.3.9: +terser@^4.1.2: version "4.8.1" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== @@ -31498,11 +31496,6 @@ workerpool@^3.1.1: object-assign "4.1.1" rsvp "^4.8.4" -workerpool@^5.0.1: - version "5.0.4" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2" - integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ== - workerpool@^6.1.5, workerpool@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"