mirror of
https://github.com/datahub-project/datahub.git
synced 2025-11-01 19:25:56 +00:00
Merge pull request #1343 from igbopie/nacho-bower-remove
Removing bower dependency system
This commit is contained in:
Seyi Adebajo
GitHub
commit
6d6bb81e46
@ -21,22 +21,17 @@ node {
|
||||
nodeModulesDir = file("${project.projectDir}")
|
||||
}
|
||||
|
||||
task bowerInstall(type: NodeTask, dependsOn: yarn) {
|
||||
script = file('node_modules/bower/lib/bin/bower.js')
|
||||
args = ['install']
|
||||
}
|
||||
|
||||
task emberServe(type: NodeTask, dependsOn: bowerInstall) {
|
||||
task emberServe(type: NodeTask, dependsOn: yarn) {
|
||||
script = file('node_modules/.bin/ember')
|
||||
args = ['serve']
|
||||
}
|
||||
|
||||
task emberBuild(type: NodeTask, dependsOn: bowerInstall) {
|
||||
task emberBuild(type: NodeTask, dependsOn: yarn) {
|
||||
script = file('node_modules/.bin/ember')
|
||||
args = ['build', '--environment', 'production']
|
||||
}
|
||||
|
||||
task emberTest(type: NodeTask, dependsOn: bowerInstall) {
|
||||
task emberTest(type: NodeTask, dependsOn: yarn) {
|
||||
environment = ['COVERAGE': 'true']
|
||||
script = file('node_modules/.bin/ember')
|
||||
args = ['test', '--launch', 'Chrome']
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
{
|
||||
"directory": "bower_components",
|
||||
"analytics": false
|
||||
}
|
||||
@ -9,7 +9,6 @@ You will need the following things properly installed on your computer.
|
||||
|
||||
* [Git](https://git-scm.com/)
|
||||
* [Node.js](https://nodejs.org/) (with NPM)
|
||||
* [Bower](https://bower.io/)
|
||||
* [Ember CLI](https://ember-cli.com/)
|
||||
* [PhantomJS](http://phantomjs.org/)
|
||||
|
||||
@ -18,7 +17,6 @@ You will need the following things properly installed on your computer.
|
||||
* `git clone <repository-url>` this repository
|
||||
* `cd wherehows-web`
|
||||
* `npm install`
|
||||
* `bower install`
|
||||
|
||||
## Running / Development
|
||||
|
||||
@ -52,16 +50,16 @@ Specify what it takes to deploy your app.
|
||||
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
|
||||
|
||||
## Troubleshooting
|
||||
### git commit SyntaxError on Mac
|
||||
> git commit -m 'foo bar'
|
||||
>> husky - npm run -s precommit
|
||||
>> const path = require('path')
|
||||
>> ^^^^^`
|
||||
### git commit SyntaxError on Mac
|
||||
> git commit -m 'foo bar'
|
||||
>> husky - npm run -s precommit
|
||||
>> const path = require('path')
|
||||
>> ^^^^^`
|
||||
>> SyntaxError: Use of const in strict mode.
|
||||
|
||||
```
|
||||
# Re-install npm global packages
|
||||
npm cache clean -f
|
||||
sudo npm install -g n
|
||||
sudo n stable
|
||||
sudo n stable
|
||||
```
|
||||
|
||||
@ -109,16 +109,6 @@ export default Component.extend({
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Invoked with a delay after the commenter has finished typing
|
||||
* Dispatched on a slight delay after changes are made.
|
||||
* TODO: Enhancement META-1995 - maybe use for auto-save, or other times we need to know
|
||||
* that the field contents changed
|
||||
*/
|
||||
commentTextUpdated(): void {
|
||||
//TODO: META-1995 interval auto-save?
|
||||
},
|
||||
|
||||
/**
|
||||
* Updates the type attribute on the comment property
|
||||
* @param {CommentTypeUnion} type
|
||||
|
||||
@ -17,7 +17,7 @@ type DatasetStreamActionsUnion = 'add' | 'modify' | 'destroy';
|
||||
const baseCommentEditorOptions = {
|
||||
disableDoubleReturn: true,
|
||||
disableExtraSpaces: true,
|
||||
disableEditing: true
|
||||
disableEditing: false
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@ -19,11 +19,12 @@
|
||||
{{#if isEditing}}
|
||||
|
||||
<form {{action "updateComment" on="submit"}}>
|
||||
{{medium-content-editable
|
||||
value=comment.text
|
||||
{{medium-editor
|
||||
comment.text
|
||||
options=editorOptions
|
||||
class="comment-new__content"
|
||||
editable=isEditing}}
|
||||
onChange=(action (mut comment.text))
|
||||
}}
|
||||
|
||||
<div class="comment-new__actions">
|
||||
<button
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{{#if isEditing}}
|
||||
<form {{action "publishComment" on="submit"}}>
|
||||
{{medium-content-editable
|
||||
value=comment.text
|
||||
comment.text
|
||||
options=editorOptions
|
||||
class="comment-new__content"
|
||||
editable=isEditing
|
||||
onFinishedTyping=(action "commentTextUpdated")}}
|
||||
onChange=(action (mut comment.text))
|
||||
}}
|
||||
|
||||
{{ember-selector
|
||||
values=commentTypes
|
||||
|
||||
@ -21,10 +21,11 @@
|
||||
|
||||
{{#if deprecatedAlias}}
|
||||
|
||||
{{medium-content-editable
|
||||
value=deprecationNoteAlias
|
||||
{{medium-editor
|
||||
deprecationNoteAlias
|
||||
options=editorOptions
|
||||
class="comment-new__content"}}
|
||||
class="comment-new__content"
|
||||
onChange=(action (mut deprecationNoteAlias))}}
|
||||
|
||||
<h4 class="dataset-deprecation-header">When should this dataset be decommissioned?</h4>
|
||||
|
||||
|
||||
@ -29,10 +29,12 @@
|
||||
|
||||
{{#if (and requestExemptionReason (eq purgeType exemptPolicy))}}
|
||||
|
||||
{{medium-content-editable
|
||||
value=purgeNote
|
||||
{{medium-editor
|
||||
purgeNote
|
||||
options=editorOptions
|
||||
class="comment-new__content"}}
|
||||
class="comment-new__content"
|
||||
onChange=(action (mut purgeNote))
|
||||
}}
|
||||
|
||||
{{/if}}
|
||||
</li>
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
{
|
||||
"name": "wherehows-web",
|
||||
"dependencies": {
|
||||
"bootstrap": "3.3.7",
|
||||
"font-awesome": "^4.7.0",
|
||||
"jquery-jsonview": "jsonview#^1.2.3",
|
||||
"jquery-treegrid": "^0.3.0",
|
||||
"json-human": "^0.1.1",
|
||||
"marked": "^0.3.6",
|
||||
"scrollMonitor": "^1.2.3",
|
||||
"medium-editor": "5.14.4"
|
||||
},
|
||||
"resolutions": {
|
||||
"bootstrap": "3.3.7"
|
||||
}
|
||||
}
|
||||
@ -73,19 +73,19 @@ module.exports = function(defaults) {
|
||||
}
|
||||
});
|
||||
|
||||
const faFontTree = new Funnel('bower_components/font-awesome', {
|
||||
const faFontTree = new Funnel('node_modules/font-awesome', {
|
||||
srcDir: '/',
|
||||
include: ['**/*.woff2', '**/*.woff', '**/*.ttf', '**/font-awesome.min.css'],
|
||||
destDir: '/'
|
||||
});
|
||||
|
||||
const bsFontTree = new Funnel('bower_components/bootstrap/dist/fonts', {
|
||||
const bsFontTree = new Funnel('node_modules/bootstrap/dist/fonts', {
|
||||
srcDir: '/',
|
||||
include: ['**/*.woff2', '**/*.woff', '**/*.ttf'],
|
||||
destDir: '/assets/fonts'
|
||||
});
|
||||
|
||||
const treegridImgTree = new Funnel('bower_components/jquery-treegrid/img', {
|
||||
const treegridImgTree = new Funnel('node_modules/jquery-treegrid/img', {
|
||||
srcDir: '/',
|
||||
include: ['**/*.png'],
|
||||
destDir: '/img'
|
||||
@ -104,17 +104,17 @@ module.exports = function(defaults) {
|
||||
// please specify an object with the list of modules as keys
|
||||
// along with the exports of each module as its value.
|
||||
|
||||
app.import('bower_components/font-awesome/css/font-awesome.min.css');
|
||||
app.import('bower_components/json-human/css/json.human.css');
|
||||
app.import('bower_components/jquery-treegrid/css/jquery.treegrid.css');
|
||||
app.import('bower_components/jquery-jsonview/dist/jquery.jsonview.css');
|
||||
app.import('node_modules/font-awesome/css/font-awesome.min.css');
|
||||
app.import('node_modules/json-human/css/json.human.css');
|
||||
app.import('node_modules/jquery-treegrid/css/jquery.treegrid.css');
|
||||
app.import('node_modules/jquery-jsonview/dist/jquery.jsonview.css');
|
||||
|
||||
app.import('bower_components/jquery-treegrid/js/jquery.treegrid.js');
|
||||
app.import('bower_components/json-human/src/json.human.js');
|
||||
app.import('bower_components/jquery-jsonview/dist/jquery.jsonview.js');
|
||||
app.import('node_modules/jquery-treegrid/js/jquery.treegrid.js');
|
||||
app.import('node_modules/json-human/src/json.human.js');
|
||||
app.import('node_modules/jquery-jsonview/dist/jquery.jsonview.js');
|
||||
app.import('vendor/typeahead.jquery.js');
|
||||
app.import('bower_components/marked/marked.min.js');
|
||||
app.import('bower_components/scrollMonitor/scrollMonitor.js');
|
||||
app.import('node_modules/marked/marked.min.js');
|
||||
app.import('node_modules/scrollmonitor/scrollMonitor.js');
|
||||
app.import('vendor/shims/scrollmonitor.js');
|
||||
|
||||
return app.toTree(new MergeTrees([faFontTree, bsFontTree, treegridImgTree]));
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
"babel-plugin-transform-es2015-destructuring": "^6.23.0",
|
||||
"babel-plugin-transform-es2015-parameters": "^6.24.1",
|
||||
"babel-plugin-transform-object-rest-spread": "^6.26.0",
|
||||
"bower": "^1.8.2",
|
||||
"broccoli-asset-rev": "^2.7.0",
|
||||
"broccoli-funnel": "^2.0.1",
|
||||
"broccoli-merge-trees": "^3.0.0",
|
||||
@ -54,7 +53,6 @@
|
||||
"ember-cli-htmlbars": "^2.0.1",
|
||||
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
|
||||
"ember-cli-inject-live-reload": "^1.4.1",
|
||||
"ember-cli-medium-editor": "^1.2.4",
|
||||
"ember-cli-moment-shim": "^3.5.0",
|
||||
"ember-cli-qunit": "^4.1.1",
|
||||
"ember-cli-shims": "^1.1.0",
|
||||
@ -72,6 +70,7 @@
|
||||
"ember-inflector": "^2.2.0",
|
||||
"ember-load-initializers": "^1.0.0",
|
||||
"ember-math-helpers": "^2.4.0",
|
||||
"ember-medium-editor": "^0.1.4",
|
||||
"ember-metrics": "^0.12.1",
|
||||
"ember-power-calendar": "^0.7.1",
|
||||
"ember-power-select-typeahead": "^0.7.0",
|
||||
@ -97,6 +96,7 @@
|
||||
"typescript": "^3.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"bootstrap": "3.3.7",
|
||||
"dynamic-link": "^0.2.3",
|
||||
"ember-aupac-typeahead": "3.1.0",
|
||||
"ember-cli-mirage": "0.4.1",
|
||||
@ -111,7 +111,14 @@
|
||||
"ember-tooltips": "https://github.com/mattgraham1995/ember-tooltips#06112adb703f1701eef2257bf7690434af2c7444",
|
||||
"ember-truth-helpers": "^2.0.0",
|
||||
"eslint-plugin-typescript": "^0.12.0",
|
||||
"font-awesome": "^4.7.0",
|
||||
"jquery": "^3.3.0",
|
||||
"jquery-jsonview": "^1.2.3",
|
||||
"jquery-treegrid": "^0.3.0",
|
||||
"json-human": "https://github.com/marianoguerra/json.human.js#0.1.1",
|
||||
"marked": "^0.3.6",
|
||||
"medium-editor": "5.14.4",
|
||||
"scrollmonitor": "^1.2.4",
|
||||
"typescript-eslint-parser": "^17.0.1"
|
||||
},
|
||||
"engines": {
|
||||
|
||||
@ -1377,10 +1377,6 @@ bower-endpoint-parser@0.2.2:
|
||||
version "0.2.2"
|
||||
resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
|
||||
|
||||
bower@^1.8.2:
|
||||
version "1.8.4"
|
||||
resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.4.tgz#e7876a076deb8137f7d06525dc5e8c66db82f28a"
|
||||
|
||||
brace-expansion@^1.0.0, brace-expansion@^1.1.7:
|
||||
version "1.1.11"
|
||||
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
|
||||
@ -2847,7 +2843,7 @@ ember-cli-app-version@^3.0.0:
|
||||
ember-cli-babel "^6.12.0"
|
||||
git-repo-version "^1.0.2"
|
||||
|
||||
ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1:
|
||||
ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1:
|
||||
version "5.2.8"
|
||||
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.8.tgz#0356b03cc3fdff5d0f2ecaa46a0e1cfaebffd876"
|
||||
dependencies:
|
||||
@ -2857,7 +2853,7 @@ ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1:
|
||||
ember-cli-version-checker "^1.0.2"
|
||||
resolve "^1.1.2"
|
||||
|
||||
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0, ember-cli-babel@^6.9.2:
|
||||
ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.3, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0, ember-cli-babel@^6.9.2:
|
||||
version "6.16.0"
|
||||
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.16.0.tgz#623b4a2764ece72b65f1572fc8aeb5714a450228"
|
||||
dependencies:
|
||||
@ -3009,12 +3005,6 @@ ember-cli-lodash-subset@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
|
||||
|
||||
ember-cli-medium-editor@^1.2.4:
|
||||
version "1.2.4"
|
||||
resolved "https://registry.yarnpkg.com/ember-cli-medium-editor/-/ember-cli-medium-editor-1.2.4.tgz#ce0c01afd18c62363ca2697b22bd4eb72c012c98"
|
||||
dependencies:
|
||||
ember-cli-babel "^5.1.5"
|
||||
|
||||
ember-cli-mirage@0.4.1:
|
||||
version "0.4.1"
|
||||
resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.1.tgz#bfdfe61e5e74dc3881ed31f12112dae1a29f0d4c"
|
||||
@ -3580,6 +3570,16 @@ ember-maybe-in-element@^0.1.3:
|
||||
dependencies:
|
||||
ember-cli-babel "^6.11.0"
|
||||
|
||||
ember-medium-editor@^0.1.4:
|
||||
version "0.1.4"
|
||||
resolved "https://registry.yarnpkg.com/ember-medium-editor/-/ember-medium-editor-0.1.4.tgz#0955fbde5bd646a44a2874b2b87e594ea034f94c"
|
||||
dependencies:
|
||||
broccoli-funnel "^1.1.0"
|
||||
broccoli-merge-trees "^2.0.0"
|
||||
broccoli-stew "^1.5.0"
|
||||
ember-cli-babel "^6.0.0-beta.3"
|
||||
medium-editor "^5.23.0"
|
||||
|
||||
ember-metrics@^0.12.1:
|
||||
version "0.12.1"
|
||||
resolved "https://registry.yarnpkg.com/ember-metrics/-/ember-metrics-0.12.1.tgz#8659343bf7b8bda403e70d482ff59cc9714d89f6"
|
||||
@ -5584,6 +5584,14 @@ jest-validate@^23.0.0:
|
||||
leven "^2.1.0"
|
||||
pretty-format "^23.2.0"
|
||||
|
||||
jquery-jsonview@^1.2.3:
|
||||
version "1.2.3"
|
||||
resolved "https://registry.yarnpkg.com/jquery-jsonview/-/jquery-jsonview-1.2.3.tgz#6a24ce73357368e00ee32fb605950a4083ad6b7a"
|
||||
|
||||
jquery-treegrid@^0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://registry.yarnpkg.com/jquery-treegrid/-/jquery-treegrid-0.3.0.tgz#e445d4e789cbd85ec045ed467192d70b2ab189d3"
|
||||
|
||||
jquery@>=1.11, jquery@^3.3.0, jquery@^3.3.1:
|
||||
version "3.3.1"
|
||||
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
|
||||
@ -5647,6 +5655,10 @@ json-buffer@3.0.0:
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
|
||||
|
||||
"json-human@https://github.com/marianoguerra/json.human.js#0.1.1":
|
||||
version "1.0.3"
|
||||
resolved "https://github.com/marianoguerra/json.human.js#bf427232f543642bbe4df4b041f59e40a3208c0c"
|
||||
|
||||
json-parse-better-errors@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
|
||||
@ -6395,6 +6407,10 @@ markdown-it@^8.3.0, markdown-it@^8.3.1:
|
||||
mdurl "^1.0.1"
|
||||
uc.micro "^1.0.5"
|
||||
|
||||
marked@^0.3.6:
|
||||
version "0.3.19"
|
||||
resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
|
||||
|
||||
matcher-collection@^1.0.0, matcher-collection@^1.0.5:
|
||||
version "1.0.5"
|
||||
resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.0.5.tgz#2ee095438372cb8884f058234138c05c644ec339"
|
||||
@ -6423,6 +6439,14 @@ media-typer@0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
|
||||
|
||||
medium-editor@5.14.4:
|
||||
version "5.14.4"
|
||||
resolved "https://registry.yarnpkg.com/medium-editor/-/medium-editor-5.14.4.tgz#84669da34de41083a8cba86b4841f9c2c805bd6a"
|
||||
|
||||
medium-editor@^5.23.0:
|
||||
version "5.23.3"
|
||||
resolved "https://registry.yarnpkg.com/medium-editor/-/medium-editor-5.23.3.tgz#6fb638759ae2fc76c423feb056f346d9c518d3b7"
|
||||
|
||||
memory-streams@^0.1.3:
|
||||
version "0.1.3"
|
||||
resolved "https://registry.yarnpkg.com/memory-streams/-/memory-streams-0.1.3.tgz#d9b0017b4b87f1d92f55f2745c9caacb1dc93ceb"
|
||||
@ -7825,6 +7849,10 @@ sax@^1.2.4:
|
||||
version "1.2.4"
|
||||
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
|
||||
|
||||
scrollmonitor@^1.2.4:
|
||||
version "1.2.4"
|
||||
resolved "https://registry.yarnpkg.com/scrollmonitor/-/scrollmonitor-1.2.4.tgz#823d04cc1574aa3b71de7cc70ef91ebe633344a0"
|
||||
|
||||
scss-tokenizer@^0.2.3:
|
||||
version "0.2.3"
|
||||
resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user