build: simplify compiler package setup

diff --git a/packages/compiler-core/README.md b/packages/compiler-core/README.md
deleted file mode 100644 (file)
index 33a82cc..0000000
--- a/packages/compiler-core/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# @vue/compiler-core
\ No newline at end of file

diff --git a/packages/compiler-core/index.js b/packages/compiler-core/index.js
deleted file mode 100644 (file)
index d3fc54f..0000000
--- a/packages/compiler-core/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./dist/compiler-core.cjs.prod.js')
-} else {
-  module.exports = require('./dist/compiler-core.cjs.js')
-}

diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json
deleted file mode 100644 (file)
index 7d500b3..0000000
--- a/packages/compiler-core/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "@vue/compiler-core",
-  "version": "3.0.0-alpha.1",
-  "description": "@vue/compiler-core",
-  "main": "index.js",
-  "module": "dist/compiler-core.esm-bundler.js",
-  "typings": "dist/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vue.git"
-  },
-  "keywords": [
-    "vue"
-  ],
-  "author": "Evan You",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/vuejs/vue/issues"
-  },
-  "homepage": "https://github.com/vuejs/vue/tree/dev/packages/compiler-core#readme"
-}

diff --git a/packages/compiler-dom/.npmignore b/packages/compiler-dom/.npmignore
deleted file mode 100644 (file)
index bb5c8a5..0000000
--- a/packages/compiler-dom/.npmignore
+++ /dev/null
@@ -1,3 +0,0 @@
-__tests__/
-__mocks__/
-dist/packages
\ No newline at end of file

diff --git a/packages/compiler-dom/README.md b/packages/compiler-dom/README.md
deleted file mode 100644 (file)
index 0027f54..0000000
--- a/packages/compiler-dom/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# @vue/compiler-dom
\ No newline at end of file

diff --git a/packages/compiler-dom/index.js b/packages/compiler-dom/index.js
deleted file mode 100644 (file)
index b5f7a05..0000000
--- a/packages/compiler-dom/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./dist/compiler-dom.cjs.prod.js')
-} else {
-  module.exports = require('./dist/compiler-dom.cjs.js')
-}

diff --git a/packages/compiler-dom/src/index.ts b/packages/compiler-dom/src/index.ts
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/compiler-server/.npmignore b/packages/compiler-server/.npmignore
deleted file mode 100644 (file)
index bb5c8a5..0000000
--- a/packages/compiler-server/.npmignore
+++ /dev/null
@@ -1,3 +0,0 @@
-__tests__/
-__mocks__/
-dist/packages
\ No newline at end of file

diff --git a/packages/compiler-server/README.md b/packages/compiler-server/README.md
deleted file mode 100644 (file)
index 24d0423..0000000
--- a/packages/compiler-server/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# @vue/compiler-server
\ No newline at end of file

diff --git a/packages/compiler-server/index.js b/packages/compiler-server/index.js
deleted file mode 100644 (file)
index 31c3429..0000000
--- a/packages/compiler-server/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports = require('./dist/compiler-server.cjs.prod.js')
-} else {
-  module.exports = require('./dist/compiler-server.cjs.js')
-}

diff --git a/packages/compiler-server/package.json b/packages/compiler-server/package.json
deleted file mode 100644 (file)
index 1e508dd..0000000
--- a/packages/compiler-server/package.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "@vue/compiler-server",
-  "version": "3.0.0-alpha.1",
-  "description": "@vue/compiler-server",
-  "main": "index.js",
-  "module": "dist/compiler-server.esm-bundler.js",
-  "typings": "dist/index.d.ts",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vuejs/vue.git"
-  },
-  "keywords": [
-    "vue"
-  ],
-  "author": "Evan You",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/vuejs/vue/issues"
-  },
-  "homepage": "https://github.com/vuejs/vue/tree/dev/packages/compiler-server#readme"
-}

diff --git a/packages/compiler-server/src/index.ts b/packages/compiler-server/src/index.ts
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/compiler-core/.npmignore b/packages/compiler/.npmignore
similarity index 100%
rename from packages/compiler-core/.npmignore
rename to packages/compiler/.npmignore

diff --git a/packages/compiler/README.md b/packages/compiler/README.md
new file mode 100644 (file)
index 0000000..f5a8b4f
--- /dev/null
+++ b/packages/compiler/README.md
@@ -0,0 +1 @@
+# @vue/compiler
\ No newline at end of file

diff --git a/packages/compiler/index.js b/packages/compiler/index.js
new file mode 100644 (file)
index 0000000..388d86e
--- /dev/null
+++ b/packages/compiler/index.js
@@ -0,0 +1,7 @@
+'use strict'
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./dist/compiler.cjs.prod.js')
+} else {
+  module.exports = require('./dist/compiler.cjs.js')
+}

diff --git a/packages/compiler-dom/package.json b/packages/compiler/package.json
similarity index 73%
rename from packages/compiler-dom/package.json
rename to packages/compiler/package.json
index d04e769fc1a676cebb615904f95997186a98839d..edd6837a21bc6cb0db461ad62ff531d378d52b1c 100644 (file)
--- a/packages/compiler-dom/package.json
+++ b/packages/compiler/package.json
@@ -1,9 +1,9 @@
 {
-  "name": "@vue/compiler-dom",
+  "name": "@vue/compiler",
   "version": "3.0.0-alpha.1",
-  "description": "@vue/compiler-dom",
+  "description": "@vue/compiler",
   "main": "index.js",
-  "module": "dist/compiler-dom.esm-bundler.js",
+  "module": "dist/compiler.esm-bundler.js",
   "typings": "dist/index.d.ts",
   "repository": {
     "type": "git",
@@ -17,5 +17,5 @@
   "bugs": {
     "url": "https://github.com/vuejs/vue/issues"
   },
-  "homepage": "https://github.com/vuejs/vue/tree/dev/packages/compiler-dom#readme"
-}
+  "homepage": "https://github.com/vuejs/vue/tree/dev/packages/compiler#readme"
+}
\ No newline at end of file

diff --git a/packages/compiler-core/src/index.ts b/packages/compiler/src/index.ts
similarity index 100%
rename from packages/compiler-core/src/index.ts
rename to packages/compiler/src/index.ts

diff --git a/packages/observer/__tests__/collections.spec.ts b/packages/observer/__tests__/collections.spec.ts
index da242d716482b3eadde778cb744720f5c2c88a71..bb99db93098d873ca961efcc0b863594fd1e79f8 100644 (file)
--- a/packages/observer/__tests__/collections.spec.ts
+++ b/packages/observer/__tests__/collections.spec.ts
@@ -1 +1,3 @@
-describe('observer/collections', () => {})
+describe('observer/collections', () => {
+  describe('Map', () => {})
+})

diff --git a/tsconfig.json b/tsconfig.json
index 3a20339745db745c54cc0ea5fa09a906b1ba3039..59fbad3f1609b00a5b503830d9ef4efdbad19b96 100644 (file)
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,9 +24,7 @@
       "@vue/scheduler": ["packages/scheduler/src"],
       "@vue/renderer-dom": ["packages/renderer-dom/src"],
       "@vue/renderer-server": ["packages/renderer-server/src"],
-      "@vue/compiler-core": ["packages/compiler-core/src"],
-      "@vue/compiler-dom": ["packages/compiler-dom/src"],
-      "@vue/compiler-server": ["packages/compiler-server/src"]
+      "@vue/compiler": ["packages/compiler-core/src"]
     }
   },
   "include": [