Skip to content

Commit 9f74f20

Browse files
committed
refactor: move to monorepo
1 parent b3a8ccf commit 9f74f20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+15605
-609
lines changed

.github/CONTRIBUTING.md

+22-15

.gitignore

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ node_modules
44
explorations
55
TODOs.md
66
RELEASE_NOTE*.md
7-
packages/vue-server-renderer/basic.js
8-
packages/vue-server-renderer/build.dev.js
9-
packages/vue-server-renderer/build.prod.js
10-
packages/vue-server-renderer/server-plugin.js
11-
packages/vue-server-renderer/client-plugin.js
12-
packages/vue-template-compiler/build.js
13-
packages/vue-template-compiler/browser.js
7+
packages/server-renderer/basic.js
8+
packages/server-renderer/build.dev.js
9+
packages/server-renderer/build.prod.js
10+
packages/server-renderer/server-plugin.js
11+
packages/server-renderer/client-plugin.js
12+
packages/compiler-sfc/build.js
13+
packages/compiler-sfc/browser.js
1414
.vscode
1515
dist
1616
temp

compiler-sfc/index.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from '@vue/compiler-sfc'

compiler-sfc/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require('@vue/compiler-sfc')

compiler-sfc/package.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"main": "index.js",
3+
"types": "index.d.ts"
4+
}

package.json

