0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00

Cleaned up subgrunt usage between Ghost and Admin

refs https://github.com/TryGhost/Toolbox/issues/365

- some of this was barely used anyway, but now Admin is a package in the
  monorepo, we don't need to be installing dependencies twice
This commit is contained in:
Daniel Lockyer 2022-08-03 17:05:57 +02:00
parent cb7273c7fd
commit a398a0e57d
No known key found for this signature in database
GPG key ID: D21186F0B47295AD
4 changed files with 2 additions and 41 deletions

View file

@ -27,10 +27,6 @@ module.exports = function (grunt) {
},
shell: {
'npm-install': {
command: 'yarn install'
},
ember: {
command: function (mode) {
let liveReloadBaseUrl = grunt.option('live-reload-base-url') || '/ghost/';
@ -54,17 +50,9 @@ module.exports = function (grunt) {
command: 'csscomb -c app/styles/csscomb.json -lv app/styles'
},
test: {
command: 'npm test'
},
options: {
preferLocal: true
}
}
});
grunt.registerTask('init', 'Install the admin dependencies',
['shell:npm-install']
);
};

View file

@ -25,7 +25,7 @@ module.exports = function (grunt) {
// grunt build -- use yarn build instead!
// - Builds the admin without a watch task
grunt.registerTask('build', 'Build admin app in development mode',
['subgrunt:init', 'clean:tmp', 'ember']);
['clean:tmp', 'ember']);
// Runs the asset generation tasks for production and duplicates default-prod.html to default.html
grunt.registerTask('release', 'Release task - creates a final built zip', ['clean:built', 'prod']);
@ -34,8 +34,7 @@ module.exports = function (grunt) {
// Used to make other commands work
// Updates submodules, then installs and builds the admin for you
grunt.registerTask('init', 'Prepare the project for development',
['update_submodules:pinned', 'build']);
grunt.registerTask('init', 'Prepare the project for development', 'build');
// Runs ember dev
grunt.registerTask('ember', 'Build JS & templates for development',
@ -152,16 +151,6 @@ module.exports = function (grunt) {
}
},
// grunt-update-submodules
// Grunt task to update git submodules
update_submodules: {
pinned: {
options: {
params: '--init'
}
}
},
// grunt-subgrunt
// Run grunt tasks in submodule Gruntfiles
subgrunt: {
@ -170,15 +159,6 @@ module.exports = function (grunt) {
npmPath: 'yarn'
},
init: {
options: {
npmInstall: true
},
projects: {
'../admin': 'init'
}
},
dev: {
'../admin': 'shell:ember:dev'
},
@ -220,7 +200,6 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-express-server');
grunt.loadNpmTasks('grunt-subgrunt');
grunt.loadNpmTasks('grunt-update-submodules');
// This little bit of weirdness gives the express server chance to shutdown properly
const waitBeforeExit = () => {

View file

@ -208,7 +208,6 @@
"grunt-contrib-watch": "1.1.0",
"grunt-express-server": "0.5.4",
"grunt-subgrunt": "1.3.0",
"grunt-update-submodules": "0.4.1",
"inquirer": "8.2.4",
"jwks-rsa": "2.1.4",
"mocha": "10.0.0",

View file

@ -12929,11 +12929,6 @@ grunt-subgrunt@1.3.0:
async "^2.1.2"
glob "^7.0.0"
grunt-update-submodules@0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/grunt-update-submodules/-/grunt-update-submodules-0.4.1.tgz#46c485fe6413cc0bdd6988aa2803c4e7d997c366"
integrity sha512-Pv3rr6XB3RZJUuCrxANVN8NT5N3+u4541pe+KIve8c6lqpKNJh6yQxO+utsXEKSUm4IFzdWAYOKYKZ77h0EETg==
grunt@1.5.3:
version "1.5.3"
resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.5.3.tgz#3214101d11257b7e83cf2b38ea173b824deab76a"