Skip to content

Commit 9451ffa

Browse files
committed
feat(@schematics/angular): use es2015 modules overall
This change helps to keep the behaviour of build/serve/test consistent by using the same import semantics in all of them.
1 parent 66a7491 commit 9451ffa

File tree

6 files changed

+2
-7
lines changed

6 files changed

+2
-7
lines changed

packages/schematics/angular/application/files/root/tsconfig.app.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
33
"compilerOptions": {
44
"outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/app",
5-
"module": "es2015",
65
"types": []
76
},
87
"exclude": [

packages/schematics/angular/application/files/root/tsconfig.spec.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
33
"compilerOptions": {
44
"outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/spec",
5-
"module": "commonjs",
65
"types": [
76
"jasmine",
87
"node"

packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"compilerOptions": {
44
"outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/lib",
55
"target": "es2015",
6-
"module": "es2015",
76
"moduleResolution": "node",
87
"declaration": true,
98
"sourceMap": true,

packages/schematics/angular/universal/files/root/__tsconfigFileName__.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"extends": "./<%= tsConfigExtends %>",
33
"compilerOptions": {
44
"outDir": "<%= outDir %>-server",
5-
"baseUrl": ".",
6-
"module": "commonjs"
5+
"baseUrl": "."
76
},
87
"angularCompilerOptions": {
98
"entryModule": "<%= rootInSrc ? '' : 'src/' %><%= appDir %>/<%= stripTsExtension(rootModuleFileName) %>#<%= rootModuleClassName %>"

packages/schematics/angular/universal/index_spec.ts

-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ describe('Universal Schematic', () => {
8282
compilerOptions: {
8383
outDir: '../out-tsc/app-server',
8484
baseUrl: '.',
85-
module: 'commonjs',
8685
},
8786
angularCompilerOptions: {
8887
entryModule: 'app/app.server.module#AppServerModule',
@@ -103,7 +102,6 @@ describe('Universal Schematic', () => {
103102
compilerOptions: {
104103
outDir: '../../out-tsc/app-server',
105104
baseUrl: '.',
106-
module: 'commonjs',
107105
},
108106
angularCompilerOptions: {
109107
entryModule: 'src/app/app.server.module#AppServerModule',

packages/schematics/angular/workspace/files/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"outDir": "./dist/out-tsc",
66
"sourceMap": true,
77
"declaration": false,
8+
"module": "es2015",
89
"moduleResolution": "node",
910
"emitDecoratorMetadata": true,
1011
"experimentalDecorators": true,

0 commit comments

Comments
 (0)