Przeglądaj źródła

Moved dev tasks files to their final location.

Szymon Kupś 10 lat temu
rodzic
commit
493db13fa0

dev/tasks/gulp/build/tasks.js → dev/tasks/build/tasks.js


dev/tasks/gulp/build/utils.js → dev/tasks/build/utils.js


+ 1 - 1
dev/tasks/gulp/dev/tasks.js

@@ -14,7 +14,7 @@ const relinkTask = require( './tasks/dev-relink' );
 
 module.exports = ( config ) => {
 	const ckeditor5Path = process.cwd();
-	const packageJSON = require( '../../../../package.json' );
+	const packageJSON = require( '../../../package.json' );
 
 	gulp.task( 'dev-init', () => {
 		initTask( installTask, ckeditor5Path, packageJSON, config.WORKSPACE_DIR, console.log );

dev/tasks/gulp/dev/tasks/dev-boilerplate-update.js → dev/tasks/dev/tasks/dev-boilerplate-update.js


dev/tasks/gulp/dev/tasks/dev-init.js → dev/tasks/dev/tasks/dev-init.js


dev/tasks/gulp/dev/tasks/dev-install.js → dev/tasks/dev/tasks/dev-install.js


dev/tasks/gulp/dev/tasks/dev-plugin-create.js → dev/tasks/dev/tasks/dev-plugin-create.js


dev/tasks/gulp/dev/tasks/dev-relink.js → dev/tasks/dev/tasks/dev-relink.js


dev/tasks/gulp/dev/tasks/dev-status.js → dev/tasks/dev/tasks/dev-status.js


dev/tasks/gulp/dev/tasks/dev-update.js → dev/tasks/dev/tasks/dev-update.js


dev/tasks/gulp/dev/templates/CHANGES.md → dev/tasks/dev/templates/CHANGES.md


dev/tasks/gulp/dev/templates/CONTRIBUTING.md → dev/tasks/dev/templates/CONTRIBUTING.md


dev/tasks/gulp/dev/templates/LICENSE.md → dev/tasks/dev/templates/LICENSE.md


dev/tasks/gulp/dev/templates/README.md → dev/tasks/dev/templates/README.md


dev/tasks/gulp/dev/utils/git.js → dev/tasks/dev/utils/git.js


dev/tasks/gulp/dev/utils/inquiries.js → dev/tasks/dev/utils/inquiries.js


dev/tasks/gulp/dev/utils/tools.js → dev/tasks/dev/utils/tools.js


+ 0 - 13
dev/tasks/githooks.js

@@ -1,13 +0,0 @@
-'use strict';
-
-module.exports = function( grunt ) {
-	grunt.config.merge( {
-		githooks: {
-			all: {
-				'pre-commit': 'default'
-			}
-		}
-	} );
-
-	grunt.loadNpmTasks( 'grunt-githooks' );
-};

+ 0 - 26
dev/tasks/jscs.js

@@ -1,26 +0,0 @@
-'use strict';
-
-const tools = require( './gulp/dev/utils/tools' );
-
-module.exports = ( grunt ) => {
-	tools.setupMultitaskConfig( grunt, {
-		task: 'jscs',
-		defaultOptions: {
-				config: true
-			},
-		addGitIgnore: 'excludeFiles',
-		targets: {
-			all() {
-				return [ '**/*.js' ];
-			},
-
-			git() {
-				return tools.getGitDirtyFiles().filter( function( file ) {
-					return ( /\.js$/ ).test( file );
-				} );
-			}
-		}
-	} );
-
-	grunt.loadNpmTasks( 'grunt-jscs' );
-};

+ 0 - 26
dev/tasks/jshint.js

@@ -1,26 +0,0 @@
-'use strict';
-
-const tools = require( './gulp/dev/utils/tools' );
-
-module.exports = ( grunt ) => {
-	tools.setupMultitaskConfig( grunt, {
-		task: 'jshint',
-		defaultOptions: {
-				jshintrc: true
-			},
-		addGitIgnore: 'ignores',
-		targets: {
-			all() {
-				return [ '**/*.js' ];
-			},
-
-			git() {
-				return tools.getGitDirtyFiles().filter( function( file ) {
-					return ( /\.js$/ ).test( file );
-				} );
-			}
-		}
-	} );
-
-	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-};

dev/tasks/gulp/lint/tasks.js → dev/tasks/lint/tasks.js


+ 3 - 3
dev/tests/dev-boilerplate-update.js

@@ -8,12 +8,12 @@
 'use strict';
 
 const sinon = require( 'sinon' );
-const tools = require( '../tasks/gulp/dev/utils/tools' );
-const git = require( '../tasks/gulp/dev/utils/git' );
+const tools = require( '../../tasks/dev/utils/tools' );
+const git = require( '../../tasks/dev/utils/git' );
 const path = require( 'path' );
 
 describe( 'dev-boilerplate-update', () => {
-	const task = require( '../tasks/gulp/dev/tasks/dev-boilerplate-update' );
+	const task = require( '../../tasks/dev/tasks/dev-boilerplate-update' );
 	const ckeditor5Path = 'path/to/ckeditor5';
 	const workspaceRoot = '..';
 	const workspaceAbsolutePath = path.join( ckeditor5Path, workspaceRoot );

+ 2 - 2
dev/tests/dev-init.js

@@ -8,10 +8,10 @@
 'use strict';
 
 const sinon = require( 'sinon' );
-const tools = require( '../tasks/gulp/dev/utils/tools' );
+const tools = require( '../../tasks/dev/utils/tools' );
 
 describe( 'dev-init', () => {
-	const initTask = require( '../tasks/gulp/dev/tasks/dev-init' );
+	const initTask = require( '../../tasks/dev/tasks/dev-init' );
 	const ckeditor5Path = 'path/to/ckeditor5';
 	const workspaceRoot = '..';
 	const emptyFn = () => {};

+ 3 - 3
dev/tests/dev-install.js

@@ -9,9 +9,9 @@
 
 const chai = require( 'chai' );
 const sinon = require( 'sinon' );
-const git = require( '../tasks/gulp/dev/utils/git' );
-const tools = require( '../tasks/gulp/dev/utils/tools' );
-const installTask = require( '../tasks/gulp/dev/tasks/dev-install' );
+const git = require( '../../tasks/dev/utils/git' );
+const tools = require( '../../tasks/dev/utils/tools' );
+const installTask = require( '../../tasks/dev/tasks/dev-install' );
 const expect = chai.expect;
 const path = require( 'path' );
 

+ 4 - 4
dev/tests/dev-plugin-create.js

@@ -10,9 +10,9 @@
 const chai = require( 'chai' );
 const sinon = require( 'sinon' );
 const expect = chai.expect;
-const tools = require( '../tasks/gulp/dev/utils/tools' );
-const inquiries = require( '../tasks/gulp/dev/utils/inquiries' );
-const git = require( '../tasks/gulp/dev/utils/git' );
+const tools = require( '../../tasks/dev/utils/tools' );
+const inquiries = require( '../../tasks/dev/utils/inquiries' );
+const git = require( '../../tasks/dev/utils/git' );
 const path = require( 'path' );
 const emptyFn = () => { };
 let spies;
@@ -50,7 +50,7 @@ describe( 'dev-tasks', () => {
 	}
 
 	describe( 'dev-plugin-create', () => {
-		const pluginCreateTask = require( '../tasks/gulp/dev/tasks/dev-plugin-create' );
+		const pluginCreateTask = require( '../../tasks/dev/tasks/dev-plugin-create' );
 		const repositoryPath = path.join( workspacePath, pluginName );
 
 		it( 'should exist', () => expect( pluginCreateTask ).to.be.a( 'function' ) );

+ 2 - 2
dev/tests/dev-relink.js

@@ -8,11 +8,11 @@
 'use strict';
 
 const sinon = require( 'sinon' );
-const tools = require( '../tasks/gulp/dev/utils/tools' );
+const tools = require( '../../tasks/dev/utils/tools' );
 const path = require( 'path' );
 
 describe( 'dev-relink', () => {
-	const task = require( '../tasks/gulp/dev/tasks/dev-relink' );
+	const task = require( '../../tasks/dev/tasks/dev-relink' );
 	const ckeditor5Path = 'path/to/ckeditor5';
 	const modulesPath = path.join( ckeditor5Path, 'node_modules' );
 	const workspaceRoot = '..';

+ 3 - 3
dev/tests/dev-status.js

@@ -8,12 +8,12 @@
 'use strict';
 
 const sinon = require( 'sinon' );
-const tools = require( '../tasks/gulp/dev/utils/tools' );
-const git = require( '../tasks/gulp/dev/utils/git' );
+const tools = require( '../../tasks/dev/utils/tools' );
+const git = require( '../../tasks/dev/utils/git' );
 const path = require( 'path' );
 
 describe( 'dev-status', () => {
-	const statusTask = require( '../tasks/gulp/dev/tasks/dev-status' );
+	const statusTask = require( '../../tasks/dev/tasks/dev-status' );
 	const ckeditor5Path = 'path/to/ckeditor5';
 	const workspaceRoot = '..';
 	const workspaceAbsolutePath = path.join( ckeditor5Path, workspaceRoot );

+ 3 - 3
dev/tests/dev-update.js

@@ -8,12 +8,12 @@
 'use strict';
 
 const sinon = require( 'sinon' );
-const tools = require( '../tasks/gulp/dev/utils/tools' );
-const git = require( '../tasks/gulp/dev/utils/git' );
+const tools = require( '../../tasks/dev/utils/tools' );
+const git = require( '../../tasks/dev/utils/git' );
 const path = require( 'path' );
 
 describe( 'dev-update', () => {
-	const updateTask = require( '../tasks/gulp/dev/tasks/dev-update' );
+	const updateTask = require( '../../tasks/dev/tasks/dev-update' );
 	const ckeditor5Path = 'path/to/ckeditor5';
 	const workspaceRoot = '..';
 	const workspaceAbsolutePath = path.join( ckeditor5Path, workspaceRoot );

+ 2 - 2
dev/tests/git.js

@@ -8,10 +8,10 @@
 'use strict';
 
 let toRestore;
-const git = require( '../tasks/gulp/dev/utils/git' );
+const git = require( '../../tasks/dev/utils/git' );
 const chai = require( 'chai' );
 const sinon = require( 'sinon' );
-const tools = require( '../tasks/gulp/dev/utils/tools' );
+const tools = require( '../../tasks/dev/utils/tools' );
 const expect = chai.expect;
 
 describe( 'utils', () => {

+ 1 - 1
dev/tests/tools.js

@@ -10,7 +10,7 @@
 const chai = require( 'chai' );
 const sinon = require( 'sinon' );
 const expect = chai.expect;
-const tools = require( '../tasks/gulp/dev/utils/tools' );
+const tools = require( '../../tasks/dev/utils/tools' );
 const path = require( 'path' );
 const fs = require( 'fs' );
 let toRestore;

+ 0 - 51
gruntfile.js

@@ -1,51 +0,0 @@
-/* jshint node: true, esnext: true, varstmt: true */
-
-'use strict';
-
-const tools = require( './dev/tasks/gulp/dev/utils/tools' );
-
-module.exports = ( grunt ) => {
-	// First register the "default" task, so it can be analyzed by other tasks.
-	grunt.registerTask( 'default', [ 'jshint:git', 'jscs:git' ] );
-
-	// Files that will be ignored by the "jscs" and "jshint" tasks.
-	const ignoreFiles = [
-		// Automatically loaded from .gitignore. Add more if necessary.
-		'lib/**'
-	];
-
-	// Basic configuration which will be overloaded by the tasks.
-	grunt.initConfig( {
-		pkg: grunt.file.readJSON( 'package.json' ),
-		workspaceRoot: '..',
-
-		jshint: {
-			options: {
-				ignores: ignoreFiles
-			}
-		},
-
-		jscs: {
-			options: {
-				excludeFiles: ignoreFiles
-			}
-		},
-
-		replace: {
-			copyright: {
-				src: [ '**/*.*', '**/*.frag' ].concat( tools.getGitIgnore( grunt ).map( i => '!' + i ) )  ,
-				overwrite: true,
-				replacements: [
-					{
-						from: /\@license Copyright \(c\) 2003-\d{4}, CKSource - Frederico Knabben\./,
-						to: '@license Copyright (c) 2003-<%= grunt.template.today("yyyy") %>, CKSource - Frederico Knabben.'
-					}
-				]
-			}
-		}
-	} );
-
-	// Finally load the tasks.
-	grunt.loadTasks( 'dev/tasks' );
-	grunt.loadNpmTasks( 'grunt-text-replace' );
-};

+ 3 - 3
gulpfile.js

@@ -13,8 +13,8 @@ const config = {
 	IGNORED_FILES: [ 'lib/**' ]
 };
 
-require( './dev/tasks/gulp/build/tasks' )( config );
-require( './dev/tasks/gulp/dev/tasks' )( config );
-require( './dev/tasks/gulp/lint/tasks' )( config );
+require( './dev/tasks/build/tasks' )( config );
+require( './dev/tasks/dev/tasks' )( config );
+require( './dev/tasks/lint/tasks' )( config );
 
 gulp.task( 'default', [ 'build' ] );