Skip to content

Commit b6200e3

Browse files
authored
Merge pull request #118 from BBVAEngineering/bugfix-remove-public-tree
Remove public tree
2 parents 5cc1dad + 59c207d commit b6200e3

File tree

4 files changed

+433
-529
lines changed

4 files changed

+433
-529
lines changed

index.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/* eslint-disable no-sync */
21
'use strict';
3-
const Funnel = require('broccoli-funnel');
2+
43
const mergeTrees = require('broccoli-merge-trees');
54
const BroccoliWorkbox = require('./lib/broccoli-workbox');
65

@@ -73,12 +72,4 @@ module.exports = {
7372
overwrite: true,
7473
});
7574
},
76-
77-
treeForPublic(tree) {
78-
const assetsTree = new Funnel('public');
79-
80-
return mergeTrees([tree, assetsTree], {
81-
overwrite: true,
82-
});
83-
},
8475
};

package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,14 @@
5151
"validate-coverage": "test \"$(cat coverage/ember/coverage-summary.json | json total.lines.total)\" -gt 0"
5252
},
5353
"dependencies": {
54-
"broccoli-funnel": "^3.0.1",
5554
"broccoli-merge-trees": "^4.1.0",
56-
"broccoli-plugin": "^4.0.1",
55+
"broccoli-plugin": "^4.0.7",
5756
"chalk": "^4.1.0",
58-
"debug": "^4.1.1",
57+
"debug": "^4.3.3",
5958
"ember-cli-babel": "^7.26.11",
6059
"ember-cli-htmlbars": "^6.0.1",
61-
"glob": "^7.1.6",
62-
"pretty-bytes": "^5.3.0",
60+
"glob": "^7.2.0",
61+
"pretty-bytes": "^5.6.0",
6362
"rimraf": "^3.0.1",
6463
"workbox-build": "^5.0.0"
6564
},
@@ -75,7 +74,7 @@
7574
"@semantic-release/git": "^10.0.1",
7675
"babel-eslint": "^10.1.0",
7776
"broccoli-test-helpers": "0.0.9",
78-
"chai": "^4.2.0",
77+
"chai": "^4.3.6",
7978
"commitizen": "^4.2.4",
8079
"cz-conventional-changelog": "^3.3.0",
8180
"ember-auto-import": "^2.2.4",
@@ -85,15 +84,15 @@
8584
"ember-cli-inject-live-reload": "^2.1.0",
8685
"ember-cli-terser": "^4.0.2",
8786
"ember-disable-prototype-extensions": "^1.1.3",
88-
"ember-engines": "^0.8.5",
87+
"ember-engines": "^0.8.20",
8988
"ember-export-application-global": "^2.0.1",
9089
"ember-page-title": "^7.0.0",
9190
"ember-qunit": "^5.1.5",
9291
"ember-resolver": "^8.0.3",
9392
"ember-sinon": "^5.0.0",
9493
"ember-source": "^4.1.0",
9594
"ember-source-channel-url": "^3.0.0",
96-
"ember-template-lint": "^3.15.0",
95+
"ember-template-lint": "^4.0.0",
9796
"ember-try": "~2.0.0",
9897
"eslint": "^7.32.0",
9998
"eslint-config-prettier": "^8.3.0",
@@ -104,16 +103,16 @@
104103
"husky": "^7.0.4",
105104
"istanbul": "^0.4.5",
106105
"json": "^11.0.0",
107-
"lint-staged": "^12.3.2",
106+
"lint-staged": "^12.3.3",
108107
"loader.js": "^4.7.0",
109-
"mocha": "^8.1.3",
108+
"mocha": "^9.2.0",
110109
"npm-run-all": "^4.1.5",
111110
"nyc": "^15.0.0",
112111
"prettier": "^2.5.1",
113112
"qunit": "^2.17.2",
114113
"qunit-dom": "^2.0.0",
115114
"semantic-release": "^19.0.2",
116-
"webpack": "^5.65.0"
115+
"webpack": "^5.68.0"
117116
},
118117
"engines": {
119118
"node": "12.* || 14.* || >= 16"

public/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)