Skip to content

Commit 09b26c9

Browse files
cormacrelfcormacrelf
committed
fix(core, multi-backend): bump dnd-core & friends to 8.0.0
Also fix the broken jest config that resulted from dnd-core switching to esnext builds with import/export statements. You should probably follow the changes in tsconfig.test.json and jest.config.json, specifically the "esModuleInterop": true, and the transform ignores.
1 parent 5de8ec0 commit 09b26c9

File tree

8 files changed

+76
-128
lines changed

8 files changed

+76
-128
lines changed

‎jest.config.js‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
module.exports = {
2-
bail: true,
3-
globals: {
4-
"ts-jest": {
5-
tsConfigFile: "./tsconfig.test.json",
6-
useExperimentalLanguageServer: true
7-
},
8-
__TRANSFORM_HTML__: true
9-
},
10-
// https://github.com/facebook/jest/issues/6766
11-
testURL: 'http://localhost',
12-
setupFilesAfterEnv: ["./test/test-setup.ts"],
13-
transform: {
14-
"^.+\\.(ts|js|html)$": "<rootDir>/node_modules/jest-preset-angular/preprocessor.js"
15-
},
16-
moduleNameMapper: {
17-
"@angular-skyhook/(.*)": "<rootDir>/packages/$1"
18-
},
19-
testRegex: ".*spec.ts$",
20-
moduleFileExtensions: [
21-
"ts",
22-
"js",
23-
"json"
24-
],
25-
transformIgnorePatterns: [
26-
"/node_modules/",
27-
"/dist/"
28-
],
29-
modulePathIgnorePatterns: [
30-
"/node_modules/",
31-
"/dist/"
32-
],
33-
projects: [
34-
"<rootDir>",
35-
// "<rootDir>/packages/*"
36-
],
37-
collectCoverageFrom: [
38-
"packages/core/*/src/**/*.ts",
39-
"packages/multi-backend/*/src/**/*.ts",
40-
"packages/sortable/*/src/**/*.ts",
41-
],
42-
coveragePathIgnorePatterns: [
43-
".*(spec|const|config|mock|module|public-api|index|mock|model|d).ts"
44-
],
45-
coverageReporters: [
46-
"lcovonly",
47-
"html"
48-
]
49-
};
2+
bail: true,
3+
globals: {
4+
'ts-jest': {
5+
stringifyContentPathRegex: '\\.html?$',
6+
tsConfig: './tsconfig.test.json',
7+
useExperimentalLanguageServer: true,
8+
},
9+
},
10+
testURL: 'http://localhost',
11+
preset: 'jest-preset-angular',
12+
setupFilesAfterEnv: [
13+
'<rootDir>/test/test-setup.ts',
14+
],
15+
moduleNameMapper: {
16+
'@angular-skyhook/(.*)': '<rootDir>/packages/$1',
17+
},
18+
testRegex: '.*spec.ts$',
19+
moduleFileExtensions: [
20+
'js',
21+
'json',
22+
'ts',
23+
],
24+
transformIgnorePatterns: [
25+
// the dnd folks started building esnext with import/export statements
26+
'/node_modules/(?!dnd-core|react-dnd-test-backend)/',
27+
'/dist/',
28+
],
29+
modulePathIgnorePatterns: [
30+
'/node_modules/',
31+
'/dist/',
32+
],
33+
projects: [
34+
'<rootDir>',
35+
],
36+
collectCoverageFrom: [
37+
'packages/core/*/src/**/*.ts',
38+
'packages/multi-backend/*/src/**/*.ts',
39+
'packages/sortable/*/src/**/*.ts',
40+
],
41+
coveragePathIgnorePatterns: [
42+
'.*(spec|const|config|mock|module|public-api|index|mock|model|d).ts',
43+
],
44+
coverageReporters: [
45+
'lcovonly',
46+
'html',
47+
],
48+
}
49+

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"repository": "https://github.com/cormacrelf/angular-skyhook",
88
"dependencies": {
9-
"dnd-core": "^7.0.1",
9+
"dnd-core": "^8.0.0",
1010
"tslib": "^1.9.0"
1111
},
1212
"peerDependencies": {

‎packages/examples/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"moment-mini-ts": "^2.20.1",
4040
"pressure": "^2.1.2",
4141
"react-dnd-mouse-backend": "^0.1.1",
42-
"react-dnd-test-backend": "^7.0.2",
42+
"react-dnd-test-backend": "^8.0.0",
4343
"rxjs": "^6.3.0",
4444
"zone.js": "~0.9.1"
4545
},

