final cleanup after project import (via allure-framework#6)

packages/allure-cucumberjs/.eslintrc.yml → .eslintrc.yml

@@ -1,7 +1,7 @@
 ---
 root: true
 
-parser: typescript-eslint-parser
+parser: "@typescript-eslint/parser"
 
 parserOptions:
     sourceType: module

.gitignore

@@ -7,8 +7,6 @@ build
 schema
 .gradle
 
-out/
-
 #Eclipse files
 *.settings
 *.classpath
@@ -17,11 +15,17 @@ out/
 
 #Node
 node_modules
-npm-debug.log
 package-lock.json
 
 #Other
 .repo
 
 #Mac OS stuff
 .DS_Store
+
+#Junk
+
+out
+dist
+*.tgz
+*.log

README.md

@@ -1,19 +1,25 @@
 # Allure Javascript Integrations
 
-This project aggregates Allure 2 Javascript commons and reporters. 
+This project aggregates Allure Javascript commons and reporters. 
+
+## Currently supported frameworks
+
+- Jasmine
+- Cucumber.JS
+- Mocha
 
 ## Local Development
 
-Install root dependencies:
+Install dependencies and bootstrap Lerna links:
 
 ```bash
 npm install
 ```
 
-Link dependencies and build all packages:
+Build:
 
 ```bash
-npm run setup
+npm run build
 ```  
 
 Run tests for all the packages:

package.json

@@ -1,22 +1,29 @@
 {
-  "private": true,
-  "scripts": {
-    "bootstrap": "npm run clean && lerna bootstrap",
-    "build": "lerna run build",
-    "clean": "run-p clean:*",
-    "clean:build": "rimraf ./packages/*/build",
-    "clean:pkglock": "rimraf ./packages/*/package-lock.json",
-    "clean:node_modules": "rimraf ./packages/*/node_modules",
-    "release": "lerna publish",
-    "setup": "run-s bootstrap build",
-    "test": "lerna run test"
-  },
-  "devDependencies": {
-    "@types/node": "^10.12.1",
-    "allure-commandline": "^2.7.0",
-    "lerna": "^3.4.3",
-    "npm-run-all": "^4.1.3",
-    "rimraf": "^2.6.2",
-    "typescript": "^3.1.5"
-  }
+	"private": true,
+	"scripts": {
+		"build": "npm run clean && lerna run build",
+		"test": "lerna run test",
+		"clean": "lerna run clean",
+		"release": "lerna publish",
+		"lint": "lerna run lint",
+		"lint-fix": "lerna run lint-fix",
+
+		"prepublish": "npm run bootstrap",
+		"bootstrap": "npm run pre-bootstrap && lerna bootstrap --hoist",
+		"pre-bootstrap": "run-p pre-bootstrap:*",
+		"pre-bootstrap:pkglock": "rimraf ./packages/*/package-lock.json",
+		"pre-bootstrap:node_modules": "rimraf ./packages/*/node_modules",
+		"pack": "lerna exec -- npm pack"
+	},
+	"devDependencies": {
+		"@types/node": "^10.12.18",
+		"allure-commandline": "^2.9.0",
+		"lerna": "^3.10.6",
+		"npm-run-all": "^4.1.5",
+		"rimraf": "^2.6.3",
+		"typescript": "^3.2.4",
+		"eslint": "^5.12.1",
+		"eslint-plugin-typescript": "^0.14.0",
+		"@typescript-eslint/parser": "^1.0.0"
+	}
 }

packages/allure-cucumberjs/.npmignore

@@ -1,8 +1,8 @@
-README.md
+*
 !dist/**/*
 dist/features
 dist/declarations/features
 !package.json
-package-lock.json
+!package-lock.json
 !*.md
 !*.txt

packages/allure-cucumberjs/README.md

@@ -1,9 +1,8 @@
-# cucumberjs-allure2-reporter
+# allure-cucumberjs
 
-Allure 2 reporter for Cucumber.JS framework
-Compatible with Cucumber.JS 3+ and Allure 2+
+Allure integration for Cucumber.JS framework
 
-NPM link: [cucumberjs-allure2-reporter](https://www.npmjs.com/package/cucumberjs-allure2-reporter)
+Compatible with Cucumber.JS 3+ and Allure 2+
 
 ### How to use
 Create Reporter file:

packages/allure-cucumberjs/package.json

@@ -1,32 +1,31 @@
 {
 	"name": "allure-cucumberjs",
 	"version": "2.0.0-beta.1",
-	"description": "Allure 2 reporter for Cucumber.JS framework",
+	"description": "Allure Cucumber.JS integration",
+	"license": "Apache-2.0",
 	"author": "Ilya Korobitsyn <[email protected]>",
 	"contributors": [
 		"Claudia Hardman <[email protected]>"
 	],
-	"repository": "https://github.com/korobochka/cucumberjs-allure2-reporter",
+	"repository": "https://github.com/allure-framework/allure-js",
 	"main": "./dist/index.js",
 	"typings": "./dist/declarations/",
 	"scripts": {
+		"clean": "rimraf ./dist ./out",
+		"lint": "eslint ./src/**/*.ts ./features/step_definitions/**/*.ts ./index.ts",
+		"lint-fix": "eslint --fix ./src/**/*.ts ./features/step_definitions/**/*.ts ./index.ts",
 		"compile": "tsc",
-		"clean": "rimraf ./dist",
-		"prepare": "npm run clean && npm run build",
 		"build": "npm run lint && npm run compile",
+		"prepublishOnly": "npm run clean && npm run build",
+
 		"generate-report": "allure generate ./out/allure-results -o ./out/allure-report --clean",
-		"runTest": "node $NODE_DEBUG_OPTION ./node_modules/cucumber/bin/cucumber-js --require ./dist/features/step_definitions/ --format ./dist/features/step_definitions/Reporter.js:./dist/dummy.txt",
-		"runTestNoReporter": "node $NODE_DEBUG_OPTION ./node_modules/cucumber/bin/cucumber-js --require ./dist/features/step_definitions/ --format event-protocol:./out/event-protocol.txt",
-		"test": "rimraf ./out ; npm run build && npm run runTest ; npm run generate-report",
-		"lint": "eslint ./src/**/*.ts ./features/step_definitions/**/*.ts ./index.ts"
+		"runTest": "cucumber-js --require ./dist/features/step_definitions/ --format ./dist/features/step_definitions/Reporter.js:./dist/dummy.txt",
+		"runTestNoReporter": "cucumber-js --require ./dist/features/step_definitions/ --format event-protocol:./out/event-protocol.txt",
+		"test": "rimraf ./out ; npm run build && npm run runTest ; npm run generate-report"
 	},
-	"license": "Apache-2.0",
 	"devDependencies": {
 		"@types/cucumber": "^4.0.4",
-		"cucumber": "^4.2.1",
-		"eslint": "^5.2.0",
-		"eslint-plugin-typescript": "^0.12.0",
-		"typescript-eslint-parser": "^17.0.1"
+		"cucumber": "^4.2.1"
 	},
 	"dependencies": {
 		"allure-js-commons": "2.0.0-beta.1"

packages/allure-cucumberjs/tsconfig.json

@@ -1,18 +1,16 @@
 {
-	"compilerOptions": {
-		"outDir": "./dist",
-		"target": "es5",
-		"lib": ["es6"],
-		"module": "commonjs",
-		"moduleResolution": "node",
-		"declaration": true,
-		"declarationDir": "./dist/declarations",
-		"strict": true,
-		"sourceMap": true
-	},
+	"extends": "../../tsconfig.json",
 	"include": [
 		"./src/**/*",
 		"./features/step_definitions/**/*",
 		"./index.ts"
-	]
+	],
+	"compilerOptions": {
+		"types": [
+			"node",
+			"cucumber"
+		],
+		"outDir": "./dist",
+		"declarationDir": "./dist/declarations"
+	}
 }

packages/allure-jasmine/.npmignore

@@ -1,8 +1,8 @@
-.eslintrc.yml
+*
 !dist/**/*
 dist/test
 dist/declarations/test
 !package.json
-package-lock.json
+!package-lock.json
 !*.md
 !*.txt

packages/allure-jasmine/README.md

@@ -1,8 +1,6 @@
-# jasmine-allure2-reporter
+# allure-jasmine
 
-Allure 2 reporter for Jasmine framework
-
-NPM link: [jasmine-allure2-reporter](https://www.npmjs.com/package/jasmine-allure2-reporter)
+Allure integration Jasmine framework
 
 For usage example see `test/Setup.ts`
 

packages/allure-jasmine/package.json

@@ -1,29 +1,28 @@
 {
 	"name": "allure-jasmine",
 	"version": "2.0.0-beta.1",
-	"description": "Allure 2 reporter for Jasmine framework",
+	"description": "Allure Jasmine integration",
+	"license": "Apache-2.0",
 	"author": "Ilya Korobitsyn <[email protected]>",
-	"repository": "https://github.com/korobochka/jasmine-allure2-reporter",
+	"repository": "https://github.com/allure-framework/allure-js",
 	"main": "./dist/index.js",
 	"typings": "./dist/declarations/",
 	"scripts": {
+		"clean": "rimraf ./dist ./out",
+		"lint": "eslint ./src/** ./test/** ./index.ts",
+		"lint-fix": "eslint --fix ./src/** ./test/** ./index.ts",
 		"compile": "tsc",
-		"clean": "rimraf ./dist",
-		"prepare": "npm run clean && npm run build",
 		"build": "npm run lint && npm run compile",
+		"prepublishOnly": "npm run clean && npm run build",
+
 		"generate-report": "allure generate ./out/allure-results -o ./out/allure-report --clean",
 		"runTest": "jasmine ./dist/test/*.js",
 		"runTestDebug": "node $NODE_DEBUG_OPTION ./node_modules/jasmine/bin/jasmine ./dist/test/*.js",
-		"test": "rimraf ./out ; npm run build && npm run runTest ; npm run generate-report",
-		"lint": "eslint ./src/** ./test/** ./index.ts"
+		"test": "rimraf ./out ; npm run build && npm run runTest ; npm run generate-report"
 	},
-	"license": "Apache-2.0",
 	"devDependencies": {
-		"@types/jasmine": "^2.8.8",
-		"eslint": "^5.2.0",
-		"eslint-plugin-typescript": "^0.12.0",
-		"jasmine": "^3.1.0",
-		"typescript-eslint-parser": "^17.0.1"
+		"@types/jasmine": "^3.3.7",
+		"jasmine": "^3.3.1"
 	},
 	"dependencies": {
 		"allure-js-commons": "2.0.0-beta.1"