Skip to content

Commit 040a10f

Browse files
irustmirustm
committed
Update Angular and Deno version
1 parent eff3f62 commit 040a10f

File tree

8 files changed

+34
-27
lines changed

8 files changed

+34
-27
lines changed

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Angular renderer in Deno
22

3+
Now Supported Angular 11 and Deno 1.6
4+
35
This is experimental Angular SSR in Deno, and will be used as a renderer for [Alosaur](https://github.com/alosaur/alosaur) web framework, as well as handlebars, ejs, mustache.
46

57
## How to use
@@ -12,7 +14,7 @@ importmap.json:
1214
```json
1315
{
1416
"imports": {
15-
"@angular/core": "https://jspm.dev/@angular/core@10.0.1",
17+
"@angular/core": "https://jspm.dev/@angular/core@11",
1618
"@angular/deno": "https://deno.land/x/angular_deno/mod.ts",
1719
"@angular/deno/": "https://deno.land/x/angular_deno/",
1820
"zone.js": "https://jspm.dev/zone.js/dist/zone"

‎bootstrap.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { createPlatformFactory, Injector, COMPILER_OPTIONS, InjectionToken } from 'https://jspm.dev/@angular/core@10.0.1';
2-
import { ɵplatformCoreDynamic } from 'https://jspm.dev/@angular/platform-browser-dynamic@10.0.1';
3-
import { ResourceLoader } from 'https://jspm.dev/@angular/compiler@10.0.1';
1+
import { createPlatformFactory, Injector, COMPILER_OPTIONS, InjectionToken } from 'https://jspm.dev/@angular/core@11';
2+
import { ɵplatformCoreDynamic } from 'https://jspm.dev/@angular/platform-browser-dynamic@11';
3+
import { ResourceLoader } from 'https://jspm.dev/@angular/compiler@11';
44
import { INITIAL_CONFIG, ɵINTERNAL_SERVER_PLATFORM_PROVIDERS as INTERNAL_SERVER_PLATFORM_PROVIDERS } from './platform-server.mjs';
55
import { DenoFileSystemResourceLoader } from './resource-loader.ts';
66

@@ -38,4 +38,4 @@ export async function bootstrap(module: any, document: string, resourcePath: str
3838
}]).bootstrapModule(module, { ngZone: 'noop' }).then((ref: any) => {
3939
return Promise.resolve(ref)
4040
}));
41-
}
41+
}

‎engine.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11

2-
import { NgModuleFactory, CompilerFactory, StaticProvider, Compiler } from 'https://jspm.dev/@angular/core@10.0.1';
2+
import { NgModuleFactory, CompilerFactory, Compiler } from 'https://jspm.dev/@angular/core@11';
33
import { INITIAL_CONFIG, renderModuleFactory } from './platform-server.mjs';
44
const { readFile } = Deno;
55
const decoder = new TextDecoder();
66

77
export class CommonEngine {
88

99
/** Return an instance of the platformServer compiler */
10+
11+
// @ts-ignore
1012
getCompiler(): Compiler {
13+
// @ts-ignore
1114
const compilerFactory: CompilerFactory = this.compilerFactory;//platformCoreDynamic().injector.get(CompilerFactory);
1215

1316
return compilerFactory.createCompiler();
@@ -16,8 +19,9 @@ export class CommonEngine {
1619
private factoryCacheMap = new Map<any, any>();
1720
private readonly templateCache: Map<string, string> = new Map<string, string>()
1821

22+
// @ts-ignore
1923
constructor(private compilerFactory: CompilerFactory, private moduleOrFactory?: any,
20-
private providers: StaticProvider[] = []) { }
24+
private providers: any[] = []) { }
2125

2226
/**
2327
* Render an HTML document for a specific URL with specified
@@ -79,4 +83,4 @@ export class CommonEngine {
7983
return template;
8084
});
8185
}
82-
}
86+
}

‎example/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Output:
2020
</head>
2121

2222
<body>
23-
<my-app _nghost-sc1="" ng-version="10.0.1">Angular in Deno v1.1.2</my-app>
23+
<my-app _nghost-sc1="" ng-version="11.0.5">Angular in Deno v1.6.2</my-app>
2424
</body>
2525
</html>
26-
```
26+
```

‎example/importmap.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"imports": {
3-
"@angular/core": "https://jspm.dev/@angular/core@10.0.1",
3+
"@angular/core": "https://jspm.dev/@angular/core@11",
44
"zone.js": "https://jspm.dev/zone.js/dist/zone"
55
}
6-
}
6+
}

‎example/server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { serve } from "https://deno.land/std@0.59.0/http/server.ts";
1+
import { serve } from "https://deno.land/std@0.82.0/http/server.ts";
22

33
import { CompilerFactory, enableProdMode } from "@angular/core";
44
import { bootstrap, CommonEngine } from "../mod.ts";

‎platform-server.mjs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import _core from 'https://jspm.dev/npm:@angular/core@10.0.1!cjs';
1+
import _core from 'https://jspm.dev/npm:@angular/core@11!cjs';
22
import 'https://jspm.dev/npm:rxjs@6!cjs';
33
import 'https://jspm.dev/npm:rxjs@6/operators!cjs';
4-
import _common from 'https://jspm.dev/npm:@angular/common@10.0.1!cjs';
5-
import _platformBrowser from 'https://jspm.dev/npm:@angular/platform-browser@10.0.1!cjs';
6-
import _browser from 'https://jspm.dev/npm:@angular/animations@10.0.1/browser!cjs';
7-
import _http from 'https://jspm.dev/npm:@angular/common@10.0.1/http!cjs';
8-
import _compiler from 'https://jspm.dev/npm:@angular/compiler@10.0.1!cjs';
9-
import _platformBrowserDynamic from 'https://jspm.dev/npm:@angular/platform-browser-dynamic@10.0.1!cjs';
10-
import 'https://jspm.dev/npm:@angular/animations@10.0.1!cjs';
11-
import _animations from 'https://jspm.dev/npm:@angular/platform-browser@10.0.1/animations!cjs';
4+
import _common from 'https://jspm.dev/npm:@angular/common@11!cjs';
5+
import _platformBrowser from 'https://jspm.dev/npm:@angular/platform-browser@11!cjs';
6+
import _browser from 'https://jspm.dev/npm:@angular/animations@11/browser!cjs';
7+
import _http from 'https://jspm.dev/npm:@angular/common@11/http!cjs';
8+
import _compiler from 'https://jspm.dev/npm:@angular/compiler@11!cjs';
9+
import _platformBrowserDynamic from 'https://jspm.dev/npm:@angular/platform-browser-dynamic@11!cjs';
10+
import 'https://jspm.dev/npm:@angular/animations@11!cjs';
11+
import _animations from 'https://jspm.dev/npm:@angular/platform-browser@11/animations!cjs';
1212
import _rxjs from 'https://jspm.dev/npm:rxjs!cjs';
1313
import _url from 'https://jspm.dev/npm:@jspm/core@2/nodelibs/url';
1414
import _operators from 'https://jspm.dev/npm:rxjs/operators!cjs';
@@ -1858,4 +1858,4 @@ const BEFORE_APP_SERIALIZED = exports.BEFORE_APP_SERIALIZED,
18581858
export default exports;
18591859
export { BEFORE_APP_SERIALIZED, INITIAL_CONFIG, PlatformState, ServerModule, ServerTransferStateModule, VERSION, __esModule, platformDynamicServer, platformServer, renderModule, renderModuleFactory, ɵINTERNAL_SERVER_PLATFORM_PROVIDERS, ɵSERVER_RENDER_PROVIDERS, ɵServerRendererFactory2, ɵangular_packages_platform_server_platform_server_a, ɵangular_packages_platform_server_platform_server_b, ɵangular_packages_platform_server_platform_server_c, ɵangular_packages_platform_server_platform_server_d, ɵangular_packages_platform_server_platform_server_e, ɵangular_packages_platform_server_platform_server_f, ɵangular_packages_platform_server_platform_server_g };
18601860

1861-
//# sourceMappingURL=platform-server@10.0.1!cjs.map
1861+
//# sourceMappingURL=platform-server@11!cjs.map

‎resource-loader.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ResourceLoader } from 'https://jspm.dev/@angular/compiler@10.0.1';
2-
import { Injector } from 'https://jspm.dev/@angular/core@10.0.1';
3-
import { join } from "https://deno.land/std@0.65.0/path/posix.ts";
1+
import { ResourceLoader } from 'https://jspm.dev/@angular/compiler@11';
2+
import { Injector } from 'https://jspm.dev/@angular/core@11';
3+
import { join } from "https://deno.land/std@0.82.0/path/posix.ts";
44
import { RESOURCE_PATH } from './bootstrap.ts';
55

66
const { readFile } = Deno;
@@ -10,6 +10,7 @@ export class DenoFileSystemResourceLoader extends ResourceLoader {
1010
private readonly filesCache: Map<string, string> = new Map<string, string>()
1111
private readonly resourcePath: string;
1212

13+
// @ts-ignore
1314
constructor(private readonly injector: Injector) {
1415
super();
1516

@@ -41,4 +42,4 @@ export class DenoFileSystemResourceLoader extends ResourceLoader {
4142
return template;
4243
});
4344
}
44-
}
45+
}

0 commit comments

Comments
 (0)