8
0
Maksymilian Barnaś 9 лет назад
Родитель
Сommit
14d75da3b0
3 измененных файлов с 22 добавлено и 22 удалено
  1. 13 13
      dev/tests/utils/ckeditor5-dirs.js
  2. 9 8
      dev/utils/ckeditor5-dirs.js
  3. 0 1
      package.json

+ 13 - 13
dev/tests/utils/ckeditor5-dirs.js

@@ -65,9 +65,9 @@ describe( 'utils', () => {
 				sandbox.stub( tools, 'getDirectories', () => sourceDirectories );
 				const directories = ckeditor5Dirs.getDirectories( workspacePath );
 
-				expect( directories.length ).equal( 2 );
-				expect( directories[ 0 ] ).equal( 'ckeditor5-core' );
-				expect( directories[ 1 ] ).equal( 'ckeditor5-plugin-image' );
+				expect( directories.length ).to.equal( 2 );
+				expect( directories[ 0 ] ).to.equal( 'ckeditor5-core' );
+				expect( directories[ 1 ] ).to.equal( 'ckeditor5-plugin-image' );
 			} );
 		} );
 
@@ -131,12 +131,12 @@ describe( 'utils', () => {
 
 				const directories = ckeditor5Dirs.getDevDirectories( workspacePath, packageJSONDependencies, ckeditor5Path );
 
-				expect( directories.length ).equal( 2 );
-				expect( directories[ 0 ] ).eql( {
+				expect( directories.length ).to.equal( 2 );
+				expect( directories[ 0 ] ).to.deep.equal( {
 						repositoryURL: 'ckeditor/ckeditor5-plugin-image',
 						repositoryPath: '/workspace/path/ckeditor5/node_modules/ckeditor5-plugin-image'
 					} );
-				expect( directories[ 1 ] ).eql( {
+				expect( directories[ 1 ] ).to.deep.equal( {
 						repositoryURL: 'ckeditor/ckeditor5-core',
 						repositoryPath: '/workspace/path/ckeditor5/node_modules/ckeditor5-core'
 					} );
@@ -150,19 +150,19 @@ describe( 'utils', () => {
 
 				const directories = ckeditor5Dirs.getDevDirectories( workspacePath, packageJSONDependencies, ckeditor5Path, includeRoot );
 
-				expect( directories.length ).equal( 3 );
-				expect( directories[ 0 ] ).eql( {
+				expect( directories.length ).to.equal( 3 );
+				expect( directories[ 0 ] ).to.deep.equal( {
+						repositoryURL: 'ckeditor/ckeditor5',
+						repositoryPath: '/workspace/path/ckeditor5'
+					} );
+				expect( directories[ 1 ] ).to.deep.equal( {
 						repositoryURL: 'ckeditor/ckeditor5-plugin-image',
 						repositoryPath: '/workspace/path/ckeditor5/node_modules/ckeditor5-plugin-image'
 					} );
-				expect( directories[ 1 ] ).eql( {
+				expect( directories[ 2 ] ).to.deep.equal( {
 						repositoryURL: 'ckeditor/ckeditor5-core',
 						repositoryPath: '/workspace/path/ckeditor5/node_modules/ckeditor5-core'
 					} );
-				expect( directories[ 2 ] ).eql( {
-						repositoryURL: 'ckeditor/ckeditor5',
-						repositoryPath: '/workspace/path/ckeditor5'
-					} );
 			} );
 		} );
 	} );

+ 9 - 8
dev/utils/ckeditor5-dirs.js

@@ -79,19 +79,12 @@ module.exports = {
 		const directories = this.getDirectories( workspacePath );
 		const dependencies = this.getDependencies( packageJSON.dependencies );
 
-		if ( includeRoot ) {
-			// Add root dependency and directory.
-			dependencies.ckeditor5 = 'ckeditor/ckeditor5';
-			directories.push( 'ckeditor5' );
-		}
-
 		let devDirectories = [];
 
 		for ( let dependency in dependencies ) {
 			const repositoryURL = dependencies[ dependency ];
 			const urlInfo = git.parseRepositoryUrl( repositoryURL );
-			const isRootDep = dependency == 'ckeditor5';
-			const repositoryPath = isRootDep ? ckeditor5Path : path.join( ckeditor5Path, 'node_modules', dependency );
+			const repositoryPath = path.join( ckeditor5Path, 'node_modules', dependency );
 
 			// Check if repository's directory already exists.
 			if ( directories.indexOf( urlInfo.name ) > -1 ) {
@@ -102,6 +95,14 @@ module.exports = {
 			}
 		}
 
+		if ( includeRoot ) {
+			// Add root dependency and directory.
+			devDirectories.unshift( {
+				repositoryPath: ckeditor5Path,
+				repositoryURL: 'ckeditor/ckeditor5'
+			} );
+		}
+
 		return devDirectories;
 	}
 };

+ 0 - 1
package.json

@@ -75,7 +75,6 @@
     "parse-gitignore": "^0.2.0",
     "pretty-bytes": "^3.0.1",
     "regenerator-runtime": "^0.9.5",
-    "parse-gitignore": "^0.2.0",
     "replace": "^0.3.0",
     "rollup": "^0.33.0",
     "rollup-plugin-babel": "^2.4.0",