From fa6a714c86762a92c8db3d4e4d6711a99f0969b2 Mon Sep 17 00:00:00 2001 From: Lucendio Date: Fri, 17 Apr 2020 19:55:07 +0200 Subject: [PATCH 1/3] re-enable options that were ignored before (#60) due to overlooked trailing semicolons --- main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.js b/main.js index 9290696..7a7d01e 100755 --- a/main.js +++ b/main.js @@ -20,11 +20,11 @@ program .option('-t, --template ', 'Provide a custom index.html template. Use {{> head}}, {{> css}} and {{> scripts}} to place the meteor resources.') .option('-s, --settings ', 'Set optional data for Meteor.settings in your application.') .option('-u, --url ', 'The Root URL of your app. If "default", Meteor will try to connect to the Server where it was served from. Default is: "" (empty string)') - .option('-b, --usebuild', 'If this flag is present, meteor-build-client will skip the `meteor build` step and opt for using your manually built ../build folder.'); + .option('-b, --usebuild', 'If this flag is present, meteor-build-client will skip the `meteor build` step and opt for using your manually built ../build folder.') .option('-D, --debug', 'Build in debug mode (don\'t minify, etc)') - .option('-v, --verbose', 'Add optional verbose option.'); - // .option('-d, --ddp ', 'The URL of your Meteor DDP server, e.g. "ddp+sockjs://ddp.myapp.com/sockjs". If you don\'t add any it will also add call "Meteor.disconnect();" to prevent the app from conneting.'); + .option('-v, --verbose', 'Add optional verbose option.') .option('-hide, --hideSpinner', 'Hide spinner on command while executing within the option. Default is: true'); + // .option('-d, --ddp ', 'The URL of your Meteor DDP server, e.g. "ddp+sockjs://ddp.myapp.com/sockjs". If you don\'t add any it will also add call "Meteor.disconnect();" to prevent the app from conneting.'); program.on('--help', function(){ console.log(' Warning:'); From e5de487507303dba7117f6351f3b008f443d0bfe Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Fri, 17 Apr 2020 19:58:27 +0200 Subject: [PATCH 2/3] bumped version --- .versions | 28 ++++++++++++++++++++-------- package.js | 2 +- package.json | 2 +- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.versions b/.versions index ae26543..6bb4bab 100644 --- a/.versions +++ b/.versions @@ -1,8 +1,20 @@ -frozeman:build-client@0.3.1 -meteor@1.1.14 -minifier-css@1.1.11 -minifier-js@1.1.11 -standard-minifier-css@1.0.6 -standard-minifier-js@1.0.6 -standard-minifiers@1.0.6 -underscore@1.0.8 +babel-compiler@7.5.3 +babel-runtime@1.5.0 +dynamic-import@0.5.2 +ecmascript@0.14.3 +ecmascript-runtime@0.7.0 +ecmascript-runtime-client@0.10.0 +ecmascript-runtime-server@0.9.0 +fetch@0.1.1 +frozeman:build-client@0.4.2 +inter-process-messaging@0.1.1 +meteor@1.9.3 +minifier-css@1.5.0 +minifier-js@2.6.0 +modern-browsers@0.1.5 +modules@0.15.0 +modules-runtime@0.12.0 +promise@0.11.2 +standard-minifier-css@1.6.0 +standard-minifier-js@2.6.0 +standard-minifiers@1.1.0 diff --git a/package.js b/package.js index 0d069ce..bd6b792 100644 --- a/package.js +++ b/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "frozeman:build-client", summary: "Placeholder package for meteor-build-client (npm). Do not install!", - version: "0.4.1", + version: "0.4.2", git: "https://github.com/frozeman/meteor-build-client" }); diff --git a/package.json b/package.json index cecf903..cdbc8ae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meteor-build-client", - "version": "0.4.1", + "version": "0.4.2", "description": "A bundles the client part of a Meteor app.", "author": "Fabian Vogelsteller ", "contributors": [ From 70378a37a70540147845874cf82cb914220edad5 Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Wed, 6 May 2020 18:20:41 +0200 Subject: [PATCH 3/3] removed annoying console.log --- .versions | 2 +- main.js | 23 +++++++++++------------ package.js | 2 +- package.json | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.versions b/.versions index 6bb4bab..fb30cb9 100644 --- a/.versions +++ b/.versions @@ -6,7 +6,7 @@ ecmascript-runtime@0.7.0 ecmascript-runtime-client@0.10.0 ecmascript-runtime-server@0.9.0 fetch@0.1.1 -frozeman:build-client@0.4.2 +frozeman:build-client@0.4.3 inter-process-messaging@0.1.1 meteor@1.9.3 minifier-css@1.5.0 diff --git a/main.js b/main.js index 7a7d01e..f11b506 100755 --- a/main.js +++ b/main.js @@ -40,35 +40,34 @@ program.parse(process.argv); Q.try(function() { if (!argPath) { throw new Error("You need to provide a path for the build output, for example:\n\n$ meteor-build-client myBuildFolder"); - } - + } + if (!fs.lstatSync('./.meteor').isDirectory()) { throw new Error('You\'re not in a Meteor app folder or inside a sub folder of your app.'); } - + if(program.template && !fs.lstatSync(program.template).isFile()) { throw new Error('The template file "'+ program.template +'" doesn\'t exist or is not a valid template file'); } }) .then(function() { - /** - * Allow the user to decide whether or not they want to use the + /** + * Allow the user to decide whether or not they want to use the * meteor-build-client build or their own */ - console.log(program.usebuild,program); if(program.usebuild && fs.lstatSync('../build').isDirectory()){ console.log('Using ../build'); console.log('Generating the index.html...'); - + return meteor.move(); }else{ - console.log('Bundling Meteor app...'); - + console.log('Bundling Meteor app...'); + return meteor.build(program) .then(function(){ console.log('Generating the index.html...'); - + return meteor.move(); }); } @@ -82,7 +81,7 @@ Q.try(function() { .then(function() { console.log('Done!'); console.log('-----'); - console.log('You can find your files in "'+ require('path').resolve(argPath) +'".'); + console.log('You can find your files in "'+ require('path').resolve(argPath) +'".'); }) .catch(function(err) { if (err.stderr || err.stdout) { @@ -90,6 +89,6 @@ Q.try(function() { } else { console.error(err); } - + process.exit(-1); }); diff --git a/package.js b/package.js index bd6b792..5eb936e 100644 --- a/package.js +++ b/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "frozeman:build-client", summary: "Placeholder package for meteor-build-client (npm). Do not install!", - version: "0.4.2", + version: "0.4.3", git: "https://github.com/frozeman/meteor-build-client" }); diff --git a/package.json b/package.json index cdbc8ae..16927d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meteor-build-client", - "version": "0.4.2", + "version": "0.4.3", "description": "A bundles the client part of a Meteor app.", "author": "Fabian Vogelsteller ", "contributors": [