Skip to content

Commit 97c9a9d

Browse files
authored
refacotr: renaming composable cli (#50)
* refactor: mason to composable - renaming all packages and repo from mason to composable * chore: changeset
1 parent 718e812 commit 97c9a9d

File tree

115 files changed

+55
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+55
-47
lines changed

.changeset/ten-clouds-poke.md

Lines changed: 8 additions & 0 deletions

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@elasticpath/mason",
2+
"name": "@elasticpath/composable-frontend",
33
"version": "0.0.0",
44
"private": true,
55
"workspaces": [
@@ -8,7 +8,7 @@
88
],
99
"scripts": {
1010
"build": "turbo run build",
11-
"generate": "turbo run generate --parallel --filter=!@elasticpath/mason-common",
11+
"generate": "turbo run generate --parallel --filter=!@elasticpath/composable-common",
1212
"dev": "turbo run dev --parallel",
1313
"lint": "turbo run lint",
1414
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
@@ -21,9 +21,9 @@
2121
"test:watch": "turbo run test:watch",
2222
"start:e2e": "turbo run start --filter='./examples/basic'",
2323
"test:e2e": "NODE_ENV=test yarn start:e2e & (sleep 5 && turbo run test:e2e --filter='./examples/basic' && kill $(lsof -t -i tcp:3000))",
24-
"build:cli": "turbo run build --filter=@elasticpath/mason-cli...",
24+
"build:cli": "turbo run build --filter=@elasticpath/composable-cli...",
2525
"build:packages": "turbo run build --filter='./packages/*'",
26-
"examples": "turbo run build --filter=@elasticpath/mason-cli... && yarn run scaffold:local",
26+
"examples": "turbo run build --filter=@elasticpath/composable-cli... && yarn run scaffold:local",
2727
"scaffold:local": "yarn ts-node ./scripts/generate-examples.ts"
2828
},
2929
"devDependencies": {

packages/mason-cli/CHANGELOG.md renamed to packages/composable-cli/CHANGELOG.md

Lines changed: 1 addition & 1 deletion

packages/mason-cli/package.json renamed to packages/composable-cli/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"name": "@elasticpath/mason-cli",
2+
"name": "@elasticpath/composable-cli",
33
"version": "0.5.2",
44
"description": "Elastic Path Commerce Cloud Schematics - CLI",
55
"repository": {
66
"type": "git",
7-
"directory": "packages/mason-cli"
7+
"directory": "packages/composable-cli"
88
},
99
"bin": {
10-
"mason-cli": "./bin/mason.js"
10+
"composable-cli": "./bin/composable.js"
1111
},
1212
"scripts": {
1313
"build": "rimraf ./dist/ && yarn mkdirp dist && tsup",
1414
"dev": "tsup --watch",
15-
"dev-old": "ncc build ./mason.ts -w -o dist/",
16-
"build-old": "rimraf ./dist/ && ncc build ./mason.ts -o ./dist/ --minify --no-cache --no-source-map-register",
15+
"dev-old": "ncc build ./composable.ts -w -o dist/",
16+
"build-old": "rimraf ./dist/ && ncc build ./composable.ts -o ./dist/ --minify --no-cache --no-source-map-register",
1717
"lint": "TIMING=1 eslint src/**/*.ts* --fix",
1818
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
1919
"test": "jest --passWithNoTests",
@@ -22,7 +22,7 @@
2222
"dependencies": {
2323
"@angular-devkit/core": "^14.1.0",
2424
"@angular-devkit/schematics": "^14.1.0",
25-
"@elasticpath/d2c-schematics": "^0.6.0",
25+
"@elasticpath/d2c-schematics": "*",
2626
"ansi-colors": "4.1.3",
2727
"inquirer": "8.2.4",
2828
"symbol-observable": "4.0.0",

packages/mason-cli/src/mason.ts renamed to packages/composable-cli/src/composable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import yargsParser, { camelCase, decamelize } from "yargs-parser"
2424
* and show usage.
2525
*
2626
* In the case where a collection name isn't part of the argument, the default is to use the
27-
* schematics package (@elasticpath/mason-cli) as the collection.
27+
* schematics package (@elasticpath/composable-cli) as the collection.
2828
*
2929
* This logic is entirely up to the tooling.
3030
*

packages/mason-cli/tsup.config.ts renamed to packages/composable-cli/tsup.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ export default defineConfig(({ env }) => {
99
}
1010
},
1111
entry: {
12-
"bin/mason": "src/mason.ts",
12+
"bin/composable": "src/composable.ts",
1313
},
1414
format: ["cjs"],
1515
dts: {
1616
entry: {
17-
"bin/mason": "src/mason.ts",
17+
"bin/composable": "src/composable.ts",
1818
},
1919
},
2020
clean: false,

packages/mason-common/CHANGELOG.md renamed to packages/composable-common/CHANGELOG.md

Lines changed: 1 addition & 1 deletion

packages/mason-common/package.json renamed to packages/composable-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@elasticpath/mason-common",
2+
"name": "@elasticpath/composable-common",
33
"version": "0.1.4",
44
"main": "./dist-cjs/index.js",
55
"types": "./dist-types/index.d.ts",

packages/mason-common/src/integration-hub/constants.ts renamed to packages/composable-common/src/integration-hub/constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ export const ALGOLIA_INTEGRATION_ID: Record<EpccRegion, string> = {
88
"us-east": "SW50ZWdyYXRpb246ZTAyMzcyODgtZjRiYi00YTliLWI0YzMtMjQ4MGI2MTM0Nzlh",
99
} as const
1010

11-
export const MASON_INTEGRATION_HUB_DEPLOYER_URL =
12-
"https://mason-integration-hub-deployer.netlify.app/.netlify/functions"
11+
export const COMPOSABLE_INTEGRATION_HUB_DEPLOYER_URL =
12+
"https://composable-integration-hub-deployer.netlify.app/.netlify/functions"

packages/mason-integration-hub-deployer/CHANGELOG.md renamed to packages/composable-integration-hub-deployer/CHANGELOG.md

Lines changed: 1 addition & 1 deletion

packages/mason-integration-hub-deployer/netlify/lib/jwt/customer-jwt-decode.ts renamed to packages/composable-integration-hub-deployer/netlify/lib/jwt/customer-jwt-decode.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { CustomerJwt, customerJwtSchema } from "./customer-jwt-schema"
33
import {
44
AlgoliaIntegrationCreateFailureResult,
55
resolveErrorResponse,
6-
} from "@elasticpath/mason-common"
6+
} from "@elasticpath/composable-common"
77

88
export function decodeCustomerJwt(
99
jwt: string

packages/mason-integration-hub-deployer/netlify/lib/procedures/create-integration-procedure.ts renamed to packages/composable-integration-hub-deployer/netlify/lib/procedures/create-integration-procedure.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
resolveErrorResponse,
1616
resolveIntegrationId,
1717
resolveRegion,
18-
} from "@elasticpath/mason-common"
18+
} from "@elasticpath/composable-common"
1919
import { protectedProcedure } from "../server"
2020
import { getSystemAccessToken } from "../get-system-access-token"
2121
import { initLogger } from "../logger/logger"
@@ -44,7 +44,7 @@ const logger = initLogger({
4444
? {
4545
datadog: {
4646
apiKey: process.env.DATADOG_API_KEY,
47-
service: "mason-integration-hub-deployer",
47+
service: "composable-integration-hub-deployer",
4848
},
4949
}
5050
: {}),

packages/mason-integration-hub-deployer/package.json renamed to packages/composable-integration-hub-deployer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@elasticpath/mason-integration-hub-deployer",
2+
"name": "@elasticpath/composable-integration-hub-deployer",
33
"version": "0.1.4",
44
"types": "./dist-types/index.d.ts",
55
"scripts": {
@@ -28,7 +28,7 @@
2828
"vitest": "^0.29.7"
2929
},
3030
"dependencies": {
31-
"@elasticpath/mason-common": "0.1.4",
31+
"@elasticpath/composable-common": "*",
3232
"@netlify/functions": "^1.4.0",
3333
"@trpc/server": "^10.14.1",
3434
"express": "^4.18.2",

packages/d2c-schematics/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
"dependencies": {
2222
"@angular-devkit/core": "^14.1.0",
2323
"@angular-devkit/schematics": "^14.1.0",
24-
"@elasticpath/mason-common": "0.1.4",
25-
"@elasticpath/mason-integration-hub-deployer": "0.1.4",
24+
"@elasticpath/composable-common": "*",
25+
"@elasticpath/composable-integration-hub-deployer": "*",
2626
"@moltin/sdk": "^20.16.0",
2727
"@trpc/client": "^10.14.1",
2828
"algoliasearch": "^4.15.0",

packages/d2c-schematics/schematic/files/README.md

Lines changed: 1 addition & 1 deletion

packages/d2c-schematics/utility/algolia/error-messages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ALGOLIA_INTEGRATION_NAME } from "@elasticpath/mason-common"
1+
import { ALGOLIA_INTEGRATION_NAME } from "@elasticpath/composable-common"
22

33
export const errorMessages = {
44
EPCC_INTEGRATION_AUTH_TOKEN:

packages/d2c-schematics/utility/algolia/setup-facets.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export function configureAlgoliaFacets(sourceSettings: Settings): Settings {
1414
"ep_slug_categories.lvl1",
1515
"ep_slug_categories.lvl2",
1616
"ep_slug_categories.lvl3",
17-
// TODO this should be updated to handle multi currency depending on how we decide to do that in mason
17+
// TODO this should be updated to handle multi currency depending on how we decide to do that in composable-frontend
1818
"ep_price.USD.float_price",
1919
/*
2020
TODO need to decide how we are handling custom spec e.g.

packages/d2c-schematics/utility/algolia/temp-alg-script.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env ts-node
22
import { additionalAlgoliaSetup } from "../algolia/algolia"
33
import { SetupResponse } from "./types"
4-
import { EpccRegion } from "@elasticpath/mason-common"
4+
import { EpccRegion } from "@elasticpath/composable-common"
55
const _importDynamic = new Function("modulePath", "return import(modulePath)")
66

77
export const fetch = async function (...args: any) {

packages/d2c-schematics/utility/integration-hub/create-trpc-client.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { createTRPCProxyClient, httpLink } from "@trpc/client"
2-
import { AppRouter } from "@elasticpath/mason-integration-hub-deployer"
3-
import { MASON_INTEGRATION_HUB_DEPLOYER_URL } from "@elasticpath/mason-common"
2+
import { AppRouter } from "@elasticpath/composable-integration-hub-deployer"
3+
import { COMPOSABLE_INTEGRATION_HUB_DEPLOYER_URL } from "@elasticpath/composable-common"
44

55
const IH_DEPLOYER_URL =
66
process.env.NODE_ENV === "development"
77
? "http://localhost:8888/.netlify/functions"
8-
: MASON_INTEGRATION_HUB_DEPLOYER_URL
8+
: COMPOSABLE_INTEGRATION_HUB_DEPLOYER_URL
99

1010
export function createTRPCClient(token: string) {
1111
return createTRPCProxyClient<AppRouter>({

packages/d2c-schematics/utility/integration-hub/format-algolia-integration-response.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AlgoliaIntegrationCreateResult } from "@elasticpath/mason-common"
1+
import { AlgoliaIntegrationCreateResult } from "@elasticpath/composable-common"
22

33
export function formatAlgoliaIntegrationResponse(
44
result: AlgoliaIntegrationCreateResult

packages/d2c-schematics/utility/integration-hub/perform-algolia-integration-setup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
url,
1212
} from "@angular-devkit/schematics"
1313
import { logging } from "@angular-devkit/core"
14-
import { algoliaIntegrationSettingsSchema } from "@elasticpath/mason-common"
14+
import { algoliaIntegrationSettingsSchema } from "@elasticpath/composable-common"
1515
import { setupAlgoliaIntegration } from "./setup-algolia-integration"
1616
import { formatAlgoliaIntegrationResponse } from "./format-algolia-integration-response"
1717
import path from "path"

packages/d2c-schematics/utility/integration-hub/setup-algolia-integration.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import {
1313
performConnectionConfigAuthorisation,
1414
resolveErrorResponse,
1515
resolveRegion,
16-
} from "@elasticpath/mason-common"
17-
import type { Instance } from "@elasticpath/mason-common"
16+
} from "@elasticpath/composable-common"
17+
import type { Instance } from "@elasticpath/composable-common"
1818
import { createTRPCClient } from "./create-trpc-client"
1919
import AbortController from "abort-controller"
2020
import ws from "ws"

packages/d2c-schematics/utility/payment-gateway/setup-payment-gateway.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import ora from "ora"
55
import {
66
epPaymentGatewaySettingsSchema,
77
setupEPPaymentsPaymentGateway,
8-
} from "@elasticpath/mason-common"
8+
} from "@elasticpath/composable-common"
99

1010
export async function setupEPPaymentGateway(
1111
options: SetupPaymentGatewayOptions,

packages/d2c-schematics/utility/resolve-epcc-url.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { EpccRegion } from "@elasticpath/mason-common"
1+
import { EpccRegion } from "@elasticpath/composable-common"
22

33
function resolveEpccHost(region: EpccRegion): string {
44
switch (region) {

scripts/generate-examples.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ async function generateExamples({}: GenerateExampleOptions = {}): Promise<
3131

3232
simpleLogger.log("Workspace prepared.")
3333

34-
await runMasonCli(
35-
`${appRoot.path}/packages/mason-cli/dist/bin/mason.js`,
34+
await runComposableCli(
35+
`${appRoot.path}/packages/composable-cli/dist/bin/composable.js`,
3636
`${appRoot.path}/packages/d2c-schematics/dist:d2c`,
3737
simpleLogger
3838
)
@@ -42,15 +42,15 @@ async function generateExamples({}: GenerateExampleOptions = {}): Promise<
4242
}
4343
}
4444

45-
async function runMasonCli(
46-
masonCliPath: string,
45+
async function runComposableCli(
46+
composableCliPath: string,
4747
schematicPath: string,
4848
logger: Logger
4949
): Promise<void> {
5050
const specs = configuration.specs
5151

5252
const promise = specs.map((spec) => {
53-
return d2cGeneratorForSpec(masonCliPath, schematicPath, spec, logger)
53+
return d2cGeneratorForSpec(composableCliPath, schematicPath, spec, logger)
5454
})
5555

5656
await Promise.all(promise)
@@ -62,7 +62,7 @@ async function runMasonCli(
6262
type Spec = (typeof configuration.specs)[number]
6363

6464
async function d2cGeneratorForSpec(
65-
masonCliPath: string,
65+
composableCliPath: string,
6666
schematicPath: string,
6767
spec: Spec,
6868
logger: Logger
@@ -71,13 +71,13 @@ async function d2cGeneratorForSpec(
7171
const args = specToArgs(spec.args)
7272

7373
const process = await childProcess.fork(
74-
masonCliPath,
74+
composableCliPath,
7575
[schematicPath, ...args],
7676
{
7777
cwd: `${appRoot.path}/examples`,
7878
}
7979
)
80-
// node ../packages/mason-cli/dist/bin/mason.js ../packages/d2c-schematics/dist:d2c --dry-run=false --skip-install=true --skip-git=true --skip-config=true --interactive=false --epcc-client-id=$EPCC_CLIENT_ID --epcc-client-secret=$EPCC_CLIENT_SECRET --epcc-endpoint-url=$EPCC_ENDPOINT --plp-type=None --payment-gateway-type="EP Payments" --ep-payments-stripe-account-id=abc123 --ep-payments-stripe-publishable-key=abc123 basic'
80+
// node ../packages/composable-cli/dist/bin/composable-frontend.js ../packages/d2c-schematics/dist:d2c --dry-run=false --skip-install=true --skip-git=true --skip-config=true --interactive=false --epcc-client-id=$EPCC_CLIENT_ID --epcc-client-secret=$EPCC_CLIENT_SECRET --epcc-endpoint-url=$EPCC_ENDPOINT --plp-type=None --payment-gateway-type="EP Payments" --ep-payments-stripe-account-id=abc123 --ep-payments-stripe-publishable-key=abc123 basic'
8181
// listen for errors as they may prevent the exit event from firing
8282
process.on("error", function (err) {
8383
reject(err)

0 commit comments

Comments
 (0)