feat(test): fix the structure for tests and build

angular-extensions · Oct 28, 2020 · fed021e · fed021e
1 parent 8816187
commit fed021e
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 21 deletions.
diff --git a/src/builders.json → builders.json b/src/builders.json → builders.json
diff --git a/jest.config.js b/jest.config.js
@@ -4,7 +4,7 @@ module.exports = {
       tsconfig: 'tsconfig.spec.json',
     },
   },
-  roots: ['<rootDir>/src'],
+  roots: ['<rootDir>/schematics', '<rootDir>/svg-icons-builder'],
   transform: {
     '^.+\\.tsx?$': 'ts-jest',
   },

diff --git a/package.json b/package.json
@@ -5,8 +5,8 @@
   "scripts": {
     "build": "tsc -p tsconfig.json && npm run copy:files",
     "build:watch": "tsc -p tsconfig.json --watch && npm run copy:files",
-    "copy:files": "cp ./src/builders.json ./src/collection.json dist/ && cp ./package.json dist/ && cp ./src/svg-icons-builder/*.json ./dist/svg-icons-builder/",
-    "format:write": "prettier --write ./src/**/*.ts",
+    "copy:files": "cp ./package.json ./builders.json dist/ && cp ./svg-icons-builder/*.json ./dist/svg-icons-builder/ && cp ./schematics/*.json ./dist/schematics/",
+    "format:write": "prettier --write ./**/*.ts",
     "test": "jest",
     "test:watch": "jest --watch"
   },

diff --git a/src/collection.json → schematics/collection.json b/src/collection.json → schematics/collection.json
diff --git a/src/ng-add/index.spec.ts → schematics/ng-add/index.spec.ts b/src/ng-add/index.spec.ts → schematics/ng-add/index.spec.ts
diff --git a/src/ng-add/index.ts → schematics/ng-add/index.ts b/src/ng-add/index.ts → schematics/ng-add/index.ts
diff --git a/src/package.json b/src/package.json
diff --git a/src/svg-icons-builder/index.spec.ts → svg-icons-builder/index.spec.ts b/src/svg-icons-builder/index.spec.ts → svg-icons-builder/index.spec.ts
@@ -44,7 +44,7 @@ describe('svg-icons-builder', () => {
 
     // A "run" can have multiple outputs, and contains progress information.
     const run = await architect.scheduleBuilder(
-      'svg-icons-builder:svg-icons-builder',
+      '@angular-extensions/svg-icons-builder:svg-icons-builder',
       {
         ...defaultCommonOptions,
         conversionType: 'constants',

diff --git a/src/svg-icons-builder/index.ts → svg-icons-builder/index.ts b/src/svg-icons-builder/index.ts → svg-icons-builder/index.ts
diff --git a/src/svg-icons-builder/schema.json → svg-icons-builder/schema.json b/src/svg-icons-builder/schema.json → svg-icons-builder/schema.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -12,14 +12,13 @@
     "noUnusedParameters": true,
     "noUnusedLocals": true,
     "outDir": "dist",
-    "rootDir": "src/",
     "skipDefaultLibCheck": true,
     "skipLibCheck": true,
     "sourceMap": true,
     "strictNullChecks": true,
     "target": "es6",
     "types": ["node"]
   },
-  "include": ["src/**/*"],
-  "exclude": ["src/*/files/**/*", "src/**/*.spec.ts", "src/package.json"]
+  "include": ["schematics/**/*", "svg-icons-builder"],
+  "exclude": ["svg-icons-builder/*/files/**/*", "**/*.spec.ts"]
 }
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
@@ -4,5 +4,5 @@
     "outDir": "./out-tsc/spec",
     "types": ["jest", "node"]
   },
-  "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
+  "include": ["**/*.spec.ts", "schematics/**/*.d.ts", "svg-icons-builder/**/*.d.ts"]
 }