From 4253978c2de20e350aacbfa682276899b874b862 Mon Sep 17 00:00:00 2001 From: Chema Balsas Date: Thu, 7 Dec 2017 10:30:43 +0100 Subject: [PATCH] Fixes dependencies and moves test component fixture outside of src --- package.json | 3 ++- packages/clay-component/package.json | 8 +++----- packages/clay-component/src/__tests__/ClayComponent.js | 2 +- .../src/{ => __tests__/fixtures}/MyComponent.soy | 0 4 files changed, 6 insertions(+), 7 deletions(-) rename packages/clay-component/src/{ => __tests__/fixtures}/MyComponent.soy (100%) diff --git a/package.json b/package.json index b5169cdbb..cad0b5fa8 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,8 @@ "metal-jest-serializer" ], "testPathIgnorePatterns": [ - "browserslist-config-clay-components" + "browserslist-config-clay-components", + "fixtures" ], "transformIgnorePatterns": [ ".*(node_modules)(?!.*clay.*).*$" diff --git a/packages/clay-component/package.json b/packages/clay-component/package.json index 7687cfa1e..8ab3dc6a7 100644 --- a/packages/clay-component/package.json +++ b/packages/clay-component/package.json @@ -20,18 +20,17 @@ "build": "npm run soy && webpack", "compile": "babel -d lib/ src/ -s --ignore src/__tests__", "prepublish": "npm run soy && npm run compile", - "soy": "metalsoy --soyDeps ../../node_modules/clay-icon/src/**/*.soy" + "soy": "metalsoy" }, "keywords": [ "clay", "metal" ], "dependencies": { - "metal": "^2.14.0", "metal-component": "^2.14.0", + "metal-dom": "^2.14.0", "metal-soy": "^2.14.0", - "metal-state": "^2.14.0", - "metal-web-component": "^2.14.0" + "metal-state": "^2.14.0" }, "devDependencies": { "babel-cli": "^6.24.1", @@ -41,7 +40,6 @@ "babel-preset-env": "^1.6.0", "browserslist-config-clay-components": "^1.0.0-alpha.2", "clay": "^2.0.0-beta.4", - "metal-dom": "^2.14.0", "metal-tools-soy": "^4.2.1", "webpack": "^3.0.0" }, diff --git a/packages/clay-component/src/__tests__/ClayComponent.js b/packages/clay-component/src/__tests__/ClayComponent.js index 976022af9..a5ae7a0f1 100644 --- a/packages/clay-component/src/__tests__/ClayComponent.js +++ b/packages/clay-component/src/__tests__/ClayComponent.js @@ -1,7 +1,7 @@ import ClayComponent from '../ClayComponent'; import Soy from 'metal-soy'; -import templates from '../MyComponent.soy.js'; +import templates from './fixtures/MyComponent.soy.js'; /** * My Component. diff --git a/packages/clay-component/src/MyComponent.soy b/packages/clay-component/src/__tests__/fixtures/MyComponent.soy similarity index 100% rename from packages/clay-component/src/MyComponent.soy rename to packages/clay-component/src/__tests__/fixtures/MyComponent.soy