‎packages/examples/src/app/test/test.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { TestComponent } from './test.component';
33
import {
4-
default as TestBackendImpl,
4+
default as createTestBackend,
55
TestBackend
66
} from 'react-dnd-test-backend';
77
import { SkyhookDndModule, DRAG_DROP_MANAGER } from "@angular-skyhook/core";
@@ -21,7 +21,7 @@ describe(TestComponent.name, () => {
2121

2222
beforeEach(async(() => {
2323
TestBed.configureTestingModule({
24-
imports: [SkyhookDndModule.forRoot({ backend: TestBackendImpl })],
24+
imports: [SkyhookDndModule.forRoot({ backend: createTestBackend })],
2525
declarations: [TestComponent]
2626
}).compileComponents();
2727
}));

‎packages/examples/src/app/xy-pad/draggable-box/draggable-box.component.spec.ts‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎packages/multi-backend/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
},
77
"repository": "https://github.com/cormacrelf/angular-skyhook",
88
"dependencies": {
9-
"dnd-core": "^7.0.1",
9+
"dnd-core": "^8.0.0",
1010
"dnd-multi-backend": "^3.1.0",
11-
"react-dnd-html5-backend": "^7.0.1",
11+
"react-dnd-html5-backend": "^8.0.0",
1212
"react-dnd-touch-backend": "^0.8.3",
1313
"tslib": "^1.9.0"
1414
},

‎tsconfig.test.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
"target": "es5",
66
"noUnusedLocals": false,
77
"noUnusedParameters": false,
8+
"allowJs": true,
9+
"esModuleInterop": true,
810
"types": [
911
"node",
1012
"jest",

‎yarn.lock‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4051,7 +4051,7 @@ dir-glob@^2.0.0:
40514051
dependencies:
40524052
path-type "^3.0.0"
40534053

4054-
dnd-core@^7.0.1, dnd-core@^7.4.4, dnd-core@^7.6.0:
4054+
dnd-core@^7.4.4:
40554055
version "7.6.0"
40564056
resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-7.6.0.tgz#5907ca291bdcf6dce98322e4d0937efe1b167e85"
40574057
integrity sha512-JboJ8BKh5nsW2KXbhCY1SzYV+vV3TlQQzgOEtB4IyYbefkhSOwG8wOgcyTD95TyypPaCh8nqxrrRTEC1c8rVMA==
@@ -4060,6 +4060,15 @@ dnd-core@^7.0.1, dnd-core@^7.4.4, dnd-core@^7.6.0:
40604060
invariant "^2.2.4"
40614061
redux "^4.0.1"
40624062

4063+
dnd-core@^8.0.0:
4064+
version "8.0.0"
4065+
resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-8.0.0.tgz#0e2c8b722809ae50ca47a5d4b80e7ed753decb25"
4066+
integrity sha512-NbNLhcqPwTkOnoHbUnu1yBV01Wl11PAzpp2N0ps8F0NRsuW8eQx3MmP2YnTJLjrwRQb53anAKzEb7gCNwu29CQ==
4067+
dependencies:
4068+
asap "^2.0.6"
4069+
invariant "^2.2.4"
4070+
redux "^4.0.1"
4071+
40634072
dnd-multi-backend@^3.1.0:
40644073
version "3.2.1"
40654074
resolved "https://registry.yarnpkg.com/dnd-multi-backend/-/dnd-multi-backend-3.2.1.tgz#528c7624b831d1c23512cbed191b34fb506dcf93"
@@ -9121,23 +9130,23 @@ rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
91219130
minimist "^1.2.0"
91229131
strip-json-comments "~2.0.1"
91239132

9124-
react-dnd-html5-backend@^7.0.1:
9125-
version "7.6.2"
9126-
resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-7.6.2.tgz#eaf7ee0ed8c3cfe414d958cb7035252f49d183db"
9127-
integrity sha512-R3sbnu2CuTrdUrKl9IG5d8yYA4pkvqukpYjON2qr7FYCuVQ84VXqqycmmhau5F8N+Yk4zYrxJN4r38AOGe2Z2g==
9133+
react-dnd-html5-backend@^8.0.0:
9134+
version "8.0.0"
9135+
resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-8.0.0.tgz#918058134fc9222524c3ec9b6563821dee010db4"
9136+
integrity sha512-/he7ZczwhBezz2v7IHuie0jYMBLgiwSM4CLbZcanzotfppWVnOlVC21/rcrMts6SLhWl6fXA5tZ6EwUWugBAiA==
91289137
dependencies:
9129-
dnd-core "^7.6.0"
9138+
dnd-core "^8.0.0"
91309139

91319140
react-dnd-mouse-backend@^0.1.1:
91329141
version "0.1.2"
91339142
resolved "https://registry.yarnpkg.com/react-dnd-mouse-backend/-/react-dnd-mouse-backend-0.1.2.tgz#bf79e5cc20715fb1bc03f3ba20389cc5b062f5da"
91349143

9135-
react-dnd-test-backend@^7.0.2:
9136-
version "7.6.0"
9137-
resolved "https://registry.yarnpkg.com/react-dnd-test-backend/-/react-dnd-test-backend-7.6.0.tgz#86a65926bd7f23c3cccf812daeb9d0ac5649637d"
9138-
integrity sha512-D/OyJBFrlnzmp2xx6O5+1QVMae2pbMjhejiOl5uDvrYGCOA6Zz+WVKhAmg317vx+BICpHnDFIvYD63KO97S43g==
9144+
react-dnd-test-backend@^8.0.0:
9145+
version "8.0.0"
9146+
resolved "https://registry.yarnpkg.com/react-dnd-test-backend/-/react-dnd-test-backend-8.0.0.tgz#8d63beceb574d6beb7c35cd8a673656d340b5f57"
9147+
integrity sha512-l6EeVHo0NY69A6KDOhlD3JTtfUXWIOfqvarwWUHpM99IxFqQ1DVXPe9BDpaNe7+s097QPfnWAHwJQDRWLogfWg==
91399148
dependencies:
9140-
dnd-core "^7.6.0"
9149+
dnd-core "^8.0.0"
91419150

91429151
react-dnd-touch-backend@^0.8.3:
91439152
version "0.8.3"

0 commit comments

Comments
 (0)