lukechilds
/
neutrino-dev
mirror of https://github.com/lukechilds/neutrino-dev.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of github.com:mozilla-neutrino/neutrino-dev

v5.0.0-beta
Eli Perelman 8 years ago
parent
10f57fa379 8ad608bd01
commit
189eee4536
4 changed files with 43 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      packages/neutrino-preset-node/package.json
  2. 40
      packages/neutrino-preset-node/yarn.lock
  3. 8
      packages/neutrino-preset-web/package.json
  4. 46
      packages/neutrino-preset-web/yarn.lock

4
packages/neutrino-preset-node/package.json
View File

@ -19,8 +19,8 @@
"clean-webpack-plugin": "^0.1.15",
"copy-webpack-plugin": "4.0.1",
"deepmerge": "^1.3.2",
"exports-loader": "0.6.3",
"imports-loader": "^0.7.0",
"exports-loader": "^0.6.4",
"imports-loader": "^0.7.1",
"progress-bar-webpack-plugin": "^1.9.3",
"source-map-support": "^0.4.6",
"webpack": "^2.2.1",

40
packages/neutrino-preset-node/yarn.lock
View File

@ -35,10 +35,6 @@ align-text@^0.1.1, align-text@^0.1.3:
longest "^1.0.1"
repeat-string "^1.5.2"
amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
ansi-regex@^2.0.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@ -1074,12 +1070,12 @@ expand-range@^1.8.1:
dependencies:
fill-range "^2.1.0"
exports-loader@0.6.3:
version "0.6.3"
resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.6.3.tgz#57dc78917f709b96f247fa91e69b554c855013c8"
exports-loader@^0.6.4:
version "0.6.4"
resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.6.4.tgz#d70fc6121975b35fc12830cf52754be2740fc886"
dependencies:
loader-utils "0.2.x"
source-map "0.1.x"
loader-utils "^1.0.2"
source-map "0.5.x"
extend@~3.0.0:
version "3.0.0"
@ -1340,11 +1336,11 @@ ieee754@^1.1.4:
version "1.1.8"
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
imports-loader@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.7.0.tgz#468c04de8075941cfab28146c755c24cc1f36ccd"
imports-loader@^0.7.1:
version "0.7.1"
resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.7.1.tgz#f204b5f34702a32c1db7d48d89d5e867a0441253"
dependencies:
loader-utils "^0.2.16"
loader-utils "^1.0.2"
source-map "^0.5.6"
indexof@0.0.1:
@ -1601,7 +1597,7 @@ loader-runner@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
loader-utils@^0.2.15, loader-utils@^0.2.16:
version "0.2.16"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
dependencies:
@ -1610,6 +1606,14 @@ loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16:
json5 "^0.5.0"
object-assign "^4.0.1"
loader-utils@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.0.2.tgz#a9f923c865a974623391a8602d031137fad74830"
dependencies:
big.js "^3.1.3"
emojis-list "^2.0.0"
json5 "^0.5.0"
lodash@^4.14.0, lodash@^4.2.0, lodash@^4.3.0:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@ -2186,13 +2190,7 @@ source-map-support@^0.4.2, source-map-support@^0.4.6:
dependencies:
source-map "^0.5.3"
source-map@0.1.x:
version "0.1.43"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
dependencies:
amdefine ">=0.0.4"
source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
version "0.5.6"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"

8
packages/neutrino-preset-web/package.json
View File

@ -21,17 +21,17 @@
"copy-webpack-plugin": "4.0.1",
"css-loader": "^0.26.2",
"deepmerge": "^1.3.2",
"exports-loader": "0.6.3",
"file-loader": "^0.10.0",
"exports-loader": "^0.6.4",
"file-loader": "^0.10.1",
"html-webpack-plugin": "^2.28.0",
"html-webpack-template": "^6.0.1",
"imports-loader": "^0.7.0",
"imports-loader": "^0.7.1",
"progress-bar-webpack-plugin": "^1.9.3",
"style-loader": "^0.13.2",
"url-loader": "^0.5.8",
"webpack": "^2.2.1",
"webpack-dev-server": "^2.4.1",
"worker-loader": "0.7.1"
"worker-loader": "^0.8.0"
},
"peerDependencies": {
"neutrino": "^4.0.0"

46
packages/neutrino-preset-web/yarn.lock
View File

@ -46,10 +46,6 @@ alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
ansi-html@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@ -1605,12 +1601,12 @@ expand-range@^1.8.1:
dependencies:
fill-range "^2.1.0"
exports-loader@0.6.3:
version "0.6.3"
resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.6.3.tgz#57dc78917f709b96f247fa91e69b554c855013c8"
exports-loader@^0.6.4:
version "0.6.4"
resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.6.4.tgz#d70fc6121975b35fc12830cf52754be2740fc886"
dependencies:
loader-utils "0.2.x"
source-map "0.1.x"
loader-utils "^1.0.2"
source-map "0.5.x"
express@^4.13.3:
version "4.14.1"
@ -1673,11 +1669,11 @@ faye-websocket@~0.11.0:
dependencies:
websocket-driver ">=0.5.1"
file-loader@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.0.tgz#bbe6db7474ac92c7f54fdc197cf547e98b6b8e12"
file-loader@^0.10.1:
version "0.10.1"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.1.tgz#815034119891fc6441fb5a64c11bc93c22ddd842"
dependencies:
loader-utils "~0.2.5"
loader-utils "^1.0.2"
filename-regex@^2.0.0:
version "2.0.0"
@ -2046,11 +2042,11 @@ ieee754@^1.1.4:
version "1.1.8"
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
imports-loader@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.7.0.tgz#468c04de8075941cfab28146c755c24cc1f36ccd"
imports-loader@^0.7.1:
version "0.7.1"
resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.7.1.tgz#f204b5f34702a32c1db7d48d89d5e867a0441253"
dependencies:
loader-utils "^0.2.16"
loader-utils "^1.0.2"
source-map "^0.5.6"
indexes-of@^1.0.1:
@ -2352,7 +2348,7 @@ loader-runner@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
loader-utils@0.2.x, loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@~0.2.5:
loader-utils@^0.2.15, loader-utils@^0.2.16:
version "0.2.16"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
dependencies:
@ -3488,12 +3484,6 @@ source-map-support@^0.4.2:
dependencies:
source-map "^0.5.3"
source-map@0.1.x:
version "0.1.43"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
dependencies:
amdefine ">=0.0.4"
source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
version "0.5.6"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
@ -3941,11 +3931,11 @@ wordwrap@0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
worker-loader@0.7.1:
version "0.7.1"
resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-0.7.1.tgz#91ffd2e2fbf76921a43e8ca3766d12e9537f5d70"
worker-loader@^0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-0.8.0.tgz#13582960dcd7d700dc829d3fd252a7561696167e"
dependencies:
loader-utils "0.2.x"
loader-utils "^1.0.2"
wrap-ansi@^2.0.0:
version "2.1.0"

Write Preview
Loading…
Cancel
Save