refactor: remove flatModuleId and flatModuleOutFile from library tsconfig

alan-agius4 · hansl · commit 718ee15b9a1d · 2018-08-21T10:16:38.000-07:00
The autogenerated fiellds are no longer required following this PR ng-packagr/ng-packagr#1024 This has been released in `ng-packagr` `v4.1.0`
diff --git a/package.json b/package.json
@@ -95,11 +95,11 @@
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
     "spdx-satisfies": "^4.0.0",
+    "tar": "^4.4.4",
     "through2": "^2.0.3",
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.5.0",
-    "tslint-sonarts": "^1.7.0",
-    "tar": "^4.4.4"
+    "tslint-sonarts": "^1.7.0"
   },
   "resolutions": {
     "@types/webpack": "4.4.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@angular/compiler": "^6.1.0",
     "@angular/compiler-cli": "^6.1.0",
-    "ng-packagr": "^4.0.0",
+    "ng-packagr": "^4.1.0",
     "tsickle": ">=0.27.3",
     "tslib": "^1.9.0"
   }
diff --git a/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json b/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json
@@ -23,8 +23,6 @@
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "flatModuleId": "AUTOGENERATED",
-    "flatModuleOutFile": "AUTOGENERATED",
     "enableResourceInlining": true
   },
   "exclude": [
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
@@ -106,7 +106,7 @@ function addDependenciesToPackageJson() {
       {
         type: NodeDependencyType.Dev,
         name: 'ng-packagr',
-        version: '^4.0.0',
+        version: '^4.1.0',
       },
       {
         type: NodeDependencyType.Dev,
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
@@ -139,7 +139,7 @@ describe('Library Schematic', () => {
       const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
 
       const packageJson = getJsonFileContent(tree, 'package.json');
-      expect(packageJson.devDependencies['ng-packagr']).toEqual('^4.0.0');
+      expect(packageJson.devDependencies['ng-packagr']).toEqual('^4.1.0');
       expect(packageJson.devDependencies['@angular-devkit/build-ng-packagr'])
         .toEqual(latestVersions.DevkitBuildNgPackagr);
     });
diff --git a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json
@@ -1,4 +1,5 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "target": "es2015",
     "module": "es2015",
@@ -20,8 +21,6 @@
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "flatModuleId": "AUTOGENERATED",
-    "flatModuleOutFile": "AUTOGENERATED",
     "enableResourceInlining": true
   },
   "exclude": [
diff --git a/yarn.lock b/yarn.lock
@@ -4277,7 +4277,14 @@ less-loader@^4.1.0:
     loader-utils "^1.1.0"
     pify "^3.0.0"
 
-less@^3.0.0:
+less-plugin-npm-import@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
+  dependencies:
+    promise "~7.0.1"
+    resolve "~1.1.6"
+
+less@^3.0.4:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/less/-/less-3.8.0.tgz#44785e40c23841c15ba3be741d36bd2775dd0596"
   optionalDependencies:
@@ -4290,7 +4297,7 @@ less@^3.0.0:
     request "^2.83.0"
     source-map "~0.6.0"
 
-less@^3.7.1:
+less@^3.8.0:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
   dependencies:
@@ -4862,9 +4869,9 @@ next-tick@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
 
-ng-packagr@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.0.1.tgz#e59397aae27c2e25ff39bcdbb4d0cb60c1a5f3f8"
+ng-packagr@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.1.0.tgz#2996159aa0b68bd7c5c36b0cf8631a350ff8b953"
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
     autoprefixer "^9.0.0"
@@ -4876,14 +4883,15 @@ ng-packagr@^4.0.0:
     fs-extra "^7.0.0"
     glob "^7.1.2"
     injection-js "^2.2.1"
-    less "^3.0.0"
-    node-sass "^4.5.3"
+    less "^3.8.0"
+    less-plugin-npm-import "^2.1.0"
+    node-sass "^4.9.3"
     node-sass-tilde-importer "^1.0.0"
     postcss "^7.0.0"
-    postcss-url "^7.3.0"
+    postcss-url "^8.0.0"
     read-pkg-up "^4.0.0"
     rimraf "^2.6.1"
-    rollup "^0.63.0"
+    rollup "^0.64.0"
     rollup-plugin-commonjs "^9.1.3"
     rollup-plugin-node-resolve "^3.0.0"
     rollup-plugin-sourcemaps "^0.4.2"
@@ -4991,7 +4999,7 @@ node-sass-tilde-importer@^1.0.0:
   dependencies:
     find-parent-dir "^0.3.0"
 
-node-sass@^4.5.3:
+node-sass@^4.9.1:
   version "4.9.2"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.2.tgz#5e63fe6bd0f2ae3ac9d6c14ede8620e2b8bdb437"
   dependencies:
@@ -5580,7 +5588,7 @@ postcss-loader@^2.1.5:
     postcss-load-config "^2.0.0"
     schema-utils "^0.4.0"
 
-postcss-url@^7.3.0, postcss-url@^7.3.2:
+postcss-url@^7.3.2:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-7.3.2.tgz#5fea273807fb84b38c461c3c9a9e8abd235f7120"
   dependencies:
@@ -5590,6 +5598,16 @@ postcss-url@^7.3.0, postcss-url@^7.3.2:
     postcss "^6.0.1"
     xxhashjs "^0.2.1"
 
+postcss-url@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
+  dependencies:
+    mime "^2.3.1"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.0"
+    postcss "^7.0.2"
+    xxhashjs "^0.2.1"
+
 postcss-value-parser@^3.2.3:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
@@ -5655,6 +5673,18 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+promise@~7.0.1:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  dependencies:
+    asap "~2.0.3"
+
+promisify-call@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/promisify-call/-/promisify-call-2.0.4.tgz#d48c2d45652ccccd52801ddecbd533a6d4bd5fba"
+  dependencies:
+    with-callback "^1.0.2"
+
 protractor@~5.4.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.0.tgz#e71c9c1f5cf6c5e9bdbcdb71e7f31b17ffd2878f"
@@ -6137,7 +6167,7 @@ resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@1.1.x:
+resolve@1.1.x, resolve@~1.1.6:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
@@ -6215,9 +6245,9 @@ rollup-pluginutils@^2.0.1:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
-rollup@^0.63.0:
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.63.5.tgz#5543eecac9a1b83b7e1be598b5be84c9c0a089db"
+rollup@^0.64.0:
+  version "0.64.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.64.1.tgz#9188ee368e5fcd43ffbc00ec414e72eeb5de87ba"
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`"devDependencies": {`
`18`	`18`	`"@angular/compiler": "^6.1.0",`
`19`	`19`	`"@angular/compiler-cli": "^6.1.0",`
`20`		`- "ng-packagr": "^4.0.0",`
	`20`	`+ "ng-packagr": "^4.1.0",`
`21`	`21`	`"tsickle": ">=0.27.3",`
`22`	`22`	`"tslib": "^1.9.0"`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ function addDependenciesToPackageJson() {`
`106`	`106`	`{`
`107`	`107`	`type: NodeDependencyType.Dev,`
`108`	`108`	`name: 'ng-packagr',`
`109`		`- version: '^4.0.0',`
	`109`	`+ version: '^4.1.0',`
`110`	`110`	`},`
`111`	`111`	`{`
`112`	`112`	`type: NodeDependencyType.Dev,`