Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Switched from uglify to terser

Browse source 
refs https://github.com/TryGhost/Ghost-Admin/pull/1701

- swap `ember-cli-uglify` for `ember-cli-terser` to match ember-cli 3.21.1's generated package.json
- swap `broccoli-uglify-sourcemap` for `broccoli-terser-sourcemap` used manually in our production builds to keep dependencies the same across custom and built-in build artefacts
This commit is contained in:
Kevin Ansfield 2020-09-09 17:22:23 +01:00
parent 27c0ea0635
commit e5b4960170
3 changed files with 17 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ghost/admin/ember-cli-build.js
View file

@ -4,7 +4,7 @@
const EmberApp = require('ember-cli/lib/broccoli/ember-app');
const concat = require('broccoli-concat');
const mergeTrees = require('broccoli-merge-trees');
const Uglify = require('broccoli-uglify-sourcemap');
const Terser = require('broccoli-terser-sourcemap');
const Funnel = require('broccoli-funnel');
const environment = EmberApp.env();
const isProduction = environment === 'production';
@ -50,7 +50,7 @@ const codemirrorAssets = function () {
});
if (isProduction) {
jsTree = new Uglify(jsTree);
jsTree = new Terser(jsTree);
}
let mergedTree = mergeTrees([tree, jsTree]);
@ -88,7 +88,7 @@ const simplemdeAssets = function () {
});
if (isProduction) {
jsTree = new Uglify(jsTree);
jsTree = new Terser(jsTree);
}
let mergedTree = mergeTrees([tree, jsTree]);

4
ghost/admin/package.json
View file

@ -43,7 +43,7 @@
"broccoli-concat": "4.2.4",
"broccoli-funnel": "3.0.3",
"broccoli-merge-trees": "4.2.0",
"broccoli-uglify-sourcemap": "4.0.0",
"broccoli-terser-sourcemap": "4.1.0",
"chai": "4.2.0",
"chai-dom": "1.8.2",
"codemirror": "5.48.2",
@ -69,8 +69,8 @@
"ember-cli-postcss": "6.0.1",
"ember-cli-shims": "1.2.0",
"ember-cli-string-helpers": "5.0.0",
"ember-cli-terser": "4.0.0",
"ember-cli-test-loader": "3.0.0",
"ember-cli-uglify": "3.0.0",
"ember-composable-helpers": "4.3.0",
"ember-concurrency": "1.3.0",
"ember-concurrency-decorators": "2.0.1",

47
ghost/admin/yarn.lock
View file

@ -3636,10 +3636,10 @@ broccoli-templater@^2.0.1:
rimraf "^2.6.2"
walk-sync "^0.3.3"
broccoli-uglify-sourcemap@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-4.0.0.tgz#c5c5fbd9563cf0fe4c68c337bb61e98fe0697a3b"
integrity sha512-46yB4gw1Q3ALtBROY5QfKXNXxYK5uPSvER1OGjjh2t3piaipqBfuRXTzQZvmZ+Odr6/McY+J8XmxON4+lE1ukg==
broccoli-terser-sourcemap@4.1.0, broccoli-terser-sourcemap@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/broccoli-terser-sourcemap/-/broccoli-terser-sourcemap-4.1.0.tgz#5f37441b64a3b6bfb0c67e9af232259c9576f115"
integrity sha512-zkNnjsAbP+M5rG2aMM1EE4BmXPUSxFKmtLUkUs2D1DLTOJQoF1xlOjGWjjKYCFy5tw8t4+tgGJ+HVa2ucJZ8sw==
dependencies:
async-promise-queue "^1.0.5"
broccoli-plugin "^4.0.3"
@ -3652,23 +3652,6 @@ broccoli-uglify-sourcemap@4.0.0:
walk-sync "^2.2.0"
workerpool "^6.0.0"
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==
dependencies:
async-promise-queue "^1.0.5"
broccoli-plugin "^1.2.1"
debug "^4.1.0"
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"
broccoli@^3.4.2:
version "3.4.2"
resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.4.2.tgz#a0c2605bea285c50cac304f482b86670630f4701"
@ -5666,6 +5649,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.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/ember-cli-terser/-/ember-cli-terser-4.0.0.tgz#01d2f1a3090833d1c895fea34ec0b4106a293f3a"
integrity sha512-N9PBVreF7041l7ggxdhrivK1suh1EgURuz3PmLIi1jdDhf/WVVkCAWfriFP3HeFUwAjX4qxHrgFR2Pb5va9Vxw==
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"
@ -5742,14 +5732,6 @@ ember-cli-typescript@^3.1.2, ember-cli-typescript@^3.1.3, ember-cli-typescript@^
stagehand "^1.0.0"
walk-sync "^2.0.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-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
version "2.2.0"
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
@ -13117,7 +13099,7 @@ terser-webpack-plugin@^1.1.0:
webpack-sources "^1.4.0"
worker-farm "^1.7.0"
terser@^4.1.2, terser@^4.3.9:
terser@^4.1.2:
version "4.8.0"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@ -14019,11 +14001,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.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58"