Skip to content

Commit

Permalink
chore: upgrade scaffolding for native dynamic import
Browse files Browse the repository at this point in the history
  • Loading branch information
crimx committed Mar 29, 2020
1 parent c2f26be commit 5bd38a0
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .browserslistrc
@@ -1,2 +1,2 @@
Firefox > 66
Firefox > 67
Chrome >= 63
15 changes: 15 additions & 0 deletions .neutrinorc.js
Expand Up @@ -211,6 +211,21 @@ module.exports = {
.set('@', path.join(__dirname, 'src'))
.end()
.end()

// remove dynamic import transformation
// prettier-ignore
neutrino.config
.module
.rule('compile')
.use('babel')
.tap(options => {
options.plugins = options.plugins.filter(
plugin => !(Array.isArray(plugin) ? plugin[0] : plugin).includes(
'@babel/plugin-syntax-dynamic-import'
)
)
return options
})
/* eslint-enable indent */

if (argv.mode === 'production') {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -148,7 +148,7 @@
"jest-fetch-mock": "^2.1.2",
"moment-locales-webpack-plugin": "^1.1.0",
"neutrino": "^9.1.0",
"neutrino-webextension": "^1.0.3",
"neutrino-webextension": "^1.1.1",
"node-fetch": "^2.6.0",
"node-sass": "^4.12.0",
"postcss-loader": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/manifest/chrome.manifest.json
Expand Up @@ -7,5 +7,5 @@
},
"incognito": "split",
"update_url": "https://clients2.google.com/service/update2/crx",
"minimum_chrome_version": "60"
"minimum_chrome_version": "63"
}
2 changes: 1 addition & 1 deletion src/manifest/firefox.manifest.json
Expand Up @@ -5,7 +5,7 @@
"applications": {
"gecko": {
"id": "saladict@crimx.com",
"strict_min_version": "65.0"
"strict_min_version": "67.0"
}
}
}
112 changes: 51 additions & 61 deletions yarn.lock
Expand Up @@ -1766,13 +1766,6 @@
dependencies:
type-detect "4.0.8"

"@sinonjs/formatio@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"
integrity sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==
dependencies:
samsam "1.3.0"

"@sinonjs/formatio@^3.2.1":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.2.tgz#771c60dfa75ea7f2d68e3b94c7e888a78781372c"
Expand Down Expand Up @@ -3410,6 +3403,11 @@ asynckit@^0.4.0:
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=

at-least-node@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==

atob@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
Expand Down Expand Up @@ -5715,7 +5713,7 @@ diff-sequences@^24.9.0:
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==

diff@^3.1.0, diff@^3.5.0:
diff@^3.5.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
Expand Down Expand Up @@ -7134,6 +7132,16 @@ fs-extra@^8.0.1:
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
dependencies:
at-least-node "^1.0.0"
graceful-fs "^4.2.0"
jsonfile "^6.0.1"
universalify "^1.0.0"

fs-write-stream-atomic@^1.0.8:
version "1.0.10"
resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
Expand Down Expand Up @@ -9250,6 +9258,15 @@ jsonfile@^4.0.0:
optionalDependencies:
graceful-fs "^4.1.6"

jsonfile@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
dependencies:
universalify "^1.0.0"
optionalDependencies:
graceful-fs "^4.1.6"

jsonparse@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
Expand Down Expand Up @@ -9510,11 +9527,6 @@ lodash.flatten@^4.4.0:
resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=

lodash.get@^4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=

lodash.ismatch@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
Expand Down Expand Up @@ -9600,11 +9612,6 @@ loglevelnext@^1.0.1:
es6-symbol "^3.1.1"
object.assign "^4.1.0"

lolex@^2.2.0:
version "2.7.5"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733"
integrity sha512-l9x0+1offnKKIzYVjyXU2SiwhXDLekRzKyhnbyldPHvC7BvLPVpdNUNR2KeMAiCN2D/kLNttZgQD5WjSxuBx3Q==

lolex@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz#ddbd7f6213ca1ea5826901ab1222b65d714b3cd7"
Expand Down Expand Up @@ -10225,17 +10232,17 @@ nested-object-assign@^1.0.3:
resolved "https://registry.yarnpkg.com/nested-object-assign/-/nested-object-assign-1.0.3.tgz#5aca69390d9affe5a612152b5f0843ae399ac597"
integrity sha512-kgq1CuvLyUcbcIuTiCA93cQ2IJFSlRwXcN+hLcb2qLJwC2qrePHGZZa7IipyWqaWF6tQjdax2pQnVxdq19Zzwg==

neutrino-webextension@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/neutrino-webextension/-/neutrino-webextension-1.0.3.tgz#c2b5b5afbb917d4119193e43d0d4ecaa30c90143"
integrity sha512-vdpruG6pDgD22jhTZZWVw4Ekh9sO1D9j7BxDQQPu2VghKoy3z627Xx5Dimpt8w+01BNblwZs2/A+Vt5al6Rs3A==
neutrino-webextension@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/neutrino-webextension/-/neutrino-webextension-1.1.1.tgz#e11a69953f93bcf32ab7e934697f0d68425371fd"
integrity sha512-xTDhKMlF/FQvFUW414ExIqKe6lfjb7SFfs1PVb/kAsJa9fXH8017geXFQwUSDs15oN1jPiEscE9tv5aseeyxnw==
dependencies:
archiver "^3.0.0"
deepmerge "^3.3.0"
fs-extra "^8.0.1"
fs-extra "^9.0.0"
globby "^10.0.1"
sinon-chrome "^3.0.1"
webextensions-emulator "^1.2.4"
webextensions-emulator "^1.2.5"
webpack-target-webextension "^0.1.0"
yargs-parser "^18.1.0"

