Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/meteor 2.6 for #6, changes to publish to npm/atmosphere under new org #7

Merged
merged 8 commits into from
Apr 11, 2022
Merged

fix/meteor 2.6 for #6, changes to publish to npm/atmosphere under new org #7

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cfd60a2
fixes for meteor 2.6. update shelljs to 0.8.5, fix bundler plugin. ve…
ejfrancis Feb 14, 2022
520b891
changelog
ejfrancis Feb 14, 2022
1e57da4
re-enable logDebug
ejfrancis Feb 14, 2022
5440c8d
rm temp log
ejfrancis Feb 14, 2022
26a05ae
changes to publish under new npm and atmosphere package names under @…
ejfrancis Feb 15, 2022
2f81710
devEntSetup use Meteor 2.6
ejfrancis Feb 15, 2022
225831c
package-lock update and package.json name + version
ejfrancis Feb 22, 2022
fd17d71
update chokidar to 3.x in packages
ejfrancis Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## v2.2.6 14.02.2020
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given the changes this should be at least 2.3 release, preferably a major version release.

Copy link
Author

@evan-coygo evan-coygo Feb 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We haven't made any backwards-breaking API changes so a major release wouldn't be appropriate for proper semver (which I think all npm packages should strive for) but 2.3 sounds good to me

Fixed to work with Meteor 2.6+ Node 14+.
* Updated `shelljs` to `0.8.5`.
* Fix bundler plugin to pass non-uglified `code` instead of `undefined` to `fs.writeFileSync` in dev mode.

## v2.2.5 <sup>24.01.2020</sup>

* Fixed issue with packaging [`#248`](https://github.com/wojtkowiak/meteor-desktop/issues/248)
Expand Down
50 changes: 18 additions & 32 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "meteor-desktop",
"version": "2.2.5",
"version": "2.2.6",
"bin": {
"meteor-desktop": "dist/bin/cli.js"
},
"engines": {
"node": ">=4.0.0"
"node": ">=4.0.0 <=12"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran into an issue when building with node 14 but it works with node 12 so including that here. It works with Meteor 2.6 which uses node 14, so it's just the build process that doesn't work on 14

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good for now, for the future we should probably start looking towards Node 16.

},
"description": "Build a Meteor's desktop client with hot code push.",
"main": "dist/index.js",
Expand Down Expand Up @@ -91,7 +91,7 @@
"regenerator-runtime": "0.12.1",
"rimraf": "2.6.2",
"semver": "5.5.1",
"shelljs": "0.8.2",
"shelljs": "0.8.5",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixes these warnings

(node:21952) Warning: Accessing non-existent property 'cd' of module exports inside circular dependency
(node:21952) Warning: Accessing non-existent property 'chmod' of module exports inside circular dependency

"single-line-log": "1.1.2",
"terser": "3.8.2"
},
Expand Down
5 changes: 3 additions & 2 deletions plugins/bundler/bundler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,6 @@ class MeteorDesktopBundler {
version: desktopSettings.desktopVersion,
compatibilityVersion: desktopSettings.compatibilityVersion
};

self.stampPerformance('file add');
inputFile.addAsset({
path: 'version.desktop.json',
Expand Down Expand Up @@ -866,7 +865,9 @@ class MeteorDesktopBundler {
if (error) {
reject(error);
} else {
fs.writeFileSync(filePath, uglifiedCode);
// in development mode, uglifiedCode will be undefined, which causes an error since fs.writeFileSync introduced type checking of the data parameter in Node 14.
// https://github.com/wojtkowiak/meteor-desktop/issues/303#issuecomment-1025337912
fs.writeFileSync(filePath, uglifiedCode || code);
resolve();
}
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/bundler/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable prefer-arrow-callback */
Package.describe({
name: 'omega:meteor-desktop-bundler',
version: '2.2.5',
version: '2.2.6',
summary: 'Bundles .desktop dir into desktop.asar.',
git: 'https://github.com/wojtkowiak/meteor-desktop',
documentation: 'README.md'
Expand Down
4 changes: 2 additions & 2 deletions plugins/watcher/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable prefer-arrow-callback */
Package.describe({
name: 'omega:meteor-desktop-watcher',
version: '2.2.5',
version: '2.2.6',
summary: 'Watches .desktop dir and triggers rebuilds on file change.',
git: 'https://github.com/wojtkowiak/meteor-desktop',
documentation: 'README.md',
Expand All @@ -16,7 +16,7 @@ Package.onUse(function onUse(api) {
api.versionsFrom('[email protected]');
api.use('ecmascript');
api.use([
'omega:[email protected].5',
'omega:[email protected].6',
], ['server'], {
weak: true
});
Expand Down
Loading