diff --git a/node_modules/@popperjs/core/package.json b/node_modules/@popperjs/core/package.json index 465531974..040c18aab 100644 --- a/node_modules/@popperjs/core/package.json +++ b/node_modules/@popperjs/core/package.json @@ -1,41 +1,71 @@ { - "_from": "@popperjs/core@^2.4.4", - "_id": "@popperjs/core@2.4.4", - "_inBundle": false, - "_integrity": "sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg==", - "_location": "/@popperjs/core", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "@popperjs/core@^2.4.4", - "name": "@popperjs/core", - "escapedName": "@popperjs%2fcore", - "scope": "@popperjs", - "rawSpec": "^2.4.4", - "saveSpec": null, - "fetchSpec": "^2.4.4" - }, - "_requiredBy": [ - "/tippy.js" + "name": "@popperjs/core", + "version": "2.4.4", + "description": "Tooltip and Popover Positioning Engine", + "main": "dist/cjs/popper.js", + "main:umd": "dist/umd/popper.js", + "module": "lib/popper.js", + "unpkg": "dist/umd/popper.min.js", + "author": "Federico Zivolo ", + "license": "MIT", + "repository": "github:popperjs/popper-core", + "keywords": [ + "tooltip", + "popover", + "dropdown", + "popup", + "popper", + "positioning engine" ], - "_resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.4.4.tgz", - "_shasum": "11d5db19bd178936ec89cd84519c4de439574398", - "_spec": "@popperjs/core@^2.4.4", - "_where": "c:\\wamp64\\apps\\itop\\dev-trunk\\node_modules\\tippy.js", - "author": { - "name": "Federico Zivolo", - "email": "federico.zivolo@gmail.com" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + }, + "files": [ + "index.d.ts", + "/dist", + "/lib" + ], + "sideEffects": false, + "scripts": { + "clean": "rimraf lib && rimraf dist && rimraf test/visual/dist", + "test": "yarn test:unit && yarn test:functional", + "test:unit": "jest --coverage src", + "test:functional": "DEV_PORT=`get-port` jest tests/functional", + "test:flow": "flow", + "test:typescript": "tsc --project tests/typescript/tsconfig.json", + "test:eslint": "eslint .", + "dev": "NODE_ENV=dev concurrently 'yarn serve' 'yarn build:dev --watch'", + "serve": "serve -l ${DEV_PORT:-5000} tests/visual", + "build": "yarn clean && yarn build:es && yarn build:esbrowser && yarn build:bundles && yarn build:flow && yarn build:typescript", + "build:es": "babel src -d lib --ignore '**/*.test.js','**/__mocks__'", + "build:esbrowser": "BROWSER_COMPAT=true yarn build:es -d dist/esm", + "build:bundles": "rollup -c .config/rollup.config.js", + "build:dev": "NODE_ENV=dev babel src -d tests/visual/dist", + "build:flow": "flow-copy-source --ignore \"**/*.test.js\" src lib && replace-in-files --string=__DEV__ --replacement=false 'lib/**/*.flow'", + "build:typescript": "rimraf dist/typescript; flow-to-ts \"src/**/*.js\" --write --inline-utility-types; tsc-silent --project .config/tsconfig.json --createSourceFile .config/createSourceFile.js --suppress @; rimraf \"src/**/*.ts\"", + "prepublishOnly": "yarn build" + }, + "prettier": { + "semi": true, + "trailingComma": "es5", + "singleQuote": true, + "proseWrap": "always" }, "babel": { "extends": "./.config/babel.config" }, - "bugs": { - "url": "https://github.com/popperjs/popper-core/issues" + "jest": { + "preset": "./.config/jest.config" + }, + "eslintConfig": { + "extends": "./.config/eslint.config" + }, + "husky": { + "hooks": { + "pre-commit": "pretty-quick --staged" + } }, - "bundleDependencies": false, - "deprecated": false, - "description": "Tooltip and Popover Positioning Engine", "devDependencies": { "@ampproject/rollup-plugin-closure-compiler": "^0.25.2", "@atomico/rollup-plugin-sizes": "^1.1.4", @@ -82,71 +112,5 @@ "rollup-plugin-visualizer": "^4.0.3", "serve": "^11.3.0", "typescript": "^3.7.5" - }, - "eslintConfig": { - "extends": "./.config/eslint.config" - }, - "files": [ - "index.d.ts", - "/dist", - "/lib" - ], - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - }, - "homepage": "https://github.com/popperjs/popper-core#readme", - "husky": { - "hooks": { - "pre-commit": "pretty-quick --staged" - } - }, - "jest": { - "preset": "./.config/jest.config" - }, - "keywords": [ - "tooltip", - "popover", - "dropdown", - "popup", - "popper", - "positioning engine" - ], - "license": "MIT", - "main": "dist/cjs/popper.js", - "main:umd": "dist/umd/popper.js", - "module": "lib/popper.js", - "name": "@popperjs/core", - "prettier": { - "semi": true, - "trailingComma": "es5", - "singleQuote": true, - "proseWrap": "always" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/popperjs/popper-core.git" - }, - "scripts": { - "build": "yarn clean && yarn build:es && yarn build:esbrowser && yarn build:bundles && yarn build:flow && yarn build:typescript", - "build:bundles": "rollup -c .config/rollup.config.js", - "build:dev": "NODE_ENV=dev babel src -d tests/visual/dist", - "build:es": "babel src -d lib --ignore '**/*.test.js','**/__mocks__'", - "build:esbrowser": "BROWSER_COMPAT=true yarn build:es -d dist/esm", - "build:flow": "flow-copy-source --ignore \"**/*.test.js\" src lib && replace-in-files --string=__DEV__ --replacement=false 'lib/**/*.flow'", - "build:typescript": "rimraf dist/typescript; flow-to-ts \"src/**/*.js\" --write --inline-utility-types; tsc-silent --project .config/tsconfig.json --createSourceFile .config/createSourceFile.js --suppress @; rimraf \"src/**/*.ts\"", - "clean": "rimraf lib && rimraf dist && rimraf test/visual/dist", - "dev": "NODE_ENV=dev concurrently 'yarn serve' 'yarn build:dev --watch'", - "prepublishOnly": "yarn build", - "serve": "serve -l ${DEV_PORT:-5000} tests/visual", - "test": "yarn test:unit && yarn test:functional", - "test:eslint": "eslint .", - "test:flow": "flow", - "test:functional": "DEV_PORT=`get-port` jest tests/functional", - "test:typescript": "tsc --project tests/typescript/tsconfig.json", - "test:unit": "jest --coverage src" - }, - "sideEffects": false, - "unpkg": "dist/umd/popper.min.js", - "version": "2.4.4" + } } diff --git a/node_modules/bulma-scss/form/_file.scss b/node_modules/bulma-scss/form/_file.scss index 1701f757f..1e6dc33d2 100644 --- a/node_modules/bulma-scss/form/_file.scss +++ b/node_modules/bulma-scss/form/_file.scss @@ -224,13 +224,13 @@ $file-name-max-width: 16em !default; } .file-input { - height: 100%; - left: 0; - opacity: 0; - outline: none; - position: absolute; - top: 0; - width: 100%; + height: 100%; + left: 0; + opacity: 0; + outline: none; + position: absolute; + top: 0; + width: 100%; } .file-cta, diff --git a/node_modules/bulma-scss/package.json b/node_modules/bulma-scss/package.json index 44fd0b2a7..4b54bf2a3 100644 --- a/node_modules/bulma-scss/package.json +++ b/node_modules/bulma-scss/package.json @@ -1,53 +1,25 @@ { - "_from": "bulma-scss", - "_id": "bulma-scss@0.9.0-1", - "_inBundle": false, - "_integrity": "sha512-cOZFITkQii6YT0ff+P9FDTORFd2UquRzqb38CHYXVLHQDbiqKJG8cmmYzRXjA7jvEVkQy7I4897CVVG7XYeAkw==", - "_location": "/bulma-scss", - "_phantomChildren": {}, - "_requested": { - "type": "tag", - "registry": true, - "raw": "bulma-scss", - "name": "bulma-scss", - "escapedName": "bulma-scss", - "rawSpec": "", - "saveSpec": null, - "fetchSpec": "latest" - }, - "_requiredBy": [ - "#USER", - "/" - ], - "_resolved": "https://registry.npmjs.org/bulma-scss/-/bulma-scss-0.9.0-1.tgz", - "_shasum": "af7af26d927076c66d09cd979aacfd8feef16b35", - "_spec": "bulma-scss", - "_where": "C:\\wamp64\\apps\\itop\\dev-trunk", - "author": { - "name": "Jim Campbell" - }, - "bugs": { - "url": "https://github.com/j1mc/bulma-scss/issues" - }, - "bundleDependencies": false, - "deprecated": false, + "name": "bulma-scss", + "version": "0.9.0-1", "description": "The Bulma CSS Framework files converted to SCSS syntax", - "homepage": "https://github.com/j1mc/bulma-scss#readme", + "main": "bulma.scss", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/j1mc/bulma-scss.git" + }, "keywords": [ "bulma", "css", "scss", "flexbox" ], + "author": "Jim Campbell", "license": "MIT", - "main": "bulma.scss", - "name": "bulma-scss", - "repository": { - "type": "git", - "url": "git+https://github.com/j1mc/bulma-scss.git" + "bugs": { + "url": "https://github.com/j1mc/bulma-scss/issues" }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "version": "0.9.0-1" + "homepage": "https://github.com/j1mc/bulma-scss#readme" } diff --git a/node_modules/raleway-webfont/package.json b/node_modules/raleway-webfont/package.json index 8c0569397..a61119ed6 100644 --- a/node_modules/raleway-webfont/package.json +++ b/node_modules/raleway-webfont/package.json @@ -1,50 +1,22 @@ { - "_from": "raleway-webfont", - "_id": "raleway-webfont@3.0.1", - "_inBundle": false, - "_integrity": "sha1-Er9rCBVY/eBxffWpfMF/B20eq/o=", - "_location": "/raleway-webfont", - "_phantomChildren": {}, - "_requested": { - "type": "tag", - "registry": true, - "raw": "raleway-webfont", - "name": "raleway-webfont", - "escapedName": "raleway-webfont", - "rawSpec": "", - "saveSpec": null, - "fetchSpec": "latest" - }, - "_requiredBy": [ - "#USER", - "/" - ], - "_resolved": "https://registry.npmjs.org/raleway-webfont/-/raleway-webfont-3.0.1.tgz", - "_shasum": "12bf6b081558fde0717df5a97cc17f076d1eabfa", - "_spec": "raleway-webfont", - "_where": "/srv/http/develop_28", - "author": { - "name": "Pablo Impallari" - }, - "bugs": { - "url": "https://github.com/Dilatorily/raleway/issues" - }, - "bundleDependencies": false, - "deprecated": false, + "name": "raleway-webfont", + "version": "3.0.1", "description": "NPM package for the Raleway font", - "homepage": "https://fonts.google.com/specimen/Raleway", + "main": "raleway.css", + "repository": { + "type": "git", + "url": "git+https://github.com/Dilatorily/raleway.git" + }, "keywords": [ "raleway", "font", "webfont", "css" ], + "author": "Pablo Impallari", "license": "MIT AND OFL-1.1", - "main": "raleway.css", - "name": "raleway-webfont", - "repository": { - "type": "git", - "url": "git+https://github.com/Dilatorily/raleway.git" + "bugs": { + "url": "https://github.com/Dilatorily/raleway/issues" }, - "version": "3.0.1" + "homepage": "https://fonts.google.com/specimen/Raleway" } diff --git a/node_modules/scrollmagic/package.json b/node_modules/scrollmagic/package.json index cd41f865e..6170a544a 100644 --- a/node_modules/scrollmagic/package.json +++ b/node_modules/scrollmagic/package.json @@ -1,38 +1,21 @@ { - "_from": "scrollmagic", - "_id": "scrollmagic@2.0.8", - "_inBundle": false, - "_integrity": "sha512-UYXEGBPVLziovXl3FjHGkY9c4UXKUKopIdXwWR2JapWxCo0U345wYegi7rcsv5vHf/ktc1bSNWy4QRFiV+Yccw==", - "_location": "/scrollmagic", - "_phantomChildren": {}, - "_requested": { - "type": "tag", - "registry": true, - "raw": "scrollmagic", - "name": "scrollmagic", - "escapedName": "scrollmagic", - "rawSpec": "", - "saveSpec": null, - "fetchSpec": "latest" - }, - "_requiredBy": [ - "#USER", - "/" - ], - "_resolved": "https://registry.npmjs.org/scrollmagic/-/scrollmagic-2.0.8.tgz", - "_shasum": "e0d7aff804c393c022fdc0c566f1edce3b4e9ed7", - "_spec": "scrollmagic", - "_where": "/srv/http/develop_28", + "name": "scrollmagic", + "title": "ScrollMagic", + "version": "2.0.8", + "description": "The javascript library for magical scroll interactions.", "author": { "name": "Jan Paepke", "url": "http://www.janpaepke.de" }, - "bugs": { - "url": "https://github.com/janpaepke/ScrollMagic/issues" + "repository": { + "type": "git", + "url": "git://github.com/janpaepke/ScrollMagic.git" + }, + "license": "(MIT OR GPL-3.0+)", + "main": "scrollmagic/uncompressed/ScrollMagic.js", + "engines": { + "node": ">=0.10.x" }, - "bundleDependencies": false, - "deprecated": false, - "description": "The javascript library for magical scroll interactions.", "devDependencies": { "ansi-colors": "^3.2.4", "del": "^3.0.0", @@ -67,108 +50,12 @@ "doc": "./doc", "example": "./examples" }, - "engines": { - "node": ">=0.10.x" - }, - "files": [ - "scrollmagic", - "LICENSE.md", - "README.md" - ], - "homepage": "http://ScrollMagic.io", - "keywords": [ - "scroll", - "scrolling", - "animation", - "sticky", - "pin", - "fixed", - "scrollbar", - "scrub", - "sync", - "position", - "progress", - "parallax", - "events", - "classes", - "jquery-plugin", - "ecosystem:jquery", - "scroll", - "scrolling", - "animation", - "sticky", - "pin", - "fixed", - "scrollbar", - "scrub", - "sync", - "position", - "progress", - "parallax", - "events", - "classes", - "jquery-plugin", - "ecosystem:jquery", - "scroll", - "scrolling", - "animation", - "sticky", - "pin", - "fixed", - "scrollbar", - "scrub", - "sync", - "position", - "progress", - "parallax", - "events", - "classes", - "jquery-plugin", - "ecosystem:jquery", - "scroll", - "scrolling", - "animation", - "sticky", - "pin", - "fixed", - "scrollbar", - "scrub", - "sync", - "position", - "progress", - "parallax", - "events", - "classes", - "jquery-plugin", - "ecosystem:jquery", - "scroll", - "scrolling", - "animation", - "sticky", - "pin", - "fixed", - "scrollbar", - "scrub", - "sync", - "position", - "progress", - "parallax", - "events", - "classes", - "jquery-plugin", - "ecosystem:jquery" - ], - "license": "(MIT OR GPL-3.0+)", - "main": "scrollmagic/uncompressed/ScrollMagic.js", - "name": "scrollmagic", - "repository": { - "type": "git", - "url": "git://github.com/janpaepke/ScrollMagic.git" - }, "scripts": { - "start": "node ./node_modules/gulp/bin/gulp open-demo", - "test": "./node_modules/karma/bin/karma start ./dev/tests/karma.conf.js" + "test": "./node_modules/karma/bin/karma start ./dev/tests/karma.conf.js", + "start": "node ./node_modules/gulp/bin/gulp open-demo" }, - "title": "ScrollMagic", - "version": "2.0.8" + "homepage": "http://ScrollMagic.io", + "keywords": ["scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery", "scroll", "scrolling", "animation", "sticky", "pin", "fixed", "scrollbar", "scrub", "sync", "position", "progress", "parallax", "events", "classes", "jquery-plugin", "ecosystem:jquery"], + "bugs": "https://github.com/janpaepke/ScrollMagic/issues", + "files": ["scrollmagic", "LICENSE.md", "README.md"] } diff --git a/node_modules/tippy.js/package.json b/node_modules/tippy.js/package.json index 21db180c0..d43fa4704 100644 --- a/node_modules/tippy.js/package.json +++ b/node_modules/tippy.js/package.json @@ -1,43 +1,74 @@ { - "_from": "tippy.js", - "_id": "tippy.js@6.2.5", - "_inBundle": false, - "_integrity": "sha512-UIf8G99PMXGmdWPrr36s/DjQBdfxMPwzvPUXsxs3tDFDTZ1SgvKG+Jvt6RJ+aBqYL0oe/STxh3MNkCV3IWAKmw==", - "_location": "/tippy.js", - "_phantomChildren": {}, - "_requested": { - "type": "tag", - "registry": true, - "raw": "tippy.js", - "name": "tippy.js", - "escapedName": "tippy.js", - "rawSpec": "", - "saveSpec": null, - "fetchSpec": "latest" - }, - "_requiredBy": [ - "#USER", - "/" + "name": "tippy.js", + "version": "6.2.5", + "description": "The complete tooltip, popover, dropdown, and menu solution for the web", + "main": "dist/tippy.cjs.js", + "module": "dist/tippy.esm.js", + "unpkg": "dist/tippy-bundle.umd.min.js", + "types": "index.d.ts", + "sideEffects": [ + "**/*.css" ], - "_resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.2.5.tgz", - "_shasum": "5335e28228af5e22c524fe5e8a94654514f34b92", - "_spec": "tippy.js", - "_where": "c:\\wamp64\\apps\\itop\\dev-trunk", - "author": { - "name": "atomiks" + "author": "atomiks", + "contributors": [ + "Brett Zamir" + ], + "license": "MIT", + "bugs": "https://github.com/atomiks/tippyjs/issues", + "homepage": "https://atomiks.github.io/tippyjs/", + "keywords": [ + "tooltip", + "popover", + "popper", + "dropdown", + "popup", + "tippy", + "tippy.js" + ], + "files": [ + "dist/", + "animations/", + "themes/", + "headless/", + "index.d.ts" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/atomiks/tippyjs.git" + }, + "scripts": { + "dev": "cross-env NODE_ENV=dev rollup -c .config/rollup.config.js --watch", + "build": "node build/index.js && rollup -c .config/rollup.config.js && bundlesize", + "build:visual": "cross-env NODE_ENV=test rollup -c .config/rollup.config.js", + "serve": "serve test/visual", + "test:dom": "jest unit integration --coverage", + "test:functional": "jest functional", + "test:types": "tsc && tsd", + "test": "yarn test:types && yarn test:dom && yarn test:functional", + "lint": "eslint . --ext .ts,.js", + "format": "prettier --write \"**/*.{js,ts,json,md,mdx,scss,css}\" --ignore-path .config/.prettierignore", + "clean": "rimraf dist/ themes/ animations/ coverage/ .devserver/ .cache/ ./index.d.ts", + "prepare": "yarn clean && yarn build" }, "babel": { "extends": "./.config/babel.config" }, + "jest": { + "preset": "./.config/jest.config" + }, + "eslintConfig": { + "extends": "./.config/eslint.config" + }, + "prettier": { + "singleQuote": true, + "bracketSpacing": false, + "proseWrap": "always" + }, "browserslist": [ "> 0.5%", "not dead", "not safari < 8" ], - "bugs": { - "url": "https://github.com/atomiks/tippyjs/issues" - }, - "bundleDependencies": false, "bundlesize": [ { "path": "dist/tippy-bundle.umd.min.js", @@ -56,16 +87,22 @@ "maxSize": "5 kB" } ], - "contributors": [ - { - "name": "Brett Zamir" + "husky": { + "hooks": { + "pre-commit": "lint-staged" } - ], - "dependencies": { - "@popperjs/core": "^2.4.4" }, - "deprecated": false, - "description": "The complete tooltip, popover, dropdown, and menu solution for the web", + "lint-staged": { + "src/**/*.ts": [ + "jest --findRelatedTests", + "eslint . --ext .ts,.js", + "git add" + ], + "{build,src,test,website/src}/**/*.{ts,js,json,css,scss,md}": [ + "prettier --write", + "git add" + ] + }, "devDependencies": { "@babel/core": "^7.8.3", "@babel/preset-env": "^7.8.3", @@ -114,76 +151,7 @@ "tsd": "^0.11.0", "typescript": "^3.7.5" }, - "eslintConfig": { - "extends": "./.config/eslint.config" - }, - "files": [ - "dist/", - "animations/", - "themes/", - "headless/", - "index.d.ts" - ], - "homepage": "https://atomiks.github.io/tippyjs/", - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "jest": { - "preset": "./.config/jest.config" - }, - "keywords": [ - "tooltip", - "popover", - "popper", - "dropdown", - "popup", - "tippy", - "tippy.js" - ], - "license": "MIT", - "lint-staged": { - "src/**/*.ts": [ - "jest --findRelatedTests", - "eslint . --ext .ts,.js", - "git add" - ], - "{build,src,test,website/src}/**/*.{ts,js,json,css,scss,md}": [ - "prettier --write", - "git add" - ] - }, - "main": "dist/tippy.cjs.js", - "module": "dist/tippy.esm.js", - "name": "tippy.js", - "prettier": { - "singleQuote": true, - "bracketSpacing": false, - "proseWrap": "always" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/atomiks/tippyjs.git" - }, - "scripts": { - "build": "node build/index.js && rollup -c .config/rollup.config.js && bundlesize", - "build:visual": "cross-env NODE_ENV=test rollup -c .config/rollup.config.js", - "clean": "rimraf dist/ themes/ animations/ coverage/ .devserver/ .cache/ ./index.d.ts", - "dev": "cross-env NODE_ENV=dev rollup -c .config/rollup.config.js --watch", - "format": "prettier --write \"**/*.{js,ts,json,md,mdx,scss,css}\" --ignore-path .config/.prettierignore", - "lint": "eslint . --ext .ts,.js", - "prepare": "yarn clean && yarn build", - "serve": "serve test/visual", - "test": "yarn test:types && yarn test:dom && yarn test:functional", - "test:dom": "jest unit integration --coverage", - "test:functional": "jest functional", - "test:types": "tsc && tsd" - }, - "sideEffects": [ - "**/*.css" - ], - "types": "index.d.ts", - "unpkg": "dist/tippy-bundle.umd.min.js", - "version": "6.2.5" + "dependencies": { + "@popperjs/core": "^2.4.4" + } } diff --git a/package.json b/package.json new file mode 100644 index 000000000..dd7471eed --- /dev/null +++ b/package.json @@ -0,0 +1,14 @@ +{ + "dependencies": { + "@popperjs/core": "^2.4.4", + "bulma-scss": "^0.9.0-1", + "datatables.net": "^1.10.12", + "datatables.net-fixedheader": "^3.1.2", + "datatables.net-responsive": "^2.1.0", + "datatables.net-scroller": "^1.4.2", + "datatables.net-select": "^1.2.0", + "raleway-webfont": "^3.0.1", + "scrollmagic": "^2.0.8", + "tippy.js": "^6.2.5" + } +}