Skip to content

Commit b56cd79

Browse files
committed
Update build system and dependencies
1 parent d8a6b7c commit b56cd79

File tree

11 files changed

+147
-140
lines changed

11 files changed

+147
-140
lines changed

configurations/tsconfig.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
{
22
"compileOnSave": false,
33
"compilerOptions": {
4-
"lib": ["ES2020"],
5-
"target": "ES2020",
6-
"module": "NodeNext",
7-
"moduleResolution": "NodeNext",
4+
"lib": ["ES2023"],
5+
"target": "ES2023",
6+
"module": "ESNext",
7+
"moduleResolution": "Bundler",
88
"esModuleInterop": true,
99
"strict": true,
1010
"strictNullChecks": true,
1111
"resolveJsonModule": true,
12-
"skipDefaultLibCheck": true,
1312
"skipLibCheck": true,
1413
"declaration": true,
1514
"isolatedModules": false,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"octokit-plugin-create-pull-request": "^3.12.2",
7575
"pathe": "1.1.1",
7676
"pin-github-action": "^3.3.1",
77-
"react": "17.0.2",
77+
"react": "19.1.0",
7878
"rimraf": "^3.0.2",
7979
"tmp": "^0.2.4",
8080
"ts-node": "^10.9.1",

packages/app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
"http-proxy-node16": "1.0.6",
7070
"ignore": "6.0.2",
7171
"proper-lockfile": "4.1.2",
72-
"react": "^18.2.0",
73-
"react-dom": "18.3.1",
72+
"react": "^19.1.0",
73+
"react-dom": "19.1.0",
7474
"which": "4.0.0",
7575
"ws": "8.18.0"
7676
},
@@ -79,8 +79,8 @@
7979
"@types/diff": "^5.0.3",
8080
"@types/express": "^4.17.17",
8181
"@types/proper-lockfile": "4.1.4",
82-
"@types/react": "18.2.0",
83-
"@types/react-dom": "18.2.0",
82+
"@types/react": "19.1.0",
83+
"@types/react-dom": "19.1.0",
8484
"@types/which": "3.0.4",
8585
"@types/ws": "^8.5.13",
8686
"@vitest/coverage-istanbul": "^3.1.4"

packages/app/src/cli/models/app/loader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ async function checkIfGitTracked(appDirectory: string, configurationPath: string
984984
const gitIgnorePath = joinPath(appDirectory, '.gitignore')
985985
if (!fileExistsSync(gitIgnorePath)) return true
986986
const gitIgnoreContent = await readFile(gitIgnorePath)
987-
const ignored = ignore.default().add(gitIgnoreContent)
987+
const ignored = ignore().add(gitIgnoreContent)
988988
const relative = relativePath(appDirectory, configurationPath)
989989
const isTracked = !ignored.ignores(relative)
990990
return isTracked

packages/app/src/cli/services/dev/app-events/file-watcher.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {AbortSignal} from '@shopify/cli-kit/node/abort'
88
import {startHRTime, StartTime} from '@shopify/cli-kit/node/hrtime'
99
import {fileExistsSync, matchGlob, readFileSync} from '@shopify/cli-kit/node/fs'
1010
import {debounce} from '@shopify/cli-kit/common/function'
11-
import ignore from 'ignore'
11+
import ignore, {Ignore} from 'ignore'
1212
import {Writable} from 'stream'
1313

1414
const DEFAULT_DEBOUNCE_TIME_IN_MS = 200
@@ -55,7 +55,7 @@ export class FileWatcher {
5555
private onChangeCallback?: (events: WatcherEvent[]) => void
5656
private watcher?: FSWatcher
5757
private readonly debouncedEmit: () => void
58-
private readonly ignored: {[key: string]: ignore.Ignore | undefined} = {}
58+
private readonly ignored: {[key: string]: Ignore | undefined} = {}
5959

6060
constructor(
6161
app: AppLinkedInterface,
@@ -260,14 +260,14 @@ export class FileWatcher {
260260
}
261261

262262
// Creates an "Ignore" instance for the given path if a .gitignore file exists, otherwise undefined
263-
private createIgnoreInstance(path: string): ignore.Ignore | undefined {
263+
private createIgnoreInstance(path: string): Ignore | undefined {
264264
const gitIgnorePath = joinPath(path, '.gitignore')
265265
if (!fileExistsSync(gitIgnorePath)) return undefined
266266
const gitIgnoreContent = readFileSync(gitIgnorePath)
267267
.toString()
268268
.split('\n')
269269
.map((pattern) => pattern.trim())
270270
.filter((pattern) => pattern !== '' && !pattern.startsWith('#'))
271-
return ignore.default().add(gitIgnoreContent)
271+
return ignore().add(gitIgnoreContent)
272272
}
273273
}

packages/cli-kit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"graphql": "16.10.0",
137137
"graphql-request": "6.1.0",
138138
"ignore": "6.0.2",
139-
"ink": "4.4.1",
139+
"ink": "6.3.1",
140140
"is-executable": "2.0.1",
141141
"is-interactive": "2.0.0",
142142
"is-wsl": "3.1.0",
@@ -152,7 +152,7 @@
152152
"node-fetch": "3.3.2",
153153
"open": "8.4.2",
154154
"pathe": "1.1.2",
155-
"react": "^18.2.0",
155+
"react": "^19.1.0",
156156
"semver": "7.6.3",
157157
"simple-git": "3.27.0",
158158
"stacktracey": "2.1.8",

packages/cli-kit/src/public/node/error-handler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,6 @@ function initializeBugsnag() {
302302
// Bugsnag which is to set it to the cwd. That is unhelpful for us because
303303
// the cwd can be anywhere in the user's filesystem, not necessarily
304304
// related to the CLI codebase.
305-
projectRoot: null,
305+
projectRoot: undefined,
306306
})
307307
}

packages/cli-kit/src/public/node/error.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ export abstract class FatalError extends Error {
7272
* Those usually represent unexpected scenarios that we can't handle and that usually require some action from the developer.
7373
*/
7474
export class AbortError extends FatalError {
75-
nextSteps?: TokenItem<InlineToken>[]
76-
customSections?: AlertCustomSection[]
77-
7875
constructor(
7976
message: TokenItem | OutputMessage,
8077
tryMessage: TokenItem | OutputMessage | null = null,

packages/cli-kit/src/public/node/git.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export function addToGitIgnore(root: string, entry: string): void {
8585
const eol = detectEOL(gitIgnoreContent)
8686

8787
const lines = gitIgnoreContent.split(eol).map((line) => line.trim())
88-
const ignoreManager = ignore.default({allowRelativePaths: true}).add(lines)
88+
const ignoreManager = ignore({allowRelativePaths: true}).add(lines)
8989

9090
const isIgnoredEntry = ignoreManager.ignores(joinPath(entry))
9191
const isIgnoredEntryAsDir = ignoreManager.ignores(joinPath(entry, 'ignored.txt'))

packages/cli/bin/bundle.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const hydrogenAssets = joinPath(hydrogenPath, 'dist/assets/hydrogen/**/*')
3838

3939
esBuild({
4040
bundle: true,
41-
entryPoints: ['./src/**/*.ts'],
41+
entryPoints: ['./src/index.ts'],
4242
outdir: './dist',
4343
platform: 'node',
4444
format: 'esm',
@@ -49,7 +49,7 @@ esBuild({
4949
// Injected during build to detect fork vs original repo
5050
'process.env.SHOPIFY_CLI_BUILD_REPO': JSON.stringify(process.env.SHOPIFY_CLI_BUILD_REPO || 'unknown'),
5151
},
52-
inject: ['../../bin/bundling/cjs-shims.js'],
52+
// inject: ['../../bin/bundling/cjs-shims.js'],
5353
external,
5454
sourcemap: true,
5555
loader: {'.node': 'copy'},

0 commit comments

Comments
 (0)