+15-23
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,24 @@
1111
"files": [
1212
"src",
1313
"dist/*.js",
14-
"types/*.d.ts"
14+
"types/*.d.ts",
15+
"compiler-sfc",
16+
"packages/compiler-sfc"
1517
],
1618
"sideEffects": false,
1719
"scripts": {
18-
"dev": "rollup -w -c scripts/config.js --environment TARGET:web-full-dev",
19-
"dev:cjs": "rollup -w -c scripts/config.js --environment TARGET:web-runtime-cjs-dev",
20-
"dev:esm": "rollup -w -c scripts/config.js --environment TARGET:web-runtime-esm",
21-
"dev:ssr": "rollup -w -c scripts/config.js --environment TARGET:web-server-renderer",
22-
"dev:compiler": "rollup -w -c scripts/config.js --environment TARGET:web-compiler ",
20+
"dev": "rollup -w -c scripts/config.js --environment TARGET:full-dev",
21+
"dev:cjs": "rollup -w -c scripts/config.js --environment TARGET:runtime-cjs-dev",
22+
"dev:esm": "rollup -w -c scripts/config.js --environment TARGET:runtime-esm",
23+
"dev:ssr": "rollup -w -c scripts/config.js --environment TARGET:server-renderer",
24+
"dev:compiler": "rollup -w -c scripts/config.js --environment TARGET:compiler ",
2325
"build": "node scripts/build.js",
24-
"build:ssr": "npm run build -- web-runtime-cjs,web-server-renderer",
26+
"build:ssr": "npm run build -- runtime-cjs,server-renderer",
2527
"build:types": "rimraf temp && tsc --declaration --emitDeclarationOnly --outDir temp && api-extractor run",
2628
"test": "npm run ts-check && npm run test:types && npm run test:unit && npm run test:e2e && npm run test:ssr",
2729
"test:unit": "vitest run test/unit",
28-
"test:ssr": "npm run build:ssr && vitest run test/ssr",
29-
"test:e2e": "npm run build -- web-full-prod,web-server-renderer-basic && vitest run test/e2e",
30+
"test:ssr": "npm run build:ssr && vitest run server-renderer",
31+
"test:e2e": "npm run build -- full-prod,server-renderer-basic && vitest run test/e2e",
3032
"test:transition": "karma start test/transition/karma.conf.js",
3133
"test:types": "npm run build:types && tsc -p ./types/tsconfig.json",
3234
"format": "prettier --write --parser typescript \"(src|test|packages|types)/**/*.ts\"",
@@ -62,6 +64,9 @@
6264
"url": "https://github.com/vuejs/vue/issues"
6365
},
6466
"homepage": "https://github.com/vuejs/vue#readme",
67+
"dependencies": {
68+
"@vue/compiler-sfc": "2.6.14"
69+
},
6570
"devDependencies": {
6671
"@microsoft/api-extractor": "^7.24.2",
6772
"@rollup/plugin-alias": "^3.1.9",
@@ -70,19 +75,14 @@
7075
"@rollup/plugin-replace": "^4.0.0",
7176
"@types/he": "^1.1.2",
7277
"@types/node": "^17.0.30",
73-
"acorn": "^8.7.1",
74-
"acorn-walk": "^8.2.0",
7578
"chalk": "^4.0.0",
7679
"commitizen": "^4.2.4",
7780
"conventional-changelog": "^3.1.25",
7881
"cross-spawn": "^7.0.3",
7982
"cz-conventional-changelog": "^3.3.0",
80-
"de-indent": "^1.0.2",
8183
"esbuild": "^0.14.39",
82-
"escodegen": "^2.0.0",
83-
"file-loader": "^3.0.1",
84-
"hash-sum": "^2.0.0",
8584
"he": "^1.2.0",
85+
"de-indent": "^1.0.2",
8686
"jasmine-core": "^4.1.1",
8787
"jsdom": "^19.0.0",
8888
"karma": "^6.3.20",
@@ -92,27 +92,19 @@
9292
"karma-jasmine": "^5.0.1",
9393
"lint-staged": "^12.4.1",
9494
"lodash": "^4.17.21",
95-
"lodash.template": "^4.4.0",
96-
"lodash.uniq": "^4.5.0",
97-
"lru-cache": "^7.8.1",
9895
"marked": "^4.0.6",
99-
"memory-fs": "^0.5.0",
10096
"prettier": "^2.6.2",
10197
"puppeteer": "^14.1.1",
102-
"resolve": "^1.22.0",
10398
"rimraf": "^3.0.2",
10499
"rollup": "^2.70.2",
105100
"rollup-plugin-typescript2": "^0.31.2",
106-
"serialize-javascript": "^6.0.0",
107101
"shelljs": "^0.8.5",
108-
"source-map": "0.5.6",
109102
"terser": "^5.13.1",
110103
"todomvc-app-css": "^2.4.2",
111104
"ts-node": "^10.7.0",
112105
"tslib": "^2.4.0",
113106
"typescript": "^4.6.4",
114107
"vitest": "^0.12.6",
115-
"webpack": "^4.46.0",
116108
"yorkie": "^2.0.0"
117109
},
118110
"config": {

packages/compiler-sfc/package.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"name": "@vue/compiler-sfc",
3+
"version": "2.6.14",
4+
"description": "compiler-sfc for Vue 2",
5+
"main": "dist/compiler-sfc.js",
6+
"types": "dist/compiler-sfc.d.ts",
7+
"files": ["dist"],
8+
"dependencies": {
9+
"@babel/parser": "^7.16.4",
10+
"source-map": "^0.6.1",
11+
"postcss": "^8.1.10"
12+
},
13+
"devDependencies": {
14+
"@types/estree": "^0.0.48",
15+
"@babel/types": "^7.16.0",
16+
"@types/lru-cache": "^5.1.0",
17+
"estree-walker": "^2.0.2",
18+
"magic-string": "^0.25.7",
19+
"pug": "^3.0.1",
20+
"sass": "^1.26.9",
21+
"@vue/consolidate": "^0.17.3",
22+
"hash-sum": "^2.0.0",
23+
"lru-cache": "^5.1.1",
24+
"merge-source-map": "^1.1.0",
25+
"postcss-modules": "^4.0.0",
26+
"postcss-selector-parser": "^6.0.4"
27+
}
28+
}

packages/vue-server-renderer/index.js packages/server-renderer/index.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@ var packageVersion = require('./package.json').version
77
if (vueVersion && vueVersion !== packageVersion) {
88
throw new Error(
99
'\n\nVue packages version mismatch:\n\n' +
10-
'- vue@' + vueVersion + '\n' +
11-
'- ' + packageName + '@' + packageVersion + '\n\n' +
12-
'This may cause things to work incorrectly. Make sure to use the same version for both.\n'
10+
'- vue@' +
11+
vueVersion +
12+
'\n' +
13+
'- ' +
14+
packageName +
15+
'@' +
16+
packageVersion +
17+
'\n\n' +
18+
'This may cause things to work incorrectly. Make sure to use the same version for both.\n'
1319
)
1420
}
1521

