Skip to content

Commit 69f6e27

Browse files
evolkmannevolkmann
authored
refactor: remove prismic-javascript and prismic-dom deps (#365)
1 parent 2e83097 commit 69f6e27

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+5084
-5442
lines changed

‎apps/demo/jest.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ module.exports = {
22
preset: '../../jest.preset.js',
33
coverageDirectory: '../../coverage/apps/demo',
44
snapshotSerializers: [
5-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
6-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
7-
'jest-preset-angular/build/HTMLCommentSerializer.js',
5+
'jest-preset-angular/build/serializers/no-ng-attributes',
6+
'jest-preset-angular/build/serializers/ng-snapshot',
7+
'jest-preset-angular/build/serializers/html-comment',
88
],
99
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
1010
globals: {

‎apps/demo/src/app/app.component.html

+20-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1-
<p>
2-
This data comes from prismic:
3-
</p>
4-
<pre>{{data | async | json}}</pre>
1+
<ng-container *ngIf="data | async as response; else loading">
2+
<p>
3+
This is the raw data from prismic.
4+
</p>
5+
<pre>{{response | json}}</pre>
6+
7+
<hr>
8+
9+
<p>
10+
This is an example of using the
11+
<code>renderHtml</code> pipe
12+
with the <code>.[0].data.richtext</code>
13+
field in the response above.
14+
</p>
15+
<div [innerHTML]="response[0].data.richtext | renderHtml | safe : 'html'"></div>
16+
</ng-container>
17+
18+
<ng-template #loading>
19+
please wait...
20+
</ng-template>

‎apps/demo/src/app/app.component.scss

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pre,
2+
div {
3+
max-height: 300px;
4+
overflow: scroll;
5+
border: 1px solid black;
6+
padding: .5rem;
7+
}

‎apps/demo/src/app/app.component.spec.ts

-25
This file was deleted.

‎apps/demo/src/app/app.component.ts

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, OnInit } from '@angular/core';
2-
import { PrismicService } from '@ngx-prismic/client';
3-
import { Observable } from 'rxjs';
4-
import Prismic from 'prismic-javascript';
2+
import { PrismicDocument } from '@prismicio/types';
3+
import { from, Observable } from 'rxjs';
4+
import { environment } from '../environments/environment';
55

66
@Component({
77
selector: 'ngx-prismic-root',
@@ -10,16 +10,10 @@ import Prismic from 'prismic-javascript';
1010
})
1111
export class AppComponent implements OnInit {
1212

13-
data: Observable<any>;
14-
15-
constructor(
16-
private readonly prismic: PrismicService
17-
) {}
13+
data: Observable<PrismicDocument[]>;
1814

1915
ngOnInit() {
20-
this.data = this.prismic.query([
21-
Prismic.Predicates.at('document.type', 'demo')
22-
]);
16+
this.data = from(environment.prismic.client.getAllByType('demo'));
2317
}
24-
18+
2519
}

‎apps/demo/src/app/app.module.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
1+
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
22
import { NgModule } from '@angular/core';
33
import { BrowserModule } from '@angular/platform-browser';
4+
import { PrismicClientModule } from '@ngx-prismic/client';
45
import { AppComponent } from './app.component';
56
import { DemoInterceptor } from './interceptor';
6-
import { PrismicModule } from './prismic/prismic.module';
77

88
@NgModule({
99
declarations: [
@@ -12,7 +12,7 @@ import { PrismicModule } from './prismic/prismic.module';
1212
imports: [
1313
BrowserModule,
1414
HttpClientModule,
15-
PrismicModule
15+
PrismicClientModule
1616
],
1717
providers: [
1818
{

‎apps/demo/src/app/prismic/prismic.module.ts

-21
This file was deleted.

‎apps/demo/src/environments/environment.prod.ts

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
import { createClient, getEndpoint } from '@prismicio/client';
2+
13
export const environment = {
24
production: true,
5+
prismic: {
6+
client: createClient(getEndpoint('ngx-prismic-demo'))
7+
}
38
};

‎apps/demo/src/environments/environment.ts

+5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
33
// The list of file replacements can be found in `angular.json`.
44

5+
import { createClient, getEndpoint } from '@prismicio/client';
6+
57
export const environment = {
68
production: false,
9+
prismic: {
10+
client: createClient(getEndpoint('ngx-prismic-demo'))
11+
}
712
};
813

914
/*

‎apps/demo/src/test-setup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'jest-preset-angular';
1+
import 'jest-preset-angular/setup-jest';

‎babel.config.js

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = {
2+
presets: [
3+
[
4+
'@babel/preset-env',
5+
{
6+
targets: {
7+
node: 'current'
8+
}
9+
}
10+
],
11+
'@babel/preset-typescript',
12+
],
13+
};

‎docs/slices.md

-95
This file was deleted.

‎libs/client/jest.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ module.exports = {
22
preset: '../../jest.preset.js',
33
coverageDirectory: '../../coverage/libs/client',
44
snapshotSerializers: [
5-
'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
6-
'jest-preset-angular/build/AngularSnapshotSerializer.js',
7-
'jest-preset-angular/build/HTMLCommentSerializer.js',
5+
'jest-preset-angular/build/serializers/no-ng-attributes',
6+
'jest-preset-angular/build/serializers/ng-snapshot',
7+
'jest-preset-angular/build/serializers/html-comment',
88
],
99
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
1010
globals: {

‎libs/client/ng-package.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
33
"dest": "../../dist/libs/client",
44
"lib": {
5-
"entryFile": "src/index.ts",
6-
"umdModuleIds": {
7-
"prismic-dom": "prismicDom",
8-
"prismic-javascript": "prismicJavscript"
9-
}
5+
"entryFile": "src/index.ts"
106
}
117
}

‎libs/client/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"@angular/core": "^11.0.0",
88
"@angular/router": "^11.0.0",
99
"@angular/platform-browser": "^11.0.0",
10-
"prismic-javascript": "^3.0.2",
11-
"prismic-dom": "^2.2.4",
10+
"@prismicio/client": "^6.0.0-beta.5",
11+
"@prismicio/helpers": "^2.0.0-beta.8",
1212
"rxjs": "^6.6.3"
1313
},
1414
"dependencies": {

‎libs/client/src/index.ts

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
export { PrismicClientModule } from './lib/client.module';
2-
export { PrismicService, ProjectorFunc, API_TOKEN } from './lib/services/prismic.service';
3-
export { PrismicServiceConfig, PrismicServiceConfigProvider } from './lib/services/prismic-service.config';
4-
export * from './lib/services/content-validation';
52

6-
export * from './lib/models/api.model';
7-
export * from './lib/models/image.model';
8-
export * from './lib/models/slice.model';
9-
export * from './lib/models/span.model';
10-
export * from './lib/models/typography.model';
11-
export * from './lib/models/video-embed.model';
12-
export * from './lib/models/link.model';
13-
export * from './lib/models/geolocation.model';
14-
export * from './lib/models/aliased-types.model';
15-
16-
export * from './lib/utils/resolver';
17-
18-
export { HtmlSerializer, RenderHtmlPipe } from './lib/pipes/render-html.pipe';
3+
export { RenderHtmlPipe } from './lib/pipes/render-html.pipe';
194
export { SafePipe } from './lib/pipes/safe.pipe';
205
export { RenderImagePipe } from './lib/pipes/render-image.pipe';
216

0 commit comments

Comments
 (0)