diff --git a/packages/tokens/package.json b/packages/tokens/package.json index 053858c..44f50c4 100644 --- a/packages/tokens/package.json +++ b/packages/tokens/package.json @@ -22,7 +22,7 @@ "scripts": { "lint": "eslint . 'src/**/*.{ts,tsx}'", "dev": "nodemon --watch 'src/bin' --ext '*' --exec 'yarn build'", - "build-bin": "cd src/bin && tsc -p tsconfig.json && tsc-alias && cp ./cunningham.dist.js ../../dist/bin && chmod +x ../../dist/bin/Main.js", + "build-bin": "cd src/bin && tsc -p tsconfig.json && tsc-alias && chmod +x ../../dist/bin/Main.js", "build-lib": "cp dist/cunningham-tokens.ts src/lib && cd src/lib && tsc -p tsconfig.json", "build": "yarn build-bin && yarn build-default-theme && yarn build-lib && cd ../.. && ln -sf ../../packages/tokens/dist/bin/Main.js node_modules/.bin/cunningham", "build-default-theme": "./dist/bin/Main.js -o dist -s html -g css,js,ts", diff --git a/packages/tokens/src/bin/ConfigLoader.ts b/packages/tokens/src/bin/ConfigLoader.ts index 5e403cd..f3bb5f2 100644 --- a/packages/tokens/src/bin/ConfigLoader.ts +++ b/packages/tokens/src/bin/ConfigLoader.ts @@ -44,7 +44,7 @@ const registerTypescriptLoader = () => { }; const getDistConfig = async () => { - const config = await import("./cunningham.dist.js"); + const config = await import("./cunningham"); return config.default; }; diff --git a/packages/tokens/src/bin/__mocks__/cunningham.dist.js b/packages/tokens/src/bin/__mocks__/cunningham.ts similarity index 100% rename from packages/tokens/src/bin/__mocks__/cunningham.dist.js rename to packages/tokens/src/bin/__mocks__/cunningham.ts diff --git a/packages/tokens/src/bin/cunningham.dist.js b/packages/tokens/src/bin/cunningham.ts similarity index 89% rename from packages/tokens/src/bin/cunningham.dist.js rename to packages/tokens/src/bin/cunningham.ts index 8089a19..d07963a 100644 --- a/packages/tokens/src/bin/cunningham.dist.js +++ b/packages/tokens/src/bin/cunningham.ts @@ -1,4 +1,4 @@ -module.exports = { +export default { theme: { colors: { primary: "#002d7f", diff --git a/packages/tokens/src/bin/tests/Cunningham.spec.ts b/packages/tokens/src/bin/tests/Cunningham.spec.ts index cc049b4..a175fda 100644 --- a/packages/tokens/src/bin/tests/Cunningham.spec.ts +++ b/packages/tokens/src/bin/tests/Cunningham.spec.ts @@ -11,15 +11,6 @@ jest.mock("../Paths", () => ({ workPath: () => __dirname, })); -jest.mock("../cunningham.dist.js", () => ({ - theme: { - colors: { - primary: "#055FD2", - secondary: "#DA0000", - }, - }, -})); - const runBin = async (args: string) => { const exec = util.promisify(child_process.exec); const promise = exec( diff --git a/packages/tokens/src/bin/tests/Setup.ts b/packages/tokens/src/bin/tests/Setup.ts index 4754b99..e7799f7 100644 --- a/packages/tokens/src/bin/tests/Setup.ts +++ b/packages/tokens/src/bin/tests/Setup.ts @@ -1 +1 @@ -jest.mock("../cunningham.dist.js"); +jest.mock("../cunningham");