Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP move to nx11 & angular11 #1198

Merged
merged 12 commits into from
Jan 18, 2021
Merged

WIP move to nx11 & angular11 #1198

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a7a0ddb
move to nx11
jorgeucano Jan 6, 2021
cd5d836
update tests configs
jorgeucano Jan 13, 2021
260e804
update config test
jorgeucano Jan 13, 2021
9c95791
chore: (tests) updated snapshots
SanderElias Jan 13, 2021
a9815e4
fix jest test
jorgeucano Jan 18, 2021
d439f30
updated snapshots
SanderElias Jan 18, 2021
e3c11f9
updated snapshots
SanderElias Jan 18, 2021
e326f62
updated snapshots
SanderElias Jan 18, 2021
a6a8635
Merge branch 'main' into nx11
jorgeucano Jan 18, 2021
d8ac0a3
Merge branch 'main' of github.com:scullyio/scully into nx11
SanderElias Jan 18, 2021
c77ed14
updated snapshots
SanderElias Jan 18, 2021
ced0512
Merge branch 'nx11' of github.com:scullyio/scully into nx11
SanderElias Jan 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updated snapshots
  • Loading branch information
@SanderElias
SanderElias committed Jan 18, 2021
commit e326f62b5c7bcf0551eec7acd12c89da32a5f9ac
1 change: 1 addition & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

/dist
/coverage
/test/
10 changes: 5 additions & 5 deletions apps/sample-blog/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
coverageDirectory: '../../coverage/apps/sample-blog',
snapshotSerializers: [
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
'jest-preset-angular/build/AngularSnapshotSerializer.js',
'jest-preset-angular/build/HTMLCommentSerializer.js',
],
// snapshotSerializers: [
// 'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
// 'jest-preset-angular/build/AngularSnapshotSerializer.js',
// 'jest-preset-angular/build/HTMLCommentSerializer.js',
// ],
displayName: 'sample-blog',
};
10 changes: 5 additions & 5 deletions apps/scully-docs/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ module.exports = {
'^.+\\.[tj]sx?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
snapshotSerializers: [
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
'jest-preset-angular/build/AngularSnapshotSerializer.js',
'jest-preset-angular/build/HTMLCommentSerializer.js',
],
// snapshotSerializers: [
// 'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
// 'jest-preset-angular/build/AngularSnapshotSerializer.js',
// 'jest-preset-angular/build/HTMLCommentSerializer.js',
// ],
displayName: 'scully-docs',
};
5 changes: 2 additions & 3 deletions jest.preset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ const nxPreset = require('@nrwl/jest/preset');
// };
module.exports = {
...nxPreset,
preset: 'jest-preset-angular',
// preset: 'jest-preset-angular',
roots: ['tests/jest/src'],
transform: {
'^.+\\.(ts|js|html)$': 'ts-jest',
},
snapshotSerializers: ['jest-serializer-html'],
setupFilesAfterEnv: ['./tests/jest/src/setup-jest.ts'],
moduleNameMapper: {
'@app/(.*)': '<rootDir>/apps/sample-blog/src/app/$1',
Expand All @@ -29,7 +28,7 @@ module.exports = {
tsconfig: './tsconfig.spec.json',
stringifyContentPathRegex: '\\.html$',
astTransformers: {
before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer'],
// before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer'],
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion libs/scully/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ module.exports = {
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
coverageDirectory: '../../coverage/libs/scully',
preset: 'jest-preset-angular',
// preset: 'jest-preset-angular',
displayName: 'scully',
};
Loading