@shopify/cli-hydrogen 3.38.0 → 3.39.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/services/build/check-lockfile.d.ts +1 -1
- package/dist/cli/services/build/check-lockfile.js +2 -3
- package/dist/cli/services/build/check-lockfile.js.map +1 -1
- package/dist/cli/services/build.d.ts +5 -3
- package/dist/cli/services/build.js +3 -6
- package/dist/cli/services/build.js.map +1 -1
- package/dist/cli/services/deploy/types.d.ts +1 -1
- package/dist/cli/services/deploy/upload.js +4 -1
- package/dist/cli/services/deploy/upload.js.map +1 -1
- package/dist/cli/services/deploy.d.ts +1 -1
- package/dist/cli/services/deploy.js +31 -36
- package/dist/cli/services/deploy.js.map +1 -1
- package/dist/cli/services/eslint.js +11 -28
- package/dist/cli/services/eslint.js.map +1 -1
- package/dist/cli/services/tailwind.js +10 -31
- package/dist/cli/services/tailwind.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +4 -4
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { renderWarning } from '@shopify/cli-kit/node/ui';
|
|
2
2
|
import { lockfiles } from '@shopify/cli-kit/node/node-package-manager';
|
|
3
3
|
import { fileExists } from '@shopify/cli-kit/node/fs';
|
|
4
|
-
import {
|
|
4
|
+
import { checkIfIgnoredInGitRepository } from '@shopify/cli-kit/node/git';
|
|
5
5
|
import { resolvePath } from '@shopify/cli-kit/node/path';
|
|
6
6
|
function missingLockfileWarning() {
|
|
7
7
|
renderWarning({
|
|
@@ -70,9 +70,8 @@ export async function checkLockfileStatus(directory) {
|
|
|
70
70
|
multipleLockfilesWarning(availableLockfiles);
|
|
71
71
|
return 'multiple';
|
|
72
72
|
}
|
|
73
|
-
const repo = gitFactory(directory);
|
|
74
73
|
const lockfile = availableLockfiles[0];
|
|
75
|
-
const ignoredLockfile = await
|
|
74
|
+
const ignoredLockfile = await checkIfIgnoredInGitRepository(directory, [lockfile]);
|
|
76
75
|
if (ignoredLockfile.length) {
|
|
77
76
|
lockfileIgnoredWarning(lockfile);
|
|
78
77
|
return 'ignored';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-lockfile.js","sourceRoot":"","sources":["../../../../src/cli/services/build/check-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,4CAA4C,CAAA;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"check-lockfile.js","sourceRoot":"","sources":["../../../../src/cli/services/build/check-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,4CAA4C,CAAA;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAC,6BAA6B,EAAC,MAAM,2BAA2B,CAAA;AACvE,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAA;AAGtD,SAAS,sBAAsB;IAC7B,aAAa,CAAC;QACZ,QAAQ,EAAE,mBAAmB;QAC7B,IAAI,EACF,wEAAwE;YACxE,0EAA0E;YAC1E,gDAAgD;QAClD,SAAS,EAAE;YACT;gBACE,0BAA0B;gBAC1B;oBACE,OAAO,EAAE,uBAAuB;iBACjC;aACF;YACD,wCAAwC;SACzC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,SAAqB;IACrD,MAAM,eAAe,GAAG;QACtB,WAAW,EAAE,MAAM;QACnB,mBAAmB,EAAE,KAAK;QAC1B,gBAAgB,EAAE,MAAM;KACzB,CAAA;IAED,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9C,OAAO,GAAG,QAAQ,gBAAgB,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAA;IAChE,CAAC,CAAC,CAAA;IAEF,aAAa,CAAC;QACZ,QAAQ,EAAE,0BAA0B;QACpC,IAAI,EAAE;YACJ,uEAAuE;gBACrE,kEAAkE;gBAClE,4BAA4B;YAC9B,EAAC,IAAI,EAAE,EAAC,KAAK,EAAE,YAAY,EAAC,EAAC;SAC9B;QACD,SAAS,EAAE,CAAC,+BAA+B,EAAE,sCAAsC,CAAC;KACrF,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,QAAgB;IAC9C,aAAa,CAAC;QACZ,QAAQ,EAAE,yBAAyB;QACnC,IAAI,EACF,0EAA0E;YAC1E,0EAA0E;YAC1E,YAAY;QACd,SAAS,EAAE;YACT,+DAA+D,QAAQ,EAAE;YACzE,sCAAsC;SACvC;KACF,CAAC,CAAA;AACJ,CAAC;AAID,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,SAAiB;IACzD,MAAM,kBAAkB,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE;QAC5E,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;QACzD,IAAI,MAAM,UAAU,CAAC,YAAY,CAAC,EAAE;YAClC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACxC;aAAM;YACL,OAAO,GAAG,CAAA;SACX;IACH,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAgB,CAAC,CAAC,CAAA;IAErC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE;QAC9B,sBAAsB,EAAE,CAAA;QACxB,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,wBAAwB,CAAC,kBAAkB,CAAC,CAAA;QAC5C,OAAO,UAAU,CAAA;KAClB;IAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,CAAC,CAAE,CAAA;IACvC,MAAM,eAAe,GAAG,MAAM,6BAA6B,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAElF,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,sBAAsB,CAAC,QAAQ,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;KACjB;IAED,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import {renderWarning} from '@shopify/cli-kit/node/ui'\nimport {lockfiles} from '@shopify/cli-kit/node/node-package-manager'\nimport {fileExists} from '@shopify/cli-kit/node/fs'\nimport {checkIfIgnoredInGitRepository} from '@shopify/cli-kit/node/git'\nimport {resolvePath} from '@shopify/cli-kit/node/path'\nimport type {Lockfile} from '@shopify/cli-kit/node/node-package-manager'\n\nfunction missingLockfileWarning() {\n renderWarning({\n headline: 'No lockfile found',\n body:\n `If you don’t commit a lockfile, then your app might install the wrong ` +\n `package versions when deploying. To avoid versioning issues, generate a ` +\n `new lockfile and commit it to your repository.`,\n nextSteps: [\n [\n 'Generate a lockfile. Run',\n {\n command: 'npm|yarn|pnpm install',\n },\n ],\n 'Commit the new file to your repository',\n ],\n })\n}\n\nfunction multipleLockfilesWarning(lockfiles: Lockfile[]) {\n const packageManagers = {\n 'yarn.lock': 'yarn',\n 'package-lock.json': 'npm',\n 'pnpm-lock.yaml': 'pnpm',\n }\n\n const lockfileList = lockfiles.map((lockfile) => {\n return `${lockfile} (created by ${packageManagers[lockfile]})`\n })\n\n renderWarning({\n headline: 'Multiple lockfiles found',\n body: [\n `Your project contains more than one lockfile. This can cause version ` +\n `conflicts when installing and deploying your app. The following ` +\n `lockfiles were detected:\\n`,\n {list: {items: lockfileList}},\n ],\n nextSteps: ['Delete any unneeded lockfiles', 'Commit the change to your repository'],\n })\n}\n\nfunction lockfileIgnoredWarning(lockfile: string) {\n renderWarning({\n headline: 'Lockfile ignored by Git',\n body:\n `Your project’s lockfile isn’t being tracked by Git. If you don’t commit ` +\n `a lockfile, then your app might install the wrong package versions when ` +\n `deploying.`,\n nextSteps: [\n `In your project’s .gitignore file, delete any references to ${lockfile}`,\n 'Commit the change to your repository',\n ],\n })\n}\n\ntype LockFileStatus = 'missing' | 'multiple' | 'ignored' | 'ok'\n\nexport async function checkLockfileStatus(directory: string): Promise<LockFileStatus> {\n const availableLockfiles = await lockfiles.reduce(async (acc, lockFileName) => {\n const lockfilePath = resolvePath(directory, lockFileName)\n if (await fileExists(lockfilePath)) {\n return (await acc).concat(lockFileName)\n } else {\n return acc\n }\n }, Promise.resolve([] as Lockfile[]))\n\n if (!availableLockfiles.length) {\n missingLockfileWarning()\n return 'missing'\n }\n\n if (availableLockfiles.length > 1) {\n multipleLockfilesWarning(availableLockfiles)\n return 'multiple'\n }\n\n const lockfile = availableLockfiles[0]!\n const ignoredLockfile = await checkIfIgnoredInGitRepository(directory, [lockfile])\n\n if (ignoredLockfile.length) {\n lockfileIgnoredWarning(lockfile)\n return 'ignored'\n }\n\n return 'ok'\n}\n"]}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
declare type Target = 'node' | 'client' | 'worker';
|
|
1
|
+
type Target = 'node' | 'client' | 'worker';
|
|
3
2
|
interface DevOptions {
|
|
4
3
|
directory: string;
|
|
5
4
|
targets: {
|
|
@@ -9,6 +8,9 @@ interface DevOptions {
|
|
|
9
8
|
assetBaseURL?: string;
|
|
10
9
|
verbose?: boolean;
|
|
11
10
|
}
|
|
12
|
-
export declare function buildTaskList({ directory, targets, base, assetBaseURL, verbose }: DevOptions):
|
|
11
|
+
export declare function buildTaskList({ directory, targets, base, assetBaseURL, verbose }: DevOptions): {
|
|
12
|
+
title: string;
|
|
13
|
+
task: () => Promise<void>;
|
|
14
|
+
}[];
|
|
13
15
|
export declare function build(options: DevOptions): Promise<void>;
|
|
14
16
|
export {};
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import { checkLockfileStatus } from './build/check-lockfile.js';
|
|
2
2
|
import { build as viteBuild } from 'vite';
|
|
3
|
-
import { ui } from '@shopify/cli-kit';
|
|
4
|
-
import { isUnitTest } from '@shopify/cli-kit/node/environment/local';
|
|
5
3
|
import { AbortError } from '@shopify/cli-kit/node/error';
|
|
4
|
+
import { renderTasks } from '@shopify/cli-kit/node/ui';
|
|
6
5
|
export function buildTaskList({ directory, targets, base, assetBaseURL, verbose }) {
|
|
7
6
|
const commonConfig = { base, root: directory };
|
|
8
7
|
return Object.entries(targets)
|
|
9
8
|
.filter(([_, value]) => value)
|
|
10
9
|
.map(([key, value]) => ({
|
|
11
10
|
title: `Building ${key} code`,
|
|
12
|
-
task: async (
|
|
11
|
+
task: async () => {
|
|
13
12
|
if (key === 'worker') {
|
|
14
13
|
process.env.WORKER = 'true';
|
|
15
14
|
}
|
|
@@ -33,14 +32,12 @@ export function buildTaskList({ directory, targets, base, assetBaseURL, verbose
|
|
|
33
32
|
abortError.stack = error.stack;
|
|
34
33
|
throw abortError;
|
|
35
34
|
}
|
|
36
|
-
task.title = `Built ${key} code`;
|
|
37
35
|
},
|
|
38
36
|
}));
|
|
39
37
|
}
|
|
40
38
|
export async function build(options) {
|
|
41
39
|
await checkLockfileStatus(options.directory);
|
|
42
40
|
const tasks = await buildTaskList(options);
|
|
43
|
-
|
|
44
|
-
await list.run();
|
|
41
|
+
await renderTasks(tasks);
|
|
45
42
|
}
|
|
46
43
|
//# sourceMappingURL=build.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/cli/services/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAC,KAAK,IAAI,SAAS,EAAC,MAAM,MAAM,CAAA;AACvC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/cli/services/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAC,KAAK,IAAI,SAAS,EAAC,MAAM,MAAM,CAAA;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAA;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,0BAA0B,CAAA;AAYpD,MAAM,UAAU,aAAa,CAAC,EAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAa;IACzF,MAAM,YAAY,GAAG,EAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAC,CAAA;IAE5C,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SAC3B,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;SAC7B,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACtB,KAAK,EAAE,YAAY,GAAG,OAAO;QAC7B,IAAI,EAAE,KAAK,IAAI,EAAE;YACf,IAAI,GAAG,KAAK,QAAQ,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;aAC5B;YACD,IAAI,YAAY,EAAE;gBAChB,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,YAAY,CAAA;aACnD;YAED,IAAI;gBACF,MAAM,SAAS,CAAC;oBACd,GAAG,YAAY;oBACf,KAAK,EAAE;wBACL,MAAM,EAAE,QAAQ,GAAG,EAAE;wBACrB,GAAG,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;wBAClD,QAAQ,EAAE,GAAG,KAAK,QAAQ;qBAC3B;oBACD,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;iBACtC,CAAC,CAAA;gBACF,8DAA8D;aAC/D;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;gBAChD,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;gBAC9B,MAAM,UAAU,CAAA;aACjB;QACH,CAAC;KACF,CAAC,CAAC,CAAA;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,OAAmB;IAC7C,MAAM,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAE5C,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAA;IAE1C,MAAM,WAAW,CAAC,KAAK,CAAC,CAAA;AAC1B,CAAC","sourcesContent":["import {checkLockfileStatus} from './build/check-lockfile.js'\nimport {build as viteBuild} from 'vite'\nimport {AbortError} from '@shopify/cli-kit/node/error'\nimport {renderTasks} from '@shopify/cli-kit/node/ui'\n\ntype Target = 'node' | 'client' | 'worker'\n\ninterface DevOptions {\n directory: string\n targets: {[key in Target]: boolean | string}\n base?: string\n assetBaseURL?: string\n verbose?: boolean\n}\n\nexport function buildTaskList({directory, targets, base, assetBaseURL, verbose}: DevOptions) {\n const commonConfig = {base, root: directory}\n\n return Object.entries(targets)\n .filter(([_, value]) => value)\n .map(([key, value]) => ({\n title: `Building ${key} code`,\n task: async () => {\n if (key === 'worker') {\n process.env.WORKER = 'true'\n }\n if (assetBaseURL) {\n process.env.HYDROGEN_ASSET_BASE_URL = assetBaseURL\n }\n\n try {\n await viteBuild({\n ...commonConfig,\n build: {\n outDir: `dist/${key}`,\n ssr: typeof value === 'string' ? value : undefined,\n manifest: key === 'client',\n },\n logLevel: verbose ? 'info' : 'silent',\n })\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n } catch (error: any) {\n const abortError = new AbortError(error.message)\n abortError.stack = error.stack\n throw abortError\n }\n },\n }))\n}\n\nexport async function build(options: DevOptions) {\n await checkLockfileStatus(options.directory)\n\n const tasks = await buildTaskList(options)\n\n await renderTasks(tasks)\n}\n"]}
|
|
@@ -11,7 +11,7 @@ export interface DeployConfig {
|
|
|
11
11
|
commitRef?: string;
|
|
12
12
|
timestamp?: string;
|
|
13
13
|
}
|
|
14
|
-
export
|
|
14
|
+
export type ReqDeployConfig = Required<DeployConfig>;
|
|
15
15
|
export interface OxygenError {
|
|
16
16
|
code: string;
|
|
17
17
|
unrecoverable: boolean;
|
|
@@ -40,7 +40,10 @@ export const uploadDeployment = async (config, deploymentID) => {
|
|
|
40
40
|
await inTemporaryDirectory(async (tmpDir) => {
|
|
41
41
|
const distPath = config.pathToBuild ? config.pathToBuild : `${config.path}/dist`;
|
|
42
42
|
const distZipPath = `${tmpDir}/dist.zip`;
|
|
43
|
-
await zip(
|
|
43
|
+
await zip({
|
|
44
|
+
inputDirectory: distPath,
|
|
45
|
+
outputZipPath: distZipPath,
|
|
46
|
+
});
|
|
44
47
|
const form = formData();
|
|
45
48
|
form.append('operations', buildOperationsString(deploymentID));
|
|
46
49
|
form.append('map', JSON.stringify({ '0': ['variables.file'] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/cli/services/deploy/upload.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,qBAAqB,GACtB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAC,qBAAqB,EAAC,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAC,GAAG,EAAC,MAAM,gCAAgC,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAC,0BAA0B,EAAE,aAAa,EAAC,MAAM,kCAAkC,CAAA;AAC1F,OAAO,EAAC,oBAAoB,EAAE,oBAAoB,EAAC,MAAM,0BAA0B,CAAA;AACnF,OAAO,EAAC,KAAK,EAAE,QAAQ,EAAC,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAA;AAEtD,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAuB,EAAqC,EAAE;IACnG,MAAM,SAAS,GAAG;QAChB,KAAK,EAAE;YACL,MAAM,EAAE,MAAM,CAAC,SAAS;YACxB,UAAU,EAAE,MAAM,CAAC,SAAS;YAC5B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,eAAe,EAAE,MAAM,CAAC,SAAS;SAClC;KACF,CAAA;IAED,IAAI;QACF,MAAM,QAAQ,GAAgC,MAAM,aAAa,CAC/D,MAAM,CAAC,aAAa,EACpB,qBAAqB,EACrB,MAAM,CAAC,eAAe,EACtB,SAAS,CACV,CAAA;QAED,IAAI,QAAQ,CAAC,gBAAgB,EAAE,KAAK,EAAE;YACpC,IAAI,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,aAAa,EAAE;gBACjD,MAAM,IAAI,UAAU,CAAC,kBAAkB,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;aACpF;YAED,MAAM,IAAI,UAAU,CAAC,gCAAgC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;SAClG;QAED,OAAO,QAAQ,CAAC,gBAAgB,CAAA;KACjC;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,YAAY,WAAW,EAAE;YAChC,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;gBACjC,MAAM,IAAI,UAAU,CAAC,uDAAuD,CAAC,CAAA;aAC9E;SACF;QAED,MAAM,KAAK,CAAA;KACZ;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAuB,EAAE,YAAoB,EAAmB,EAAE;IACvG,IAAI,cAAoD,CAAA;IAExD,MAAM,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,OAAO,CAAA;QAChF,MAAM,WAAW,GAAG,GAAG,MAAM,WAAW,CAAA;QACxC,MAAM,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/cli/services/deploy/upload.ts"],"names":[],"mappings":"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","sourcesContent":["import {ReqDeployConfig, UploadDeploymentResponse} from './types.js'\nimport {\n CreateDeploymentResponse,\n CreateDeploymentQuerySchema,\n CreateDeploymentQuery,\n} from './graphql/create_deployment.js'\nimport {UploadDeploymentQuery} from './graphql/upload_deployment.js'\nimport {zip} from '@shopify/cli-kit/node/archiver'\nimport {ClientError} from 'graphql-request'\nimport {uploadOxygenDeploymentFile, oxygenRequest} from '@shopify/cli-kit/node/api/oxygen'\nimport {inTemporaryDirectory, createFileReadStream} from '@shopify/cli-kit/node/fs'\nimport {fetch, formData} from '@shopify/cli-kit/node/http'\nimport {AbortError} from '@shopify/cli-kit/node/error'\n\nexport const createDeployment = async (config: ReqDeployConfig): Promise<CreateDeploymentResponse> => {\n const variables = {\n input: {\n branch: config.commitRef,\n commitHash: config.commitSha,\n commitAuthor: config.commitAuthor,\n commitMessage: config.commitMessage,\n commitTimestamp: config.timestamp,\n },\n }\n\n try {\n const response: CreateDeploymentQuerySchema = await oxygenRequest(\n config.oxygenAddress,\n CreateDeploymentQuery,\n config.deploymentToken,\n variables,\n )\n\n if (response.createDeployment?.error) {\n if (response.createDeployment.error.unrecoverable) {\n throw new AbortError(`Unrecoverable: ${response.createDeployment.error.debugInfo}`)\n }\n\n throw new AbortError(`Failed to create deployment. ${response.createDeployment.error.debugInfo}`)\n }\n\n return response.createDeployment\n } catch (error) {\n if (error instanceof ClientError) {\n if (error.response.status === 429) {\n throw new AbortError(\"You've made too many requests. Please try again later\")\n }\n }\n\n throw error\n }\n}\n\nexport const uploadDeployment = async (config: ReqDeployConfig, deploymentID: string): Promise<string> => {\n let deploymentData: UploadDeploymentResponse | undefined\n\n await inTemporaryDirectory(async (tmpDir) => {\n const distPath = config.pathToBuild ? config.pathToBuild : `${config.path}/dist`\n const distZipPath = `${tmpDir}/dist.zip`\n await zip({\n inputDirectory: distPath,\n outputZipPath: distZipPath,\n })\n\n const form = formData()\n form.append('operations', buildOperationsString(deploymentID))\n form.append('map', JSON.stringify({'0': ['variables.file']}))\n form.append('0', createFileReadStream(distZipPath), {filename: distZipPath})\n\n const response = await uploadOxygenDeploymentFile(config.oxygenAddress, config.deploymentToken, form)\n if (!response.ok) {\n if (response.status === 429) {\n throw new AbortError(\"You've made too many requests. Please try again later\")\n }\n if (response.status !== 200 && response.status !== 202) {\n throw new AbortError(`Failed to upload deployment. ${await response.json()}`)\n }\n }\n\n deploymentData = (await response.json()) as UploadDeploymentResponse\n })\n\n if (!deploymentData) {\n throw new AbortError('Failed to upload deployment.')\n }\n const deploymentError = deploymentData.data?.uploadDeployment?.error\n if (deploymentError) {\n if (deploymentError.unrecoverable) {\n throw new AbortError(`Unrecoverable: ${deploymentError.debugInfo}`)\n }\n\n throw new AbortError(`Failed to upload deployment: ${deploymentError.debugInfo}`)\n }\n\n return deploymentData.data.uploadDeployment.deployment.previewURL\n}\n\nexport const healthCheck = async (pingUrl: string) => {\n const url = `${pingUrl}/__health`\n const result = await fetch(url, {method: 'GET'})\n if (result.status !== 200) throw new AbortError('Web page not available.')\n}\n\nconst buildOperationsString = (deploymentID: string): string => {\n return JSON.stringify({\n query: UploadDeploymentQuery,\n variables: {deploymentID, file: null},\n })\n}\n"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { DeployConfig } from './deploy/types.js';
|
|
2
|
-
export declare function deployToOxygen(_config: DeployConfig): Promise<
|
|
2
|
+
export declare function deployToOxygen(_config: DeployConfig): Promise<void>;
|
|
@@ -1,35 +1,33 @@
|
|
|
1
1
|
import { createDeployment, healthCheck, uploadDeployment } from './deploy/upload.js';
|
|
2
2
|
import { buildTaskList } from './build.js';
|
|
3
3
|
import { validateProject, fillDeployConfig } from './deploy/config.js';
|
|
4
|
-
import { ui } from '@shopify/cli-kit';
|
|
5
4
|
import { sleep } from '@shopify/cli-kit/node/system';
|
|
6
5
|
import { isUnitTest } from '@shopify/cli-kit/node/environment/local';
|
|
6
|
+
import { renderTasks, renderWarning } from '@shopify/cli-kit/node/ui';
|
|
7
7
|
const backoffPolicy = [5, 10, 15, 30, 60];
|
|
8
8
|
export async function deployToOxygen(_config) {
|
|
9
9
|
await validateProject(_config);
|
|
10
10
|
/* eslint-disable require-atomic-updates */
|
|
11
11
|
const tasks = [
|
|
12
12
|
{
|
|
13
|
-
title: '
|
|
14
|
-
task: async (ctx
|
|
13
|
+
title: 'Getting deployment config',
|
|
14
|
+
task: async (ctx) => {
|
|
15
15
|
ctx.config = await fillDeployConfig(_config);
|
|
16
|
-
task.title = '📝 Deployment config parsed';
|
|
17
16
|
},
|
|
18
17
|
},
|
|
19
18
|
{
|
|
20
|
-
title: '
|
|
19
|
+
title: 'Initializing deployment',
|
|
21
20
|
task: async (ctx, task) => {
|
|
22
21
|
await shouldRetryOxygenCall(task, 'Could not create deployment on Oxygen.');
|
|
23
22
|
const { deploymentID, assetBaseURL } = await createDeployment(ctx.config);
|
|
24
23
|
ctx.assetBaseURL = assetBaseURL;
|
|
25
24
|
ctx.deploymentID = deploymentID;
|
|
26
|
-
task.title = '✨ Deployment initialized';
|
|
27
25
|
},
|
|
28
26
|
retry: backoffPolicy.length,
|
|
29
27
|
},
|
|
30
28
|
{
|
|
31
|
-
title: '
|
|
32
|
-
task: async (ctx
|
|
29
|
+
title: 'Building project',
|
|
30
|
+
task: async (ctx) => {
|
|
33
31
|
const subTasks = buildTaskList({
|
|
34
32
|
directory: ctx.config.path,
|
|
35
33
|
targets: {
|
|
@@ -39,60 +37,57 @@ export async function deployToOxygen(_config) {
|
|
|
39
37
|
},
|
|
40
38
|
assetBaseURL: ctx.assetBaseURL,
|
|
41
39
|
});
|
|
42
|
-
return
|
|
40
|
+
return subTasks;
|
|
43
41
|
},
|
|
44
|
-
skip: (ctx) => ctx.config.pathToBuild,
|
|
42
|
+
skip: (ctx) => Boolean(ctx.config.pathToBuild),
|
|
45
43
|
},
|
|
46
44
|
{
|
|
47
|
-
title: '
|
|
45
|
+
title: 'Uploading deployment files',
|
|
48
46
|
task: async (ctx, task) => {
|
|
49
47
|
await shouldRetryOxygenCall(task, 'Uploading files to Oxygen failed.');
|
|
50
48
|
ctx.previewURL = await uploadDeployment(ctx.config, ctx.deploymentID);
|
|
51
|
-
task.output = `Preview URL: ${ctx.previewURL}`;
|
|
52
|
-
task.title = '🚀 Files uploaded';
|
|
53
|
-
},
|
|
54
|
-
options: {
|
|
55
|
-
bottomBar: Infinity,
|
|
56
|
-
persistentOutput: true,
|
|
57
49
|
},
|
|
58
50
|
retry: backoffPolicy.length,
|
|
59
51
|
},
|
|
60
52
|
{
|
|
61
|
-
title: '
|
|
53
|
+
title: 'Checking deployment health',
|
|
62
54
|
task: async (ctx, task) => {
|
|
63
|
-
const retryCount = task.
|
|
55
|
+
const retryCount = task.retryCount;
|
|
64
56
|
if (retryCount === backoffPolicy.length) {
|
|
65
|
-
|
|
66
|
-
"The deployment uploaded but hasn't become reachable within 2 minutes. Check the preview URL to see if deployment succeeded. If it didn't, then try again later.";
|
|
67
|
-
return;
|
|
57
|
+
throw new Error(`Deployment health check failed.`);
|
|
68
58
|
}
|
|
69
59
|
if (retryCount && !isUnitTest())
|
|
70
60
|
await sleep(backoffPolicy[retryCount - 1]);
|
|
71
61
|
await healthCheck(ctx.previewURL);
|
|
72
|
-
task.title = '✅ Deployed successfully';
|
|
73
62
|
},
|
|
74
63
|
retry: backoffPolicy.length,
|
|
75
64
|
skip: (ctx) => !ctx.config.healthCheck,
|
|
76
65
|
},
|
|
77
66
|
];
|
|
78
67
|
/* eslint-enable require-atomic-updates */
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
68
|
+
try {
|
|
69
|
+
await renderTasks(tasks);
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
if (error instanceof Error && error.message === 'Deployment health check failed.') {
|
|
73
|
+
renderWarning({
|
|
74
|
+
headline: "The deployment uploaded but hasn't become reachable within 2 minutes. Check the preview URL to see if deployment succeeded. If it didn't, then try again later.",
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
throw error;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
85
81
|
}
|
|
86
|
-
async function shouldRetryOxygenCall(
|
|
87
|
-
|
|
88
|
-
task
|
|
89
|
-
const retryCount = task.isRetrying()?.count;
|
|
82
|
+
async function shouldRetryOxygenCall(task, errorMessage) {
|
|
83
|
+
const retryCount = task.retryCount;
|
|
84
|
+
const taskErrors = task.errors ?? [];
|
|
90
85
|
if (retryCount === backoffPolicy.length) {
|
|
91
|
-
throw new Error(`${errorMessage} ${
|
|
86
|
+
throw new Error(`${errorMessage} ${taskErrors[taskErrors.length - 1]?.message}`);
|
|
92
87
|
}
|
|
93
88
|
if (retryCount) {
|
|
94
|
-
if (
|
|
95
|
-
const unrecoverableError =
|
|
89
|
+
if (taskErrors.length > 0) {
|
|
90
|
+
const unrecoverableError = taskErrors.find((error) => error.message.includes('Unrecoverable'));
|
|
96
91
|
if (unrecoverableError) {
|
|
97
92
|
throw new Error(unrecoverableError.message);
|
|
98
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/cli/services/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAE,gBAAgB,EAAC,MAAM,oBAAoB,CAAA;AAClF,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAA;AACxC,OAAO,EAAC,eAAe,EAAE,gBAAgB,EAAC,MAAM,oBAAoB,CAAA;AACpE,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/cli/services/deploy.ts"],"names":[],"mappings":"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","sourcesContent":["import {DeployConfig, ReqDeployConfig} from './deploy/types.js'\nimport {createDeployment, healthCheck, uploadDeployment} from './deploy/upload.js'\nimport {buildTaskList} from './build.js'\nimport {validateProject, fillDeployConfig} from './deploy/config.js'\nimport {sleep} from '@shopify/cli-kit/node/system'\nimport {isUnitTest} from '@shopify/cli-kit/node/environment/local'\nimport {Task, renderTasks, renderWarning} from '@shopify/cli-kit/node/ui'\n\ninterface TaskContext {\n config: ReqDeployConfig\n deploymentID: string\n assetBaseURL: string\n previewURL: string\n}\n\nconst backoffPolicy = [5, 10, 15, 30, 60]\n\nexport async function deployToOxygen(_config: DeployConfig) {\n await validateProject(_config)\n\n /* eslint-disable require-atomic-updates */\n const tasks: Task<TaskContext>[] = [\n {\n title: 'Getting deployment config',\n task: async (ctx) => {\n ctx.config = await fillDeployConfig(_config)\n },\n },\n {\n title: 'Initializing deployment',\n task: async (ctx, task) => {\n await shouldRetryOxygenCall(task, 'Could not create deployment on Oxygen.')\n\n const {deploymentID, assetBaseURL} = await createDeployment(ctx.config)\n ctx.assetBaseURL = assetBaseURL\n ctx.deploymentID = deploymentID\n },\n retry: backoffPolicy.length,\n },\n {\n title: 'Building project',\n task: async (ctx) => {\n const subTasks = buildTaskList({\n directory: ctx.config.path,\n targets: {\n client: true,\n worker: '@shopify/hydrogen/platforms/worker',\n node: false,\n },\n assetBaseURL: ctx.assetBaseURL,\n })\n\n return subTasks\n },\n skip: (ctx) => Boolean(ctx.config.pathToBuild),\n },\n {\n title: 'Uploading deployment files',\n task: async (ctx, task) => {\n await shouldRetryOxygenCall(task, 'Uploading files to Oxygen failed.')\n\n ctx.previewURL = await uploadDeployment(ctx.config, ctx.deploymentID)\n },\n retry: backoffPolicy.length,\n },\n {\n title: 'Checking deployment health',\n task: async (ctx, task) => {\n const retryCount = task.retryCount\n\n if (retryCount === backoffPolicy.length) {\n throw new Error(`Deployment health check failed.`)\n }\n\n if (retryCount && !isUnitTest()) await sleep(backoffPolicy[retryCount - 1]!)\n\n await healthCheck(ctx.previewURL)\n },\n retry: backoffPolicy.length,\n skip: (ctx) => !ctx.config.healthCheck,\n },\n ]\n /* eslint-enable require-atomic-updates */\n\n try {\n await renderTasks(tasks)\n } catch (error: unknown) {\n if (error instanceof Error && error.message === 'Deployment health check failed.') {\n renderWarning({\n headline:\n \"The deployment uploaded but hasn't become reachable within 2 minutes. Check the preview URL to see if deployment succeeded. If it didn't, then try again later.\",\n })\n } else {\n throw error\n }\n }\n}\n\nasync function shouldRetryOxygenCall(task: Task<TaskContext>, errorMessage: string) {\n const retryCount = task.retryCount\n const taskErrors = task.errors ?? []\n if (retryCount === backoffPolicy.length) {\n throw new Error(`${errorMessage} ${taskErrors[taskErrors.length - 1]?.message}`)\n }\n if (retryCount) {\n if (taskErrors.length > 0) {\n const unrecoverableError = taskErrors.find((error) => error.message.includes('Unrecoverable'))\n if (unrecoverableError) {\n throw new Error(unrecoverableError.message)\n }\n }\n }\n if (retryCount && !isUnitTest()) await sleep(backoffPolicy[retryCount - 1]!)\n}\n"]}
|
|
@@ -1,42 +1,28 @@
|
|
|
1
1
|
import { genericConfigurationFileNames } from '../constants.js';
|
|
2
|
-
import { ui } from '@shopify/cli-kit';
|
|
3
2
|
import { addNPMDependenciesWithoutVersionIfNeeded, findUpAndReadPackageJson, writePackageJSON, } from '@shopify/cli-kit/node/node-package-manager';
|
|
4
3
|
import { addRecommendedExtensions, isVSCode } from '@shopify/cli-kit/node/vscode';
|
|
5
|
-
import { isUnitTest } from '@shopify/cli-kit/node/environment/local';
|
|
6
4
|
import { writeFile, fileExists, removeFile, fileContentPrettyFormat } from '@shopify/cli-kit/node/fs';
|
|
7
5
|
import { joinPath } from '@shopify/cli-kit/node/path';
|
|
8
6
|
import { AbortError } from '@shopify/cli-kit/node/error';
|
|
9
|
-
import
|
|
7
|
+
import { renderTasks } from '@shopify/cli-kit/node/ui';
|
|
10
8
|
export async function addESLint({ app, force, install }) {
|
|
11
|
-
const
|
|
9
|
+
const vscode = await isVSCode(app.directory);
|
|
10
|
+
const tasks = [
|
|
12
11
|
{
|
|
13
|
-
title: 'Installing
|
|
12
|
+
title: 'Installing dependencies',
|
|
14
13
|
skip: () => !install,
|
|
15
|
-
task: async (
|
|
14
|
+
task: async () => {
|
|
16
15
|
const requiredDependencies = ['eslint', 'eslint-plugin-hydrogen', 'prettier', '@shopify/prettier-config'];
|
|
17
16
|
await addNPMDependenciesWithoutVersionIfNeeded(requiredDependencies, {
|
|
18
17
|
packageManager: app.packageManager,
|
|
19
18
|
type: 'prod',
|
|
20
19
|
directory: app.directory,
|
|
21
|
-
stderr: new stream.Writable({
|
|
22
|
-
write(chunk, encoding, next) {
|
|
23
|
-
task.output = chunk.toString();
|
|
24
|
-
next();
|
|
25
|
-
},
|
|
26
|
-
}),
|
|
27
|
-
stdout: new stream.Writable({
|
|
28
|
-
write(chunk, encoding, next) {
|
|
29
|
-
task.output = chunk.toString();
|
|
30
|
-
next();
|
|
31
|
-
},
|
|
32
|
-
}),
|
|
33
20
|
});
|
|
34
|
-
task.title = 'Dependencies installed';
|
|
35
21
|
},
|
|
36
22
|
},
|
|
37
23
|
{
|
|
38
24
|
title: 'Adding ESLint configuration',
|
|
39
|
-
task: async (
|
|
25
|
+
task: async () => {
|
|
40
26
|
const eslintConfigPath = joinPath(app.directory, genericConfigurationFileNames.eslint);
|
|
41
27
|
if (await fileExists(eslintConfigPath)) {
|
|
42
28
|
if (force) {
|
|
@@ -52,29 +38,26 @@ export async function addESLint({ app, force, install }) {
|
|
|
52
38
|
}
|
|
53
39
|
const eslintConfig = await fileContentPrettyFormat(['module.exports = {', 'extends: [', `${extended.join(',')}`, ' ],', ' };'].join('\n'), { path: genericConfigurationFileNames.eslint });
|
|
54
40
|
await writeFile(eslintConfigPath, eslintConfig);
|
|
55
|
-
task.title = 'ESLint configuration added';
|
|
56
41
|
},
|
|
57
42
|
},
|
|
58
43
|
{
|
|
59
44
|
title: 'Updating package.json',
|
|
60
|
-
task: async (
|
|
45
|
+
task: async () => {
|
|
61
46
|
const packageJSON = (await findUpAndReadPackageJson(app.directory)).content;
|
|
62
47
|
packageJSON.scripts = packageJSON.scripts || {};
|
|
63
48
|
packageJSON.scripts.lint = `eslint --ext .js,.ts,.jsx,.tsx src/`;
|
|
64
49
|
packageJSON.prettier = '@shopify/prettier-config';
|
|
65
50
|
await writePackageJSON(app.directory, packageJSON);
|
|
66
|
-
task.title = 'Package.json updated';
|
|
67
51
|
},
|
|
68
52
|
},
|
|
69
53
|
{
|
|
70
54
|
title: 'Adding editor plugin recommendations',
|
|
71
|
-
skip:
|
|
72
|
-
task: async (
|
|
55
|
+
skip: () => !vscode,
|
|
56
|
+
task: async () => {
|
|
73
57
|
await addRecommendedExtensions(app.directory, ['dbaeumer.vscode-eslint']);
|
|
74
|
-
task.title = 'Editor plugin recommendations added';
|
|
75
58
|
},
|
|
76
59
|
},
|
|
77
|
-
]
|
|
78
|
-
await
|
|
60
|
+
];
|
|
61
|
+
await renderTasks(tasks);
|
|
79
62
|
}
|
|
80
63
|
//# sourceMappingURL=eslint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/services/eslint.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,6BAA6B,EAAC,MAAM,iBAAiB,CAAA;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/services/eslint.ts"],"names":[],"mappings":"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","sourcesContent":["import {HydrogenApp} from '../models/hydrogen.js'\nimport {genericConfigurationFileNames} from '../constants.js'\nimport {\n addNPMDependenciesWithoutVersionIfNeeded,\n findUpAndReadPackageJson,\n writePackageJSON,\n} from '@shopify/cli-kit/node/node-package-manager'\nimport {addRecommendedExtensions, isVSCode} from '@shopify/cli-kit/node/vscode'\nimport {writeFile, fileExists, removeFile, fileContentPrettyFormat} from '@shopify/cli-kit/node/fs'\nimport {joinPath} from '@shopify/cli-kit/node/path'\nimport {AbortError} from '@shopify/cli-kit/node/error'\nimport {renderTasks, Task} from '@shopify/cli-kit/node/ui'\n\ninterface AddESlintOptions {\n app: HydrogenApp\n force: boolean\n install: boolean\n}\n\nexport async function addESLint({app, force, install}: AddESlintOptions) {\n const vscode = await isVSCode(app.directory)\n\n const tasks: Task[] = [\n {\n title: 'Installing dependencies',\n skip: () => !install,\n task: async () => {\n const requiredDependencies = ['eslint', 'eslint-plugin-hydrogen', 'prettier', '@shopify/prettier-config']\n await addNPMDependenciesWithoutVersionIfNeeded(requiredDependencies, {\n packageManager: app.packageManager,\n type: 'prod',\n directory: app.directory,\n })\n },\n },\n\n {\n title: 'Adding ESLint configuration',\n task: async () => {\n const eslintConfigPath = joinPath(app.directory, genericConfigurationFileNames.eslint)\n\n if (await fileExists(eslintConfigPath)) {\n if (force) {\n await removeFile(eslintConfigPath)\n } else {\n throw new AbortError('ESLint config already exists.', 'Use --force to override existing config.')\n }\n }\n\n const extended = [`'plugin:hydrogen/recommended'`]\n\n if (app.language === 'TypeScript') {\n extended.push(`'plugin:hydrogen/typescript'`)\n }\n\n const eslintConfig = await fileContentPrettyFormat(\n ['module.exports = {', 'extends: [', `${extended.join(',')}`, ' ],', ' };'].join('\\n'),\n {path: genericConfigurationFileNames.eslint},\n )\n\n await writeFile(eslintConfigPath, eslintConfig)\n },\n },\n {\n title: 'Updating package.json',\n task: async () => {\n const packageJSON = (await findUpAndReadPackageJson(app.directory)).content\n packageJSON.scripts = packageJSON.scripts || {}\n packageJSON.scripts.lint = `eslint --ext .js,.ts,.jsx,.tsx src/`\n\n packageJSON.prettier = '@shopify/prettier-config'\n\n await writePackageJSON(app.directory, packageJSON)\n },\n },\n {\n title: 'Adding editor plugin recommendations',\n skip: () => !vscode,\n task: async () => {\n await addRecommendedExtensions(app.directory, ['dbaeumer.vscode-eslint'])\n },\n },\n ]\n await renderTasks(tasks)\n}\n"]}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { ui } from '@shopify/cli-kit';
|
|
2
1
|
import { addNPMDependenciesWithoutVersionIfNeeded } from '@shopify/cli-kit/node/node-package-manager';
|
|
3
2
|
import { addRecommendedExtensions } from '@shopify/cli-kit/node/vscode';
|
|
4
3
|
import { exec } from '@shopify/cli-kit/node/system';
|
|
5
4
|
import { writeFile, fileExists, removeFile, fileContentPrettyFormat, readFile } from '@shopify/cli-kit/node/fs';
|
|
6
5
|
import { joinPath } from '@shopify/cli-kit/node/path';
|
|
7
6
|
import { AbortError } from '@shopify/cli-kit/node/error';
|
|
8
|
-
import
|
|
7
|
+
import { renderTasks } from '@shopify/cli-kit/node/ui';
|
|
9
8
|
const tailwindImports = [
|
|
10
9
|
"@import 'tailwindcss/base';",
|
|
11
10
|
"@import 'tailwindcss/components';",
|
|
@@ -13,35 +12,22 @@ const tailwindImports = [
|
|
|
13
12
|
];
|
|
14
13
|
const tailwindImportsExist = (indexCSS) => tailwindImports.map((el) => new RegExp(el)).every((tailwindDirective) => tailwindDirective.test(indexCSS));
|
|
15
14
|
export async function addTailwind({ app, force, install, directory }) {
|
|
16
|
-
const
|
|
15
|
+
const tasks = [
|
|
17
16
|
{
|
|
18
|
-
title: 'Installing
|
|
17
|
+
title: 'Installing dependencies',
|
|
19
18
|
skip: () => !install,
|
|
20
|
-
task: async (
|
|
19
|
+
task: async () => {
|
|
21
20
|
const requiredDependencies = ['postcss', 'postcss-loader', 'tailwindcss', 'autoprefixer'];
|
|
22
21
|
await addNPMDependenciesWithoutVersionIfNeeded(requiredDependencies, {
|
|
23
22
|
packageManager: app.packageManager,
|
|
24
23
|
type: 'prod',
|
|
25
24
|
directory: app.directory,
|
|
26
|
-
stderr: new stream.Writable({
|
|
27
|
-
write(chunk, encoding, next) {
|
|
28
|
-
task.output = chunk.toString();
|
|
29
|
-
next();
|
|
30
|
-
},
|
|
31
|
-
}),
|
|
32
|
-
stdout: new stream.Writable({
|
|
33
|
-
write(chunk, encoding, next) {
|
|
34
|
-
task.output = chunk.toString();
|
|
35
|
-
next();
|
|
36
|
-
},
|
|
37
|
-
}),
|
|
38
25
|
});
|
|
39
|
-
task.title = 'Dependencies installed';
|
|
40
26
|
},
|
|
41
27
|
},
|
|
42
28
|
{
|
|
43
29
|
title: 'Adding PostCSS configuration',
|
|
44
|
-
task: async (
|
|
30
|
+
task: async () => {
|
|
45
31
|
const postCSSConfiguration = joinPath(directory, 'postcss.config.js');
|
|
46
32
|
if (await fileExists(postCSSConfiguration)) {
|
|
47
33
|
if (force) {
|
|
@@ -53,12 +39,11 @@ export async function addTailwind({ app, force, install, directory }) {
|
|
|
53
39
|
}
|
|
54
40
|
const postCSSConfig = await fileContentPrettyFormat(['module.exports = {', 'plugins: {', 'tailwindcss: {},', 'autoprefixer: {},', '},', ' };'].join('\n'), { path: 'postcss.config.js' });
|
|
55
41
|
await writeFile(postCSSConfiguration, postCSSConfig);
|
|
56
|
-
task.title = 'PostCSS configuration added';
|
|
57
42
|
},
|
|
58
43
|
},
|
|
59
44
|
{
|
|
60
45
|
title: 'Initializing Tailwind CSS...',
|
|
61
|
-
task: async (
|
|
46
|
+
task: async () => {
|
|
62
47
|
const tailwindConfigurationPath = joinPath(directory, 'tailwind.config.js');
|
|
63
48
|
if (await fileExists(tailwindConfigurationPath)) {
|
|
64
49
|
if (force) {
|
|
@@ -72,7 +57,6 @@ export async function addTailwind({ app, force, install, directory }) {
|
|
|
72
57
|
cwd: directory,
|
|
73
58
|
});
|
|
74
59
|
await replace('content: []', "content: ['./index.html', './src/**/*.{js,jsx,ts,tsx}']", tailwindConfigurationPath);
|
|
75
|
-
task.title = 'Tailwind configuration added';
|
|
76
60
|
},
|
|
77
61
|
},
|
|
78
62
|
{
|
|
@@ -80,25 +64,20 @@ export async function addTailwind({ app, force, install, directory }) {
|
|
|
80
64
|
task: async (_ctx, task) => {
|
|
81
65
|
const indexCSSPath = joinPath(directory, 'src', 'index.css');
|
|
82
66
|
const indexCSS = await readFile(indexCSSPath);
|
|
83
|
-
if (tailwindImportsExist(indexCSS)) {
|
|
84
|
-
task.skip('Imports already exist in index.css');
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
67
|
+
if (!tailwindImportsExist(indexCSS)) {
|
|
87
68
|
const newIndexCSS = tailwindImports.join('\n') + indexCSS;
|
|
88
69
|
await writeFile(indexCSSPath, newIndexCSS);
|
|
89
70
|
}
|
|
90
|
-
task.title = 'Tailwind imports added';
|
|
91
71
|
},
|
|
92
72
|
},
|
|
93
73
|
{
|
|
94
74
|
title: 'Adding editor plugin recommendations',
|
|
95
|
-
task: async (
|
|
75
|
+
task: async () => {
|
|
96
76
|
await addRecommendedExtensions(directory, ['csstools.postcss', 'bradlc.vscode-tailwindcss']);
|
|
97
|
-
task.title = 'Editor plugin recommendations added';
|
|
98
77
|
},
|
|
99
78
|
},
|
|
100
|
-
]
|
|
101
|
-
await
|
|
79
|
+
];
|
|
80
|
+
await renderTasks(tasks);
|
|
102
81
|
}
|
|
103
82
|
async function replace(find, replace, filepath) {
|
|
104
83
|
const original = await readFile(filepath);
|