packages/vue-server-renderer/package.json packages/server-renderer/package.json

+9-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
"server",
1414
"ssr"
1515
],
16+
"files": [
17+
"types",
18+
"*.js",
19+
"*.d.ts"
20+
],
1621
"author": "Evan You",
1722
"license": "MIT",
1823
"bugs": {
@@ -29,7 +34,10 @@
2934
"source-map": "0.5.6"
3035
},
3136
"devDependencies": {
32-
"vue": "file:../.."
37+
"memory-fs": "^0.5.0",
38+
"vue": "file:../..",
39+
"webpack": "^4.46.0",
40+
"file-loader": "^3.0.1"
3341
},
3442
"homepage": "https://github.com/vuejs/vue/tree/dev/packages/vue-server-renderer#readme"
3543
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

test/ssr/compile-with-webpack.ts packages/server-renderer/test/compile-with-webpack.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import path from 'path'
22
import webpack from 'webpack'
33
import MemoryFS from 'memory-fs'
4-
import { RenderOptions } from '../../src/server/create-renderer'
4+
import { RenderOptions } from 'server/create-renderer'
55
import { createBundleRenderer } from 'web/entry-server-renderer'
66
import VueSSRServerPlugin from 'server/webpack-plugin/server'
77

@@ -20,7 +20,7 @@ export function compileWithWebpack(
2020
},
2121
{
2222
test: /\.(png|woff2|css)$/,
23-
loader: 'file-loader',
23+
loader: require.resolve('file-loader'),
2424
options: {
2525
name: '[name].[ext]'
2626
}
@@ -62,7 +62,7 @@ export async function createWebpackBundleRenderer(
6262
filename: 'bundle.js',
6363
libraryTarget: 'commonjs2'
6464
},
65-
externals: [require.resolve('../../dist/vue.runtime.common.js')],
65+
externals: [require.resolve('../../../dist/vue.runtime.common.js')],
6666
plugins: asBundle ? [new VueSSRServerPlugin()] : []
6767
})
6868

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import Vue from '../../../../dist/vue.runtime.common.js'
2+
3+
export default context => {
4+
return new Promise(resolve => {
5+
context.msg = 'hello'
6+
resolve(
7+
new Vue({
8+
render(h) {
9+
return h('div', context.url)
10+
}
11+
})
12+
)
13+
})
14+
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module.exports = {
2-
beforeCreate () {
2+
beforeCreate() {
33
this.$vnode.ssrContext._registeredComponents.add('__MODULE_ID__')
44
},
5-
render (h) {
5+
render(h) {
66
return h('div', 'async bar')
77
}
88
}

test/ssr/fixtures/async-foo.js packages/server-renderer/test/fixtures/async-foo.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import font from './test.woff2'
44
import image from './test.png'
55

66
export default {
7-
beforeCreate () {
7+
beforeCreate() {
88
this.$vnode.ssrContext._registeredComponents.add('__MODULE_ID__')
99
},
10-
render (h) {
10+
render(h) {
1111
return h('div', `async ${font} ${image}`)
1212
}
1313
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import Vue from '../../../../dist/vue.runtime.common.js'
2+
3+
const app = {
4+
name: 'app',
5+
props: ['id'],
6+
serverCacheKey: props => (props.id === 1 ? false : props.id),
7+
render(h) {
8+
return h('div', '/test')
9+
}
10+
}
11+
12+
export default () => {
13+
return Promise.resolve(
14+
new Vue({
15+
render: h => h(app, { props: { id: 1 } })
16+
})
17+
)
18+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import Vue from '../../../../dist/vue.runtime.common.js'
2+
3+
const app = {
4+
name: 'app',
5+
props: ['id'],
6+
serverCacheKey: props => props.id,
7+
render(h) {
8+
return h('div', '/test')
9+
}
10+
}
11+
12+
export default () => {
13+
return Promise.resolve(
14+
new Vue({
15+
render: h => h(app, { props: { id: 1 } })
16+
})
17+
)
18+
}
File renamed without changes.

0 commit comments

Comments
 (0)