From 7ec1a8dd018d6088eb4eba802936c392963e1ef2 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 8 Oct 2019 09:44:19 +0200 Subject: [PATCH] remove old references --- package.json | 2 -- scm-ui/eslint-config/index.js | 2 -- scm-ui/ui-components/package.json | 7 +--- scm-ui/ui-types/package.json | 7 +--- scm-ui/ui-webapp/package.json | 9 ++---- scm-ui/ui-webapp/styles/scm.css | 54 ------------------------------- yarn.lock | 7 ---- 7 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 scm-ui/ui-webapp/styles/scm.css diff --git a/package.json b/package.json index f9e98a146a..694695ece7 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,8 @@ "@babel/preset-env": "^7.6.2", "@babel/preset-flow": "^7.0.0", "@babel/preset-react": "^7.0.0", - "@scm-manager/eslint-config": "^0.0.2", "babel-loader": "^8.0.6", "css-loader": "^3.2.0", - "eslint": "^6.5.1", "file-loader": "^4.2.0", "flow-bin": "^0.108.0", "mustache": "^3.1.0", diff --git a/scm-ui/eslint-config/index.js b/scm-ui/eslint-config/index.js index 2c3021a5c7..2b01b2c370 100644 --- a/scm-ui/eslint-config/index.js +++ b/scm-ui/eslint-config/index.js @@ -1,5 +1,3 @@ -'use strict'; - module.exports = { "extends": [ "react-app", diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index 99ee71e277..ef84cf9113 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -14,12 +14,7 @@ "update-index": "create-index -r src", "eslint-fix": "eslint src --fix" }, - "bundle": { - "type": "library", - "entry": "./src/index.js" - }, "devDependencies": { - "@scm-manager/ui-vendor": "link:../ui-vendor", "create-index": "^2.3.0", "enzyme": "^3.5.0", "enzyme-adapter-react-16": "^1.3.1", @@ -32,7 +27,7 @@ }, "dependencies": { "@scm-manager/ui-extensions": "^0.1.2", - "@scm-manager/ui-types": "link:../ui-types", + "@scm-manager/ui-types": "2.0.0-SNAPSHOT", "classnames": "^2.2.6", "moment": "^2.22.2", "query-string": "5", diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index b13a7743f6..58b2b46c01 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -2,7 +2,7 @@ "name": "@scm-manager/ui-types", "version": "2.0.0-SNAPSHOT", "description": "Flow types for SCM-Manager related Objects", - "main": "dist/ui-types.js", + "main": "src/index.js", "files": [ "dist", "src" @@ -13,12 +13,7 @@ "scripts": { "check": "flow check" }, - "bundle": { - "type": "library", - "entry": "./src/index.js" - }, "devDependencies": { - "@scm-manager/ui-vendor": "link:../ui-vendor", "flow-bin": "^0.108.0" } } diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index 8b83ff6a56..32478b3c7e 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -1,18 +1,14 @@ { "homepage": "/scm", "name": "@scm-manager/ui-webapp", - "version": "0.1.0", + "version": "2.0.0-SNAPSHOT", "private": true, "main": "dist/ui-webapp.js", - "bundle": { - "type": "webapp", - "entry": "./src/index.js", - "publicPath": "./public" - }, "dependencies": { "@babel/polyfill": "^7.0.0", "@fortawesome/fontawesome-free": "^5.3.1", "@scm-manager/ui-extensions": "^0.1.2", + "@scm-manager/ui-components": "2.0.0-SNAPSHOT", "bulma": "^0.7.1", "bulma-popover": "^1.0.0", "bulma-tooltip": "^2.0.2", @@ -62,7 +58,6 @@ "pre-commit": "jest && flow && eslint src" }, "devDependencies": { - "@scm-manager/ui-components": "2.0.0-SNAPSHOT", "concat": "^1.0.3", "copyfiles": "^2.0.0", "enzyme": "^3.3.0", diff --git a/scm-ui/ui-webapp/styles/scm.css b/scm-ui/ui-webapp/styles/scm.css deleted file mode 100644 index 9027cb9f87..0000000000 --- a/scm-ui/ui-webapp/styles/scm.css +++ /dev/null @@ -1,54 +0,0 @@ -/* -Error: File to import not found or unreadable: bulma/sass/utilities/initial-variables. - Load paths: - C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/Configuration/SassFrameworks/bourbon - C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/Configuration/SassFrameworks/neat - C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/Configuration/SassFrameworks/base - on line 1 of C:\Users\jkefel\Documents\Hg\scm-manager\scm-ui\styles\scm.scss - -1: @import "bulma/sass/utilities/initial-variables"; -2: @import "bulma/sass/utilities/functions"; -3: -4: -5: $blue: #33B2E8; -6: $mint: #11dfd0; - -Backtrace: -C:\Users\jkefel\Documents\Hg\scm-manager\scm-ui\styles\scm.scss:1 -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/import_node.rb:67:in `rescue in import' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/import_node.rb:45:in `import' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/import_node.rb:28:in `imported_file' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/import_node.rb:37:in `css_import?' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/perform.rb:314:in `visit_import' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/base.rb:36:in `visit' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/perform.rb:162:in `block in visit' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/stack.rb:79:in `block in with_base' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/stack.rb:135:in `with_frame' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/stack.rb:79:in `with_base' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/perform.rb:162:in `visit' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/base.rb:52:in `block in visit_children' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/base.rb:52:in `map' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/base.rb:52:in `visit_children' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/perform.rb:171:in `block in visit_children' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/perform.rb:183:in `with_environment' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/perform.rb:170:in `visit_children' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/base.rb:36:in `block in visit' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/perform.rb:190:in `visit_root' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/base.rb:36:in `visit' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/perform.rb:161:in `visit' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/visitors/perform.rb:10:in `visit' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/root_node.rb:36:in `css_tree' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/tree/root_node.rb:20:in `render' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/engine.rb:290:in `render' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/exec/sass_scss.rb:400:in `run' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/exec/sass_scss.rb:63:in `process_result' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/exec/base.rb:52:in `parse' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/lib/sass/exec/base.rb:19:in `parse!' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/lib/ruby/gems/2.4.0/gems/sass-3.5.3/bin/sass:13:in `' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/bin/sass:23:in `load' -C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/ruby/bin/sass:23:in `
' -*/ -body:before { - white-space: pre; - font-family: monospace; - content: "Error: File to import not found or unreadable: bulma/sass/utilities/initial-variables.\A Load paths:\A C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/Configuration/SassFrameworks/bourbon\A C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/Configuration/SassFrameworks/neat\A C:/Program Files/Adobe/Adobe Dreamweaver CC 2019/Configuration/SassFrameworks/base\A on line 1 of C:\Users\jkefel\Documents\Hg\scm-manager\scm-ui\styles\scm.scss\A \A 1: @import \"bulma/sass/utilities/initial-variables\";\A 2: @import \"bulma/sass/utilities/functions\";\A 3: \A 4: \A 5: $blue: #33B2E8;\A 6: $mint: #11dfd0;"; } diff --git a/yarn.lock b/yarn.lock index c2de497553..2962ec5260 100644 --- a/yarn.lock +++ b/yarn.lock @@ -845,13 +845,6 @@ react "^16.4.2" react-dom "^16.4.2" -"@scm-manager/ui-types@link:scm-ui/ui-types": - version "2.0.0-SNAPSHOT" - -"@scm-manager/ui-vendor@link:scm-ui/ui-vendor": - version "0.0.0" - uid "" - "@sindresorhus/is@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"