Skip to content

Commit

Permalink
feat: prepack resolve-url-loader (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClarkXia authored Jul 12, 2022
1 parent 21c771b commit 5ad1331
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-publisher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: 12
node-version: 14
registry-url: https://registry.npmjs.org/
- run: npm run setup
- run: npm run ncc-compiled
Expand Down
3 changes: 2 additions & 1 deletion packages/builder-pack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@builder/pack",
"version": "0.6.3",
"version": "0.6.4",
"license": "MIT",
"author": "ICE",
"description": "basic dependencies",
Expand Down Expand Up @@ -103,6 +103,7 @@
"prettier": "2.2.1",
"raw-loader": "4.0.2",
"react-dev-utils": "^12.0.0",
"resolve-url-loader": "5.0.0",
"sass-loader": "11.1.1",
"schema-utils4": "npm:schema-utils@4.0.0",
"source-map": "^0.7.1",
Expand Down
11 changes: 11 additions & 0 deletions packages/builder-pack/taskfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,16 @@ export async function ncc_sass_loader(task, opts) {
.target('deps/sass-loader');
}

externals['resolve-url-loader'] = '@builder/pack/deps/resolve-url-loader';
export async function ncc_resolve_url_loader(task, opts) {
await task
.source(
opts.src || relative(__dirname, require.resolve('resolve-url-loader'))
)
.ncc({ packageName: 'resolve-url-loader', externals: { ...externals, postcss: 'postcss' } })
.target('deps/resolve-url-loader');
}

// externals['loader-utils'] = '@builder/pack/deps/loader-utils';
export async function ncc_loader_utils(task, opts) {
await task
Expand Down Expand Up @@ -855,6 +865,7 @@ export async function ncc(task) {
'ncc_webpack_bundle_analyzer',
'ncc_esbuild_loader',
'ncc_sass_loader',
'ncc_resolve_url_loader',
'ncc_postcss_loader',
'ncc_postcss_preset_env',
'ncc_postcss_safe_parser',
Expand Down
48 changes: 43 additions & 5 deletions packages/builder-pack/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2578,6 +2578,14 @@ address@1.1.2, address@^1.0.1, address@^1.1.2:
resolved "https://registry.nlark.com/address/download/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
integrity sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=

adjust-sourcemap-loader@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99"
integrity sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==
dependencies:
loader-utils "^2.0.0"
regex-parser "^2.2.11"

aggregate-error@^3.0.0:
version "3.1.0"
resolved "https://registry.nlark.com/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1622604530325&other_urls=https%3A%2F%2Fregistry.nlark.com%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
Expand Down Expand Up @@ -6496,6 +6504,11 @@ nanoid@^3.3.1:
resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==

nanoid@^3.3.4:
version "3.3.4"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==

nanomatch@^1.2.9:
version "1.2.13"
resolved "https://registry.nlark.com/nanomatch/download/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
Expand Down Expand Up @@ -7588,6 +7601,15 @@ postcss@^8.1.0, postcss@^8.3.5:
picocolors "^1.0.0"
source-map-js "^0.6.2"

postcss@^8.2.14:
version "8.4.14"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
dependencies:
nanoid "^3.3.4"
picocolors "^1.0.0"
source-map-js "^1.0.2"

postcss@^8.4.7:
version "8.4.12"
resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905"
Expand Down Expand Up @@ -7918,6 +7940,11 @@ regex-not@^1.0.0, regex-not@^1.0.2:
extend-shallow "^3.0.2"
safe-regex "^1.1.0"

regex-parser@^2.2.11:
version "2.2.11"
resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==

regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1:
version "1.3.1"
resolved "https://registry.nlark.com/regexp.prototype.flags/download/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
Expand Down Expand Up @@ -8025,6 +8052,17 @@ resolve-from@^4.0.0:
resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
integrity sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=

resolve-url-loader@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz#ee3142fb1f1e0d9db9524d539cfa166e9314f795"
integrity sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==
dependencies:
adjust-sourcemap-loader "^4.0.0"
convert-source-map "^1.7.0"
loader-utils "^2.0.0"
postcss "^8.2.14"
source-map "0.6.1"

resolve-url@^0.2.1:
version "0.2.1"
resolved "https://registry.npm.taobao.org/resolve-url/download/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
Expand Down Expand Up @@ -8460,16 +8498,16 @@ source-map-url@^0.4.0:
resolved "https://registry.nlark.com/source-map-url/download/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
integrity sha1-CvZmBadFpaL5HPG7+KevvCg97FY=

source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM=

source-map@^0.5.0, source-map@^0.5.6:
version "0.5.7"
resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=

source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
version "0.6.1"
resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM=

source-map@^0.7.1, source-map@^0.7.3, source-map@~0.7.2:
version "0.7.3"
resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
Expand Down

0 comments on commit 5ad1331

Please sign in to comment.