Skip to content

Commit

Permalink
Merge pull request #879 from Shopify/oclif-upgrade
Browse files Browse the repository at this point in the history
Update @oclif/core to 1.21.0 to fix the dependency installation issue in the fixture app
  • Loading branch information
pepicrft committed Dec 15, 2022
2 parents bd322aa + 9d46583 commit 02370af
Show file tree
Hide file tree
Showing 24 changed files with 189 additions and 176 deletions.
12 changes: 12 additions & 0 deletions .changeset/slow-pugs-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
'@shopify/app': minor
'@shopify/cli-hydrogen': minor
'@shopify/cli-kit': minor
'@shopify/cli': minor
'@shopify/create-app': minor
'@shopify/create-hydrogen': minor
'@shopify/plugin-ngrok': minor
'@shopify/theme': minor
---

Update @oclif/core to 1.21.0
3 changes: 0 additions & 3 deletions bin/git-files.sh

This file was deleted.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
},
"devDependencies": {
"@apollo/client": "^3.4.8",
"@babel/core": "^7.11.0",
"@bugsnag/source-maps": "^2.3.0",
"@changesets/cli": "2.25.2",
"@nrwl/eslint-plugin-nx": "^15.3.0",
Expand All @@ -54,14 +53,10 @@
"eslint": "^8.12.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-jest": "^26.4.6",
"eslint-plugin-jsdoc": "^39.3.6",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-no-catch-all": "^1.1.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"eslint-plugin-rulesdir": "^0.2.1",
"eslint-plugin-tsdoc": "^0.2.17",
"eslint-plugin-unicorn": "^40.0.0",
Expand All @@ -81,14 +76,19 @@
"pathe": "0.2.0",
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.6.1",
"react": "17.0.2",
"rimraf": "^3.0.2",
"shx": "^0.3.3",
"tempy": "^3.0.0",
"tmp": "^0.2.1",
"ts-node": "^10.7.0",
"tslib": "^2.3.1",
"typescript": "4.6.4"
"typescript": "4.8.4",
"@babel/core": "^7.11.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-react-hooks": "^4.3.0",
"react": "17.0.2"
},
"workspaces": {
"packages": [
Expand All @@ -109,6 +109,6 @@
"resolutions": {
"@types/react": "16.14.0",
"vite": "2.9.12",
"@oclif/core": "1.9.2"
"@oclif/core": "1.21.0"
}
}
2 changes: 1 addition & 1 deletion packages/app/oclif.manifest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
},
"dependencies": {
"@luckycatfactory/esbuild-graphql-loader": "3.7.0",
"@oclif/core": "1.9.2",
"@shopify/cli-kit": "3.28.0",
"@oclif/core": "1.21.0",
"@shopify/shopify-cli-extensions": "3.21.0",
"abort-controller": "3.0.0",
"chokidar": "3.5.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-hydrogen/oclif.manifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"3.28.0","commands":{"hydrogen:build":{"id":"hydrogen:build","description":"Builds a Hydrogen storefront for production","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"base":{"name":"base","type":"option","description":" the public path when served in production","multiple":false},"client":{"name":"client","type":"boolean","description":"build the client code","allowNo":true},"target":{"name":"target","type":"option","char":"t","description":"the target platform to build for (worker or node)","multiple":false,"options":["node","worker"],"default":"worker"},"entry":{"name":"entry","type":"option","description":"produce Server Side Rendering (SSR) build for node environments","multiple":false}},"args":[],"_globalFlags":{}},"hydrogen:deploy":{"id":"hydrogen:deploy","description":"Deploy your Hydrogen app to Oxygen hosting","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","hidden":true,"aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"install":{"name":"install","type":"boolean","description":"should install packages","hidden":true,"allowNo":true},"deploymentToken":{"name":"deploymentToken","type":"option","description":"Specify your Oxygen deployment token.","required":true,"multiple":false},"commitMessage":{"name":"commitMessage","type":"option","description":"Override the default Git commit message.","multiple":false},"commitAuthor":{"name":"commitAuthor","type":"option","description":"Override the default Git commit author.","multiple":false},"pathToBuild":{"name":"pathToBuild","type":"option","description":"Skip build process and use provided value as build","hidden":true,"multiple":false},"healthCheck":{"name":"healthCheck","type":"boolean","description":"Require a health check before the deployment succeeds.","allowNo":false},"assumeYes":{"name":"assumeYes","type":"boolean","char":"y","description":"Automatic yes to prompts. Assume \"yes\" as answer to all prompts and run non-interactively.","allowNo":false},"oxygenAddress":{"name":"oxygenAddress","type":"option","hidden":true,"multiple":false,"default":"oxygen-dms.shopifycloud.com"}},"args":[],"_globalFlags":{}},"hydrogen:dev":{"id":"hydrogen:dev","description":"Run a Hydrogen storefront locally for development","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"force":{"name":"force","type":"boolean","description":"force dependency pre-bundling.","allowNo":false},"host":{"name":"host","type":"boolean","description":"listen on all addresses, including LAN and public addresses.","allowNo":false},"open":{"name":"open","type":"boolean","description":"automatically open the app in the browser","allowNo":false}},"args":[],"_globalFlags":{}},"hydrogen:info":{"id":"hydrogen:info","description":"Print basic information about your hydrogen app","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"install":{"name":"install","type":"boolean","description":"should install packages","hidden":true,"allowNo":true},"showToken":{"name":"showToken","type":"boolean","description":"Show storefront API token","hidden":false,"allowNo":false}},"args":[],"_globalFlags":{}},"hydrogen:preview":{"id":"hydrogen:preview","description":"Run a Hydrogen storefront locally in a worker environment","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"port":{"name":"port","type":"option","char":"p","description":"the port to run the preview server on","hidden":true,"multiple":false,"default":"3000"},"env":{"name":"env","type":"option","char":"e","description":"the file path to your .env","multiple":false},"target":{"name":"target","type":"option","char":"t","description":"the target environment (worker or node)","multiple":false,"options":["node","worker"],"default":"worker"}},"args":[],"_globalFlags":{}},"hydrogen:add:eslint":{"id":"hydrogen:add:eslint","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"install":{"name":"install","type":"boolean","description":"should install packages","hidden":true,"allowNo":true},"force":{"name":"force","type":"boolean","char":"f","description":"Overwrite existing configuration","hidden":false,"allowNo":false}},"args":[],"_globalFlags":{}},"hydrogen:add:tailwind":{"id":"hydrogen:add:tailwind","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"install":{"name":"install","type":"boolean","description":"should install packages","hidden":true,"allowNo":true},"force":{"name":"force","type":"boolean","char":"f","description":"overwrite existing configuration","hidden":false,"allowNo":false}},"args":[],"_globalFlags":{}}}}
{"version":"3.28.0","commands":{"hydrogen:build":{"id":"hydrogen:build","description":"Builds a Hydrogen storefront for production","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"base":{"name":"base","type":"option","description":" the public path when served in production","multiple":false},"client":{"name":"client","type":"boolean","description":"build the client code","allowNo":true},"target":{"name":"target","type":"option","char":"t","description":"the target platform to build for (worker or node)","multiple":false,"options":["node","worker"],"default":"worker"},"entry":{"name":"entry","type":"option","description":"produce Server Side Rendering (SSR) build for node environments","multiple":false}},"args":[]},"hydrogen:deploy":{"id":"hydrogen:deploy","description":"Deploy your Hydrogen app to Oxygen hosting","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","hidden":true,"aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"install":{"name":"install","type":"boolean","description":"should install packages","hidden":true,"allowNo":true},"deploymentToken":{"name":"deploymentToken","type":"option","description":"Specify your Oxygen deployment token.","required":true,"multiple":false},"commitMessage":{"name":"commitMessage","type":"option","description":"Override the default Git commit message.","multiple":false},"commitAuthor":{"name":"commitAuthor","type":"option","description":"Override the default Git commit author.","multiple":false},"pathToBuild":{"name":"pathToBuild","type":"option","description":"Skip build process and use provided value as build","hidden":true,"multiple":false},"healthCheck":{"name":"healthCheck","type":"boolean","description":"Require a health check before the deployment succeeds.","allowNo":false},"assumeYes":{"name":"assumeYes","type":"boolean","char":"y","description":"Automatic yes to prompts. Assume \"yes\" as answer to all prompts and run non-interactively.","allowNo":false},"oxygenAddress":{"name":"oxygenAddress","type":"option","hidden":true,"multiple":false,"default":"oxygen-dms.shopifycloud.com"}},"args":[]},"hydrogen:dev":{"id":"hydrogen:dev","description":"Run a Hydrogen storefront locally for development","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"force":{"name":"force","type":"boolean","description":"force dependency pre-bundling.","allowNo":false},"host":{"name":"host","type":"boolean","description":"listen on all addresses, including LAN and public addresses.","allowNo":false},"open":{"name":"open","type":"boolean","description":"automatically open the app in the browser","allowNo":false}},"args":[]},"hydrogen:info":{"id":"hydrogen:info","description":"Print basic information about your hydrogen app","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"install":{"name":"install","type":"boolean","description":"should install packages","hidden":true,"allowNo":true},"showToken":{"name":"showToken","type":"boolean","description":"Show storefront API token","hidden":false,"allowNo":false}},"args":[]},"hydrogen:preview":{"id":"hydrogen:preview","description":"Run a Hydrogen storefront locally in a worker environment","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"port":{"name":"port","type":"option","char":"p","description":"the port to run the preview server on","hidden":true,"multiple":false,"default":"3000"},"env":{"name":"env","type":"option","char":"e","description":"the file path to your .env","multiple":false},"target":{"name":"target","type":"option","char":"t","description":"the target environment (worker or node)","multiple":false,"options":["node","worker"],"default":"worker"}},"args":[]},"hydrogen:add:eslint":{"id":"hydrogen:add:eslint","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"install":{"name":"install","type":"boolean","description":"should install packages","hidden":true,"allowNo":true},"force":{"name":"force","type":"boolean","char":"f","description":"Overwrite existing configuration","hidden":false,"allowNo":false}},"args":[]},"hydrogen:add:tailwind":{"id":"hydrogen:add:tailwind","strict":true,"pluginName":"@shopify/cli-hydrogen","pluginAlias":"@shopify/cli-hydrogen","pluginType":"core","aliases":[],"flags":{"preset":{"name":"preset","type":"option","description":"The preset to apply to the current command.","hidden":true,"multiple":false},"verbose":{"name":"verbose","type":"boolean","description":"Increase the verbosity of the logs.","hidden":false,"allowNo":false},"path":{"name":"path","type":"option","description":"the path to your hydrogen storefront","hidden":true,"multiple":false},"install":{"name":"install","type":"boolean","description":"should install packages","hidden":true,"allowNo":true},"force":{"name":"force","type":"boolean","char":"f","description":"overwrite existing configuration","hidden":false,"allowNo":false}},"args":[]}}}
4 changes: 2 additions & 2 deletions packages/cli-hydrogen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
]
},
"dependencies": {
"@oclif/core": "1.9.2",
"@oclif/core": "1.21.0",
"@shopify/hydrogen": "0.26.0",
"@shopify/mini-oxygen": "0.2.0",
"@types/prettier": "2.6.3",
Expand All @@ -48,7 +48,7 @@
"@shopify/cli-kit": "3.28.0",
"fast-glob": "3.2.11",
"fs-extra": "10.0.0",
"typescript": "4.6.4",
"typescript": "4.8.4",
"@shopify/prettier-config": "1.1.2",
"graphql-request": "4.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"dependencies": {
"@bugsnag/js": "7.16.7",
"@iarna/toml": "2.2.5",
"@oclif/core": "1.9.2",
"@oclif/core": "1.21.0",
"@types/archiver": "5.3.1",
"abort-controller": "3.0.0",
"archiver": "5.3.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli-kit/src/public/node/base-command.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ describe('applying presets', async () => {
await MockCommand.run(['--path', tmpDir, '--preset', 'presetWithExclusiveArguments'])

// Then
expect(testError?.message).toMatch('--someBoolean= cannot also be provided when using --someExclusiveString')
expect(testError?.message).toMatch('--someBoolean=true cannot also be provided when using --someExclusiveString')
})

runTestInTmpDir('throws on negated booleans', async (tmpDir: string) => {
Expand Down Expand Up @@ -267,7 +267,7 @@ describe('applying presets', async () => {
await MockCommand.run(['--path', tmpDir, '--preset', 'validPreset', '--someExclusiveString', 'stringy'])

// Then
expect(testError?.message).toMatch('--someBoolean= cannot also be provided when using --someExclusiveString')
expect(testError?.message).toMatch('--someBoolean=true cannot also be provided when using --someExclusiveString')
},
)

Expand Down

0 comments on commit 02370af

Please sign in to comment.