Skip to content

Commit

Permalink
Merge pull request #216 from remix-pwa/dev
Browse files Browse the repository at this point in the history
Moving CLI patch upstream
  • Loading branch information
ShafSpecs authored May 4, 2024
2 parents 936851f + 2f81877 commit 1e55da8
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 5 deletions.
33 changes: 32 additions & 1 deletion package-lock.json

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

7 changes: 7 additions & 0 deletions packages/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## @remix-pwa/cli 1.2.3-dev.1 (2024-05-04)


### Bug Fixes

* **cli:** fixed json imports for newer node releases 945c219

## @remix-pwa/cli 1.2.2 (2024-04-24)


Expand Down
4 changes: 2 additions & 2 deletions packages/cli/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ process.emit = function (name, data, ..._args) {
return originalEmit.apply(process, arguments as unknown as Parameters<typeof process.emit>);
};

const packageJson = await import('./package.json', { assert: { type: 'json' } });
const packageJson = await import('./package.json', { with: { type: 'json' } });

const { blue, bold, green, italic, magenta, red } = colors;
const { ModuleKind, ScriptTarget, transpileModule } = ts;
Expand Down Expand Up @@ -199,7 +199,7 @@ program

const packageJSON = (
await import('file://' + fileURLToPath(`file:///${resolve(root, 'package.json').replace(/\\/g, '/')}`), {
assert: { type: 'json' },
with: { type: 'json' },
})
).default;
const dependencies = packageJSON.dependencies;
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@remix-pwa/cli",
"version": "1.2.2",
"version": "1.2.3-dev.1",
"description": "An elegant CLI for everything Remix PWA 💖",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@remix-pwa/dev": "3.0.4",
"@remix-pwa/dev": "3.0.5",
"@remix-run/dev": "^2.8.1",
"@remix-run/eslint-config": "^2.8.1",
"@types/react": "^18.2.22",
Expand Down

0 comments on commit 1e55da8

Please sign in to comment.