diff --git a/.nvmrc b/.nvmrc index 209e3ef..a45fd52 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20 +24 diff --git a/package-lock.json b/package-lock.json index 3820177..ddcf5aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@emulsify/cli", - "version": "1.12.0", + "version": "1.12.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@emulsify/cli", - "version": "1.12.0", + "version": "1.12.1", "license": "GPL-2.0", "dependencies": { "@types/progress": "^2.0.5", @@ -51,7 +51,7 @@ "typescript": "^4.5.2" }, "engines": { - "node": ">=16.13" + "node": ">=24" } }, "node_modules/@ampproject/remapping": { @@ -111,6 +111,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz", "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==", "dev": true, + "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.7", @@ -1739,6 +1740,7 @@ "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.2.tgz", "integrity": "sha512-hEb7Ma4cGJGEUNOAVmyfdB/3WirWMg5hDuNFVejGEDFqupeOysLc2sG6HJxY2etBp5YQu5Wtxwi020jS9xlUwg==", "dev": true, + "peer": true, "dependencies": { "@octokit/auth-token": "^5.0.0", "@octokit/graphql": "^8.0.0", @@ -2358,6 +2360,7 @@ "version": "20.14.13", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.13.tgz", "integrity": "sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==", + "peer": true, "dependencies": { "undici-types": "~5.26.4" } @@ -2444,6 +2447,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", "dev": true, + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "7.18.0", "@typescript-eslint/types": "7.18.0", @@ -2631,6 +2635,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "dev": true, + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3036,6 +3041,7 @@ "url": "https://github.com/sponsors/ai" } ], + "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001640", "electron-to-chromium": "^1.4.820", @@ -3649,6 +3655,7 @@ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", "dev": true, + "peer": true, "dependencies": { "env-paths": "^2.2.1", "import-fresh": "^3.3.0", @@ -4087,6 +4094,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4142,6 +4150,7 @@ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, + "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -5638,6 +5647,7 @@ "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, + "peer": true, "dependencies": { "@jest/core": "^29.7.0", "@jest/types": "^29.6.3", @@ -6927,6 +6937,7 @@ "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.2.tgz", "integrity": "sha512-qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q==", "dev": true, + "peer": true, "bin": { "marked": "bin/marked.js" }, @@ -10458,6 +10469,7 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -10970,6 +10982,7 @@ "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-23.1.1.tgz", "integrity": "sha512-qqJDBhbtHsjUEMsojWKGuL5lQFCJuPtiXKEIlFKyTzDDGTAE/oyvznaP8GeOr5PvcqBJ6LQz4JCENWPLeehSpA==", "dev": true, + "peer": true, "dependencies": { "@semantic-release/commit-analyzer": "^12.0.0", "@semantic-release/error": "^4.0.0", @@ -11974,6 +11987,7 @@ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, + "peer": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", @@ -12068,6 +12082,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true, + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index 60d42c1..a428d71 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "name": "@emulsify/cli", - "version": "1.12.0", + "version": "1.12.1", "description": "Command line interface for Emulsify", "repository": "git@github.com:emulsify-ds/emulsify-cli.git", "author": "Patrick Coffey ", "license": "GPL-2.0", "private": false, "engines": { - "node": ">=16.13" + "node": ">=24" }, "bin": { "emulsify": "dist/index.js" diff --git a/src/handlers/init.test.ts b/src/handlers/init.test.ts index c4bf5fb..2d6e1fe 100644 --- a/src/handlers/init.test.ts +++ b/src/handlers/init.test.ts @@ -43,7 +43,7 @@ describe('init', () => { expect.assertions(3); await init(progress)('cornflake'); expect(gitCloneMock).toHaveBeenCalledWith( - 'https://github.com/emulsify-ds/emulsify-drupal.git', + 'https://github.com/emulsify-ds/emulsify-drupal-starter.git', '/home/uname/Projects/cornflake/themes/cornflake', { '--branch': 'main' }, ); @@ -60,7 +60,8 @@ describe('init', () => { name: 'cornflake', }, starter: { - repository: 'https://github.com/emulsify-ds/emulsify-drupal.git', + repository: + 'https://github.com/emulsify-ds/emulsify-drupal-starter.git', }, }, ); @@ -150,7 +151,7 @@ describe('init', () => { await init(progress)('cornflake'); expect(logMock).toHaveBeenCalledWith( 'error', - 'Unable to pull down https://github.com/emulsify-ds/emulsify-drupal.git: Error: Does not exist!', + 'Unable to pull down https://github.com/emulsify-ds/emulsify-drupal-starter.git: Error: Does not exist!', 1, ); }); @@ -176,7 +177,7 @@ describe('init', () => { await init(progress)('cornflake', root); expect(logMock).toHaveBeenCalledWith( 'error', - 'Unable to find an Emulsify starter for your project. Please specify one using the --starter flag: emulsify init myTheme --starter https://github.com/emulsify-ds/emulsify-drupal.git', + 'Unable to find an Emulsify starter for your project. Please specify one using the --starter flag: emulsify init myTheme --starter https://github.com/emulsify-ds/emulsify-drupal-starter.git', 1, ); }); diff --git a/src/index.ts b/src/index.ts index b2320c8..614cdbb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -26,7 +26,7 @@ program ) .option( '-s --starter ', - 'Git repository of the Emulsify starter you would like to use, such as the Emulsify Drupal theme: https://github.com/emulsify-ds/emulsify-drupal.git', + 'Git repository of the Emulsify starter you would like to use, such as the Emulsify Drupal theme: https://github.com/emulsify-ds/emulsify-drupal-starter.git', ) .option( '-c --checkout ', diff --git a/src/util/getAvailableStarters.test.ts b/src/util/getAvailableStarters.test.ts index c7b6eb6..8005bc1 100644 --- a/src/util/getAvailableStarters.test.ts +++ b/src/util/getAvailableStarters.test.ts @@ -9,7 +9,8 @@ describe('getAvailableStarters', () => { checkout: 'main', platform: 'drupal', platformMajorVersion: 11, - repository: 'https://github.com/emulsify-ds/emulsify-drupal.git', + repository: + 'https://github.com/emulsify-ds/emulsify-drupal-starter.git', }, ]; diff --git a/src/util/getAvailableStarters.ts b/src/util/getAvailableStarters.ts index 3137c2f..26cbcde 100644 --- a/src/util/getAvailableStarters.ts +++ b/src/util/getAvailableStarters.ts @@ -10,7 +10,7 @@ export default function getAvailableStarters(): EmulsifyStarter[] { { platform: 'drupal', platformMajorVersion: 11, - repository: 'https://github.com/emulsify-ds/emulsify-drupal.git', + repository: 'https://github.com/emulsify-ds/emulsify-drupal-starter.git', checkout: 'main', }, ]; diff --git a/src/util/getGitRepoNameFromUrl.test.ts b/src/util/getGitRepoNameFromUrl.test.ts index 347f0ee..850d853 100644 --- a/src/util/getGitRepoNameFromUrl.test.ts +++ b/src/util/getGitRepoNameFromUrl.test.ts @@ -12,9 +12,9 @@ describe('getGitRepoNameFromUrl', () => { expect.assertions(1); expect( getGitRepoNameFromUrl( - 'https://github.com/emulsify-ds/emulsify-drupal.git', + 'https://github.com/emulsify-ds/emulsify-drupal-starter.git', ), - ).toBe('emulsify-drupal'); + ).toBe('emulsify-drupal-starter'); }); it('can throw an Error if given an invalid git url', () => { @@ -23,7 +23,9 @@ describe('getGitRepoNameFromUrl', () => { getGitRepoNameFromUrl(''); }).toThrow(Error); expect(() => { - getGitRepoNameFromUrl('https://github.com/emulsify-ds/emulsify-drupal'); + getGitRepoNameFromUrl( + 'https://github.com/emulsify-ds/emulsify-drupal-starter', + ); }).toThrow(Error); }); });