Commit 9c7a7ea

committed

fix(@angular/cli): allow node_modules to be linked somewhere else.

1 parent bbe3a35 commit 9c7a7eaCopy full SHA for 9c7a7ea

File tree

+47

-3

lines changed

packages/@angular/cli
- models/webpack-configs
  - browser.ts
- tasks
  - eject.ts
tests/e2e
- tests/build
  - vendor-chunk-symlink-node-module.ts
- utils
  - fs.ts

+47

-3

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import * as fs from 'fs';`
`1`	`2`	`import * as webpack from 'webpack';`
`2`	`3`	`import * as path from 'path';`
`3`	`4`	`const HtmlWebpackPlugin = require('html-webpack-plugin');`
`@@ -24,14 +25,20 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {`
`24`	`25`	`if (buildOptions.vendorChunk) {`
`25`	`26`	`// Separate modules from node_modules into a vendor chunk.`
`26`	`27`	`const nodeModules = path.resolve(projectRoot, 'node_modules');`
	`28`	`+ // Resolves all symlink to get the actual node modules folder.`
	`29`	`+ const realNodeModules = fs.realpathSync(nodeModules);`
`27`	`30`	`// --aot puts the generated *.ngfactory.ts in src/$$_gendir/node_modules.`
`28`	`31`	`const genDirNodeModules = path.resolve(appRoot, '$$_gendir', 'node_modules');`
`29`	`32`
`30`	`33`	`extraPlugins.push(new webpack.optimize.CommonsChunkPlugin({`
`31`	`34`	`name: 'vendor',`
`32`	`35`	`chunks: ['main'],`
`33`		`- minChunks: (module: any) => module.resource &&`
`34`		`- (module.resource.startsWith(nodeModules) \|\| module.resource.startsWith(genDirNodeModules))`
	`36`	`+ minChunks: (module: any) => {`
	`37`	`+ return module.resource`
	`38`	`+ && ( module.resource.startsWith(nodeModules)`
	`39`	`+ \|\| module.resource.startsWith(genDirNodeModules)`
	`40`	`+ \|\| module.resource.startsWith(realNodeModules));`
	`41`	`+ }`
`35`	`42`	`}));`
`36`	`43`	`}`
`37`	`44`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -35,10 +35,12 @@ const pree2eNpmScript = `webdriver-manager update --standalone false --gecko fal
`35`	`35`	`class JsonWebpackSerializer {`
`36`	`36`	`public imports: {[name: string]: string[]} = {};`
`37`	`37`	`public variableImports: {[name: string]: string} = {`
`38`		`- 'path': 'path'`
	`38`	`+ 'fs': 'fs',`
	`39`	`+ 'path': 'path',`
`39`	`40`	`};`
`40`	`41`	`public variables: {[name: string]: string} = {`
`41`	`42`	'nodeModules': `path.join(process.cwd(), 'node_modules')`,
	`43`	+ 'realNodeModules': `fs.realpathSync(nodeModules)`,
`42`	`44`	`'genDirNodeModules':`
`43`	`45`	`path.join(process.cwd(), '${this._appRoot}', '$$_gendir', 'node_modules')`,
`44`	`46`	`};`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,22 @@`
	`1`	`+import {ng} from '../../utils/process';`
	`2`	`+import {deleteFile, expectFileToExist, moveFile, symlinkFile} from '../../utils/fs';`
	`3`	`+`
	`4`	`+`
	`5`	`+// THIS TEST REQUIRES TO MOVE NODE_MODULES AND MOVE IT BACK.`
	`6`	`+export default function() {`
	`7`	`+ return Promise.resolve()`
	`8`	`+ .then(() => moveFile('node_modules', '../node_modules'))`
	`9`	`+ .then(() => symlinkFile('../node_modules', 'node_modules', 'dir'))`
	`10`	`+ .then(() => ng('build'))`
	`11`	`+ .then(() => expectFileToExist('dist/vendor.bundle.js'))`
	`12`	`+ .then(() => expectFileToExist('dist/vendor.bundle.js.map'))`
	`13`	`+ // Cleanup`
	`14`	`+ .then(() => {`
	`15`	`+ return deleteFile('node_modules')`
	`16`	`+ .then(() => moveFile('../node_modules', 'node_modules'));`
	`17`	`+ }, (err: any) => {`
	`18`	`+ return deleteFile('node_modules')`
	`19`	`+ .then(() => moveFile('../node_modules', 'node_modules'))`
	`20`	`+ .then(() => { throw err; });`
	`21`	`+ })`
	`22`	`+}`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,19 @@ export function moveFile(from: string, to: string) {`
`67`	`67`	`});`
`68`	`68`	`}`
`69`	`69`
	`70`	`+`
	`71`	`+export function symlinkFile(from: string, to: string, type?: string) {`
	`72`	`+ return new Promise<void>((resolve, reject) => {`
	`73`	`+ fs.symlink(from, to, type, (err) => {`
	`74`	`+ if (err) {`
	`75`	`+ reject(err);`
	`76`	`+ } else {`
	`77`	`+ resolve();`
	`78`	`+ }`
	`79`	`+ });`
	`80`	`+ });`
	`81`	`+}`
	`82`	`+`
`70`	`83`	`export function createDir(path: string) {`
`71`	`84`	`_recursiveMkDir(path);`
`72`	`85`	`}`

Comments

(0)