Skip to content

Commit 94bb407

Browse files
committed
chore: Merge branch 'dev' into feat_ipc
2 parents af5363f + 940e436 commit 94bb407

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

packages/@vue/cli-plugin-typescript/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
"globby": "^11.0.2",
3232
"thread-loader": "^3.0.0",
3333
"ts-loader": "^9.2.5",
34-
"webpack": "^5.54.0",
35-
"yorkie": "^2.0.0"
34+
"webpack": "^5.54.0"
3635
},
3736
"peerDependencies": {
3837
"@vue/cli-service": "^3.0.0 || ^4.0.0 || ^5.0.0-0",

packages/@vue/cli-service/lib/util/loadFileConfig.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const fs = require('fs')
22
const path = require('path')
3-
3+
const { pathToFileURL } = require('url')
44
const isFileEsm = require('is-file-esm')
55
const { loadModule } = require('@vue/cli-shared-utils')
66

@@ -25,7 +25,7 @@ module.exports = function loadFileConfig (context) {
2525
const { esm } = isFileEsm.sync(fileConfigPath)
2626

2727
if (esm) {
28-
fileConfig = import(fileConfigPath)
28+
fileConfig = import(pathToFileURL(fileConfigPath))
2929
} else {
3030
fileConfig = loadModule(fileConfigPath, context)
3131
}

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
"@achrinza/[email protected].2":
6-
version "9.2.2"
7-
resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz#ae1b5d3d6a9362034eea60c8d946b93893c2e4ec"
8-
integrity sha512-b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw==
5+
"@achrinza/[email protected].3":
6+
version "9.2.3"
7+
resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.3.tgz#a425249566e318e4aca1f01a754f4e70486708bb"
8+
integrity sha512-RHKuRKICo0PrUGXpPkqtD5a/3/LU2MwWI6pynZ3WYq+0iCMwWv3wGFM/yFxtaaa1zKkP3bGz4tVyHtqbIRxL8g==
99
dependencies:
1010
"@node-ipc/js-queue" "2.0.3"
1111
event-pubsub "4.3.0"

0 commit comments

Comments
 (0)