Skip to content

Commit 017e7fb

Browse files
kategenglerkategengler
authored
Merge pull request #962 from bertdeblock/stop-backing-up-node-modules
2 parents ec8d2ab + 998054e commit 017e7fb

11 files changed

Lines changed: 3 additions & 88 deletions

File tree

‎.eslintignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
.eslintrc.js
1717

1818
# ember-try
19-
/.node_modules.ember-try/
2019
/bower.json.ember-try
2120
/package.json.ember-try

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
/yarn-error.log
1919

2020
# ember-try
21-
/.node_modules.ember-try/
2221
/bower.json.ember-try
2322
/package.json.ember-try
2423

‎.npmignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
.gitkeep
3232

3333
# ember-try
34-
/.node_modules.ember-try/
3534
/bower.json.ember-try
3635
/package.json.ember-try
3736

‎lib/dependency-manager-adapters/npm.js‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ module.exports = CoreObject.extend({
2121
configKey: 'npm',
2222
packageJSON: 'package.json',
2323
packageJSONBackupFileName: 'package.json.ember-try',
24-
nodeModules: 'node_modules',
25-
nodeModulesBackupLocation: '.node_modules.ember-try',
2624
npmShrinkWrap: 'npm-shrinkwrap.json',
2725
npmShrinkWrapBackupFileName: 'npm-shrinkwrap.json.ember-try',
2826
packageLock: 'package-lock.json',
@@ -64,10 +62,7 @@ module.exports = CoreObject.extend({
6462

6563
debug('Remove backup package.json and node_modules');
6664

67-
let cleanupTasks = [
68-
rimraf(path.join(this.cwd, this.packageJSONBackupFileName)),
69-
rimraf(path.join(this.cwd, this.nodeModulesBackupLocation)),
70-
];
65+
let cleanupTasks = [rimraf(path.join(this.cwd, this.packageJSONBackupFileName))];
7166

7267
if (fs.existsSync(path.join(this.cwd, this.yarnLockBackupFileName))) {
7368
cleanupTasks.push(rimraf(path.join(this.cwd, this.yarnLockBackupFileName)));
@@ -104,7 +99,7 @@ module.exports = CoreObject.extend({
10499
},
105100

106101
_findCurrentVersionOf(packageName) {
107-
let filename = path.join(this.cwd, this.nodeModules, packageName, this.packageJSON);
102+
let filename = path.join(this.cwd, 'node_modules', packageName, this.packageJSON);
108103
if (fs.existsSync(filename)) {
109104
return JSON.parse(fs.readFileSync(filename)).version;
110105
} else {
@@ -229,13 +224,6 @@ module.exports = CoreObject.extend({
229224
),
230225
];
231226

232-
let nodeModulesBackupLocation = path.join(this.cwd, this.nodeModulesBackupLocation);
233-
if (fs.existsSync(nodeModulesBackupLocation)) {
234-
restoreTasks.push(
235-
copy(nodeModulesBackupLocation, path.join(this.cwd, this.nodeModules), { clobber: true })
236-
);
237-
}
238-
239227
let yarnLockBackupFileName = path.join(this.cwd, this.yarnLockBackupFileName);
240228
if (fs.existsSync(yarnLockBackupFileName)) {
241229
restoreTasks.push(copy(yarnLockBackupFileName, path.join(this.cwd, this.yarnLock)));
@@ -251,7 +239,7 @@ module.exports = CoreObject.extend({
251239
restoreTasks.push(copy(packageLockBackupFileName, path.join(this.cwd, this.packageLock)));
252240
}
253241

254-
return Promise.all(restoreTasks);
242+
return Promise.all(restoreTasks).then(() => this._install());
255243
},
256244

257245
_backupOriginalDependencies() {
@@ -264,15 +252,6 @@ module.exports = CoreObject.extend({
264252
),
265253
];
266254

267-
let nodeModulesPath = path.join(this.cwd, this.nodeModules);
268-
if (fs.existsSync(nodeModulesPath)) {
269-
backupTasks.push(
270-
copy(nodeModulesPath, path.join(this.cwd, this.nodeModulesBackupLocation), {
271-
clobber: true,
272-
})
273-
);
274-
}
275-
276255
let yarnLockPath = path.join(this.cwd, this.yarnLock);
277256
if (fs.existsSync(yarnLockPath)) {
278257
backupTasks.push(copy(yarnLockPath, path.join(this.cwd, this.yarnLockBackupFileName)));

‎smoke-test-app/.eslintignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
.eslintcache
1818

1919
# ember-try
20-
/.node_modules.ember-try/
2120
/bower.json.ember-try
2221
/npm-shrinkwrap.json.ember-try
2322
/package.json.ember-try

‎smoke-test-app/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
/yarn-error.log
2222

2323
# ember-try
24-
/.node_modules.ember-try/
2524
/bower.json.ember-try
2625
/npm-shrinkwrap.json.ember-try
2726
/package.json.ember-try

‎smoke-test-app/.npmignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
.gitkeep
3232

3333
# ember-try
34-
/.node_modules.ember-try/
3534
/bower.json.ember-try
3635
/npm-shrinkwrap.json.ember-try
3736
/package.json.ember-try

‎smoke-test-app/.prettierignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
.lint-todo/
1818

1919
# ember-try
20-
/.node_modules.ember-try/
2120
/bower.json.ember-try
2221
/npm-shrinkwrap.json.ember-try
2322
/package.json.ember-try

‎test/dependency-manager-adapters/npm-adapter-test.js‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ describe('npmAdapter', () => {
3030
describe('#setup', () => {
3131
it('backs up the package.json file and node_modules', async () => {
3232
fs.mkdirSync('node_modules');
33-
writeJSONFile('node_modules/prove-it.json', { originalNodeModules: true });
3433
writeJSONFile('package.json', { originalPackageJSON: true });
3534

3635
let adapter = new NpmAdapter({ cwd: tmpdir });
@@ -39,14 +38,10 @@ describe('npmAdapter', () => {
3938
assertFileContainsJSON(path.join(tmpdir, 'package.json.ember-try'), {
4039
originalPackageJSON: true,
4140
});
42-
assertFileContainsJSON(path.join(tmpdir, '.node_modules.ember-try/prove-it.json'), {
43-
originalNodeModules: true,
44-
});
4541
});
4642

4743
it('backs up the yarn.lock file, npm-shrinkwrap.json and package-lock.json if they exist', async () => {
4844
fs.mkdirSync('node_modules');
49-
writeJSONFile('node_modules/prove-it.json', { originalNodeModules: true });
5045
writeJSONFile('package.json', { originalPackageJSON: true });
5146
writeJSONFile('yarn.lock', { originalYarnLock: true });
5247
writeJSONFile('npm-shrinkwrap.json', { originalNpmShrinkWrap: true });
@@ -58,9 +53,6 @@ describe('npmAdapter', () => {
5853
assertFileContainsJSON(path.join(tmpdir, 'package.json.ember-try'), {
5954
originalPackageJSON: true,
6055
});
61-
assertFileContainsJSON(path.join(tmpdir, '.node_modules.ember-try/prove-it.json'), {
62-
originalNodeModules: true,
63-
});
6456
assertFileContainsJSON(path.join(tmpdir, 'yarn.lock.ember-try'), {
6557
originalYarnLock: true,
6658
});
@@ -347,23 +339,16 @@ describe('npmAdapter', () => {
347339
it('replaces the package.json with the backed up version', async () => {
348340
writeJSONFile('package.json.ember-try', { originalPackageJSON: true });
349341
writeJSONFile('package.json', { originalPackageJSON: false });
350-
fs.mkdirSync('.node_modules.ember-try');
351-
writeJSONFile('.node_modules.ember-try/prove-it.json', { originalNodeModules: true });
352342

353343
let adapter = new NpmAdapter({ cwd: tmpdir });
354344
await adapter._restoreOriginalDependencies();
355345

356346
assertFileContainsJSON(path.join(tmpdir, 'package.json'), { originalPackageJSON: true });
357-
assertFileContainsJSON(path.join(tmpdir, 'node_modules/prove-it.json'), {
358-
originalNodeModules: true,
359-
});
360347
});
361348

362349
it('replaces the yarn.lock, npm-shrinkwrap.json and package-lock.json with the backed up version if they exist', async () => {
363350
writeJSONFile('package.json.ember-try', { originalPackageJSON: true });
364351
writeJSONFile('package.json', { originalPackageJSON: false });
365-
fs.mkdirSync('.node_modules.ember-try');
366-
writeJSONFile('.node_modules.ember-try/prove-it.json', { originalNodeModules: true });
367352
writeJSONFile('yarn.lock.ember-try', { originalYarnLock: true });
368353
writeJSONFile('yarn.lock', { originalYarnLock: false });
369354
writeJSONFile('npm-shrinkwrap.json.ember-try', { originalNpmShrinkWrap: true });
@@ -375,9 +360,6 @@ describe('npmAdapter', () => {
375360
await adapter._restoreOriginalDependencies();
376361

377362
assertFileContainsJSON(path.join(tmpdir, 'package.json'), { originalPackageJSON: true });
378-
assertFileContainsJSON(path.join(tmpdir, 'node_modules/prove-it.json'), {
379-
originalNodeModules: true,
380-
});
381363
assertFileContainsJSON(path.join(tmpdir, 'yarn.lock'), { originalYarnLock: true });
382364
assertFileContainsJSON(path.join(tmpdir, 'npm-shrinkwrap.json'), {
383365
originalNpmShrinkWrap: true,

‎test/dependency-manager-adapters/pnpm-adapter-test.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ describe('pnpm Adapter', () => {
2626
it('backs up the `package.json` and `pnpm-lock.yaml` files', async () => {
2727
await fs.outputJson('package.json', { originalPackageJSON: true });
2828
await fs.outputFile('pnpm-lock.yaml', 'originalYAML: true\n');
29-
await fs.outputJson('node_modules/prove-it.json', { originalNodeModules: true });
3029

3130
let adapter = new PnpmAdapter({ cwd: tmpdir });
3231
await adapter.setup();
@@ -37,12 +36,10 @@ describe('pnpm Adapter', () => {
3736
expect(await fs.readFile('pnpm-lock.ember-try.yaml', 'utf-8')).to.equal(
3837
'originalYAML: true\n'
3938
);
40-
expect(fs.existsSync('.node_modules.ember-try')).to.be.false;
4139
});
4240

4341
it('ignores missing `pnpm-lock.yaml` files', async () => {
4442
await fs.outputJson('package.json', { originalPackageJSON: true });
45-
await fs.outputJson('node_modules/prove-it.json', { originalNodeModules: true });
4643

4744
let adapter = new PnpmAdapter({ cwd: tmpdir });
4845
await adapter.setup();
@@ -51,7 +48,6 @@ describe('pnpm Adapter', () => {
5148
originalPackageJSON: true,
5249
});
5350
expect(fs.existsSync('pnpm-lock.ember-try.yaml')).to.be.false;
54-
expect(fs.existsSync('.node_modules.ember-try')).to.be.false;
5551
});
5652
});
5753

@@ -145,7 +141,6 @@ describe('pnpm Adapter', () => {
145141
expect(await fs.readFile('pnpm-lock.yaml', 'utf-8')).to.equal('originalYAML: true\n');
146142
expect(fs.existsSync('package.json.ember-try')).to.be.false;
147143
expect(fs.existsSync('pnpm-lock.ember-try.yaml')).to.be.false;
148-
expect(fs.existsSync('.node_modules.ember-try')).to.be.false;
149144

150145
expect(runCount).to.equal(1);
151146
});

0 commit comments

Comments
 (0)