neutrino@^9.1.0:
Expand All @@ -10258,7 +10265,7 @@ nice-try@^1.0.4:
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==

nise@^1.2.0, nise@^1.5.2:
nise@^1.5.2:
version "1.5.3"
resolved "https://registry.yarnpkg.com/nise/-/nise-1.5.3.tgz#9d2cfe37d44f57317766c6e9408a359c5d3ac1f7"
integrity sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==
Expand Down Expand Up @@ -13080,11 +13087,6 @@ safe-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

samsam@1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
integrity sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==

sane@^4.0.3:
version "4.1.0"
resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
Expand Down Expand Up @@ -13422,15 +13424,6 @@ simplebar@^4.2.3:
lodash.throttle "^4.1.1"
resize-observer-polyfill "^1.5.1"

sinon-chrome@^2.3.2:
version "2.3.2"
resolved "https://registry.yarnpkg.com/sinon-chrome/-/sinon-chrome-2.3.2.tgz#0e4253bd1eceaffa57e2164bc817c2c7b4ef3912"
integrity sha1-DkJTvR7Or/pX4hZLyBfCx7TvORI=
dependencies:
lodash "^4.16.3"
sinon "^4.4.2"
urijs "^1.18.2"

sinon-chrome@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/sinon-chrome/-/sinon-chrome-3.0.1.tgz#9fb14c230fa0959cb280f9f589e9eda8ccfda1d9"
Expand All @@ -13440,19 +13433,6 @@ sinon-chrome@^3.0.1:
sinon "^7.2.3"
urijs "^1.18.2"

sinon@^4.4.2:
version "4.5.0"
resolved "https://registry.yarnpkg.com/sinon/-/sinon-4.5.0.tgz#427ae312a337d3c516804ce2754e8c0d5028cb04"
integrity sha512-trdx+mB0VBBgoYucy6a9L7/jfQOmvGeaKZT4OOJ+lPAtI8623xyGr8wLiE4eojzBS8G9yXbhx42GHUOVLr4X2w==
dependencies:
"@sinonjs/formatio" "^2.0.0"
diff "^3.1.0"
lodash.get "^4.4.2"
lolex "^2.2.0"
nise "^1.2.0"
supports-color "^5.1.0"
type-detect "^4.0.5"

sinon@^7.2.3:
version "7.5.0"
resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.5.0.tgz#e9488ea466070ea908fd44a3d6478fd4923c67ec"
Expand Down Expand Up @@ -14114,7 +14094,7 @@ supports-color@^2.0.0:
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=

supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.5.0:
supports-color@^5.3.0, supports-color@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
Expand Down Expand Up @@ -14515,7 +14495,7 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"

type-detect@4.0.8, type-detect@^4.0.5:
type-detect@4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
Expand Down Expand Up @@ -14663,6 +14643,11 @@ universalify@^0.1.0:
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==

universalify@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==

unpipe@1.0.0, unpipe@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
Expand Down Expand Up @@ -14906,13 +14891,13 @@ webextension-polyfill@^0.6.0:
resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.6.0.tgz#1afd925f3274a0d4848083579b9c0b649a5c6763"
integrity sha512-PlYwiX8e4bNZrEeBFxbFFsLtm0SMPxJliLTGdNCA0Bq2XkWrAn2ejUd+89vZm+8BnfFB1BclJyCz3iKsm2atNg==

webextensions-emulator@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/webextensions-emulator/-/webextensions-emulator-1.2.4.tgz#eaf23ab086f0134b6e6dc261d51b3e8e1ad4c4b1"
integrity sha512-E7+sw9KxlXZsToppSZP/rM0nBKYoWVfvi+OZHW3nbVAeVHK5/aelrPocGn/7R/DoVS5Fde2V8ow7kmB99p+KFA==
webextensions-emulator@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/webextensions-emulator/-/webextensions-emulator-1.2.5.tgz#59cc7170d21613122298c7e9ece3698fa32e9d6b"
integrity sha512-3yH2ayJTMVXbyUXMiD22+uzYlr/lmZqQass/vZMwhxc6ME9iSQWKb7IPeljMX9jQCOOwLrKbcP1k6fJVefcizA==
dependencies:
lodash "^4.17.11"
sinon-chrome "^2.3.2"
lodash "^4.17.15"
sinon-chrome "^3.0.1"

webidl-conversions@^4.0.2:
version "4.0.2"
Expand Down Expand Up @@ -15049,6 +15034,11 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
source-list-map "^2.0.0"
source-map "~0.6.1"

webpack-target-webextension@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/webpack-target-webextension/-/webpack-target-webextension-0.1.0.tgz#d975b73cf5e42638f3bfe711f327125c99d7036d"
integrity sha512-RK9EdsecmwRyHfICFydmeW3jW7EOAmF2O1S3gsVrAiakYd0GsD73TAe8frHJ9psCD9cTt5phwIrDll12HJPPYg==

webpack@^4, webpack@^4.33.0, webpack@^4.38.0:
version "4.42.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8"
Expand Down

0 comments on commit 5bd38a0

Please sign in to comment.