Merge branch 'Alex61NN5-master' (07178736) · Commits · Isfand Yar Khan / angular-mentions

.angular-cli.json

deleted100644 → 0

+0 −60

Original line number	Original line	Diff line number	Diff line
	{
	"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
	"project": {
	"name": "angular-mentions"
	},
	"apps": [
	{
	"root": "src",
	"outDir": "dist",
	"assets": [
	"assets",
	"favicon.ico"
	],
	"index": "index.html",
	"main": "main.ts",
	"polyfills": "polyfills.ts",
	"test": "test.ts",
	"prefix": "app",
	"styles": [
	"styles.css"
	],
	"scripts": [],
	"tsconfig": "tsconfig.app.json",
	"testTsconfig": "tsconfig.spec.json",
	"environmentSource": "environments/environment.ts",
	"environments": {
	"dev": "environments/environment.ts",
	"prod": "environments/environment.prod.ts"
	}
	}
	],
	"e2e": {
	"protractor": {
	"config": "./protractor.conf.js"
	}
	},
	"lint": [
	{
	"project": "src/tsconfig.app.json"
	},
	{
	"project": "src/tsconfig.spec.json"
	},
	{
	"project": "e2e/tsconfig.e2e.json"
	}
	],
	"test": {
	"karma": {
	"config": "./karma.conf.js"
	}
	},
	"defaults": {
	"styleExt": "css",
	"component": {
	"inlineTemplate": false,
	"spec": true
	}
	}
	}

README.md

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@ To install and start the demo application:

	Add the package as a dependency to your project using:		Add the package as a dependency to your project using:

	npm install --save angular-mentions		`npm install --save angular-mentions`

	Add the CSS to your index.html:		Add the CSS to your index.html:

angular.json

0 → 100644

+130 −0

Original line number	Original line	Diff line number	Diff line
			{
			"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
			"version": 1,
			"newProjectRoot": "projects",
			"projects": {
			"angular-mentions": {
			"root": "",
			"sourceRoot": "src",
			"projectType": "application",
			"architect": {
			"build": {
			"builder": "@angular-devkit/build-angular:browser",
			"options": {
			"outputPath": "dist",
			"index": "src/index.html",
			"main": "src/main.ts",
			"tsConfig": "src/tsconfig.app.json",
			"polyfills": "src/polyfills.ts",
			"assets": [
			"src/assets",
			"src/favicon.ico"
			],
			"styles": [
			"src/styles.css"
			],
			"scripts": []
			},
			"configurations": {
			"production": {
			"optimization": true,
			"outputHashing": "all",
			"sourceMap": false,
			"extractCss": true,
			"namedChunks": false,
			"aot": true,
			"extractLicenses": true,
			"vendorChunk": false,
			"buildOptimizer": true,
			"fileReplacements": [
			{
			"replace": "src/environments/environment.ts",
			"with": "src/environments/environment.prod.ts"
			}
			]
			}
			}
			},
			"serve": {
			"builder": "@angular-devkit/build-angular:dev-server",
			"options": {
			"browserTarget": "angular-mentions:build"
			},
			"configurations": {
			"production": {
			"browserTarget": "angular-mentions:build:production"
			}
			}
			},
			"extract-i18n": {
			"builder": "@angular-devkit/build-angular:extract-i18n",
			"options": {
			"browserTarget": "angular-mentions:build"
			}
			},
			"test": {
			"builder": "@angular-devkit/build-angular:karma",
			"options": {
			"main": "src/test.ts",
			"karmaConfig": "./karma.conf.js",
			"polyfills": "src/polyfills.ts",
			"tsConfig": "src/tsconfig.spec.json",
			"scripts": [],
			"styles": [
			"src/styles.css"
			],
			"assets": [
			"src/assets",
			"src/favicon.ico"
			]
			}
			},
			"lint": {
			"builder": "@angular-devkit/build-angular:tslint",
			"options": {
			"tsConfig": [
			"src/tsconfig.app.json",
			"src/tsconfig.spec.json"
			],
			"exclude": []
			}
			}
			}
			},
			"angular-mentions-e2e": {
			"root": "e2e",
			"sourceRoot": "e2e",
			"projectType": "application",
			"architect": {
			"e2e": {
			"builder": "@angular-devkit/build-angular:protractor",
			"options": {
			"protractorConfig": "./protractor.conf.js",
			"devServerTarget": "angular-mentions:serve"
			}
			},
			"lint": {
			"builder": "@angular-devkit/build-angular:tslint",
			"options": {
			"tsConfig": [
			"e2e/tsconfig.e2e.json"
			],
			"exclude": []
			}
			}
			}
			}
			},
			"defaultProject": "angular-mentions",
			"schematics": {
			"@schematics/angular:component": {
			"inlineTemplate": false,
			"spec": true,
			"prefix": "app",
			"styleext": "css"
			},
			"@schematics/angular:directive": {
			"prefix": "app"
			}
			}
			}
			No newline at end of file

karma.conf.js

+6 −15

Original line number	Original line	Diff line number	Diff line
	@@ -4,35 +4,26 @@
	module.exports = function (config) {		module.exports = function (config) {
	config.set({		config.set({
	basePath: '',		basePath: '',
	frameworks: ['jasmine', '@angular/cli'],		frameworks: ['jasmine', '@angular-devkit/build-angular'],
	plugins: [		plugins: [
	require('karma-jasmine'),		require('karma-jasmine'),
	require('karma-chrome-launcher'),		require('karma-chrome-launcher'),
	require('karma-jasmine-html-reporter'),		require('karma-jasmine-html-reporter'),
	require('karma-coverage-istanbul-reporter'),		require('karma-coverage-istanbul-reporter'),
	require('@angular/cli/plugins/karma')		require('@angular-devkit/build-angular/plugins/karma')
	],		],
	client:{		client:{
	clearContext: false // leave Jasmine Spec Runner output visible in browser		clearContext: false // leave Jasmine Spec Runner output visible in browser
	},		},
	files: [		files: [
	{ pattern: './src/test.ts', watched: false }
	],		],
	preprocessors: {		preprocessors: {
	'./src/test.ts': ['@angular/cli']
	},		},
	coverageIstanbulReporter: {		coverageIstanbulReporter: {
	reports: [ 'html', 'lcovonly' ],		dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
	fixWebpackSourcePaths: true		fixWebpackSourcePaths: true
	},		},
	reporters: config.angularCli && config.angularCli.codeCoverage		reporters: config.);
	? ['progress', 'coverage-istanbul']
	: ['progress', 'kjhtml'],
	port: 9876,
	colors: true,
	logLevel: config.LOG_INFO,
	autoWatch: true,
	browsers: ['Chrome'],
	singleRun: false
	});
	};		};

package-lock.json

+7730 −6296

File changed.

Preview size limit exceeded, changes collapsed.