This should be red
This should be blue
` diff --git a/packages/playground/css-sourcemap/__tests__/build.spec.ts b/packages/playground/css-sourcemap/__tests__/build.spec.ts deleted file mode 100644 index e36c1f52d2c1f8..00000000000000 --- a/packages/playground/css-sourcemap/__tests__/build.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { isBuild } from 'testUtils' - -if (isBuild) { - test('should not output sourcemap warning (#4939)', () => { - serverLogs.forEach((log) => { - expect(log).not.toMatch('Sourcemap is likely to be incorrect') - }) - }) -} else { - test('this file only includes test for build', () => { - expect(true).toBe(true) - }) -} diff --git a/packages/playground/data-uri/__tests__/data-uri.spec.ts b/packages/playground/data-uri/__tests__/data-uri.spec.ts deleted file mode 100644 index e1d488c931e7c1..00000000000000 --- a/packages/playground/data-uri/__tests__/data-uri.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { isBuild, findAssetFile } from '../../testUtils' - -test('plain', async () => { - expect(await page.textContent('.plain')).toBe('hi') -}) - -test('base64', async () => { - expect(await page.textContent('.base64')).toBe('hi') -}) - -if (isBuild) { - test('should compile away the import for build', async () => { - const file = findAssetFile('index') - expect(file).not.toMatch('import') - }) -} diff --git a/packages/playground/dynamic-import/package.json b/packages/playground/dynamic-import/package.json deleted file mode 100644 index a6b6d5f863f1b8..00000000000000 --- a/packages/playground/dynamic-import/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "test-dynamic-import", - "private": true, - "version": "0.0.0", - "scripts": { - "dev": "vite", - "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", - "preview": "vite preview" - } -} diff --git a/packages/playground/fs-serve/__tests__/fs-serve.spec.ts b/packages/playground/fs-serve/__tests__/fs-serve.spec.ts deleted file mode 100644 index eba1e441881710..00000000000000 --- a/packages/playground/fs-serve/__tests__/fs-serve.spec.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { isBuild } from '../../testUtils' - -const json = require('../safe.json') -const stringified = JSON.stringify(json) - -describe('main', () => { - beforeAll(async () => { - // viteTestUrl is globally injected in scripts/jestPerTestSetup.ts - await page.goto(viteTestUrl + '/src/') - }) - - if (!isBuild) { - test('default import', async () => { - expect(await page.textContent('.full')).toBe(stringified) - }) - - test('named import', async () => { - expect(await page.textContent('.named')).toBe(json.msg) - }) - - test('safe fetch', async () => { - expect(await page.textContent('.safe-fetch')).toMatch('KEY=safe') - expect(await page.textContent('.safe-fetch-status')).toBe('200') - }) - - test('safe fetch with special characters', async () => { - expect( - await page.textContent('.safe-fetch-subdir-special-characters') - ).toMatch('KEY=safe') - expect( - await page.textContent('.safe-fetch-subdir-special-characters-status') - ).toBe('200') - }) - - test('unsafe fetch', async () => { - expect(await page.textContent('.unsafe-fetch')).toMatch('403 Restricted') - expect(await page.textContent('.unsafe-fetch-status')).toBe('403') - }) - - test('safe fs fetch', async () => { - expect(await page.textContent('.safe-fs-fetch')).toBe(stringified) - expect(await page.textContent('.safe-fs-fetch-status')).toBe('200') - }) - - test('safe fs fetch with special characters', async () => { - expect(await page.textContent('.safe-fs-fetch-special-characters')).toBe( - stringified - ) - expect(await page.textContent('.safe-fs-fetch-status')).toBe('200') - }) - - test('unsafe fs fetch', async () => { - expect(await page.textContent('.unsafe-fs-fetch')).toBe('') - expect(await page.textContent('.unsafe-fs-fetch-status')).toBe('403') - }) - - test('nested entry', async () => { - expect(await page.textContent('.nested-entry')).toBe('foobar') - }) - - test('nested entry', async () => { - expect(await page.textContent('.nested-entry')).toBe('foobar') - }) - - test('denied', async () => { - expect(await page.textContent('.unsafe-dotenv')).toBe('404') - }) - } else { - test('dummy test to make jest happy', async () => { - // Your test suite must contain at least one test. - }) - } -}) diff --git a/packages/playground/glob-import/dir/index.js b/packages/playground/glob-import/dir/index.js deleted file mode 100644 index fb87f69f0f3a61..00000000000000 --- a/packages/playground/glob-import/dir/index.js +++ /dev/null @@ -1,4 +0,0 @@ -const modules = import.meta.globEager('./*.(js|ts)') -const globWithAlias = import.meta.globEager('@dir/al*.js') - -export { modules, globWithAlias } diff --git a/packages/playground/glob-import/dir/nested/bar.js b/packages/playground/glob-import/dir/nested/bar.js deleted file mode 100644 index a2d2921cca80ad..00000000000000 --- a/packages/playground/glob-import/dir/nested/bar.js +++ /dev/null @@ -1,4 +0,0 @@ -const modules = import.meta.globEager('../*.json') - -export const msg = 'bar' -export { modules } diff --git a/packages/playground/glob-import/side-effect/writetodom.js b/packages/playground/glob-import/side-effect/writetodom.js new file mode 100644 index 00000000000000..e2ab04ba7f5cbe --- /dev/null +++ b/packages/playground/glob-import/side-effect/writetodom.js @@ -0,0 +1,4 @@ +/* global document */ +document && + (document.querySelector('.side-effect-result').textContent = + 'Hello from side effect') diff --git a/packages/playground/js-sourcemap/__tests__/build.spec.ts b/packages/playground/js-sourcemap/__tests__/build.spec.ts deleted file mode 100644 index e36c1f52d2c1f8..00000000000000 --- a/packages/playground/js-sourcemap/__tests__/build.spec.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { isBuild } from 'testUtils' - -if (isBuild) { - test('should not output sourcemap warning (#4939)', () => { - serverLogs.forEach((log) => { - expect(log).not.toMatch('Sourcemap is likely to be incorrect') - }) - }) -} else { - test('this file only includes test for build', () => { - expect(true).toBe(true) - }) -} diff --git a/packages/playground/json/index.ssr.html b/packages/playground/json/index.ssr.html new file mode 100644 index 00000000000000..8a4c4551a90817 --- /dev/null +++ b/packages/playground/json/index.ssr.html @@ -0,0 +1,23 @@ +
+ json-module:
+
+
+
+ json-fs:
+
+
+
+
diff --git a/packages/playground/json/package.json b/packages/playground/json/package.json
deleted file mode 100644
index 203846bab73b48..00000000000000
--- a/packages/playground/json/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "test-json",
- "private": true,
- "version": "0.0.0",
- "scripts": {
- "dev": "vite",
- "build": "vite build",
- "debug": "node --inspect-brk ../../vite/bin/vite",
- "preview": "vite preview"
- },
- "devDependencies": {
- "vue": "^3.2.25",
- "json-module": "file:./json-module"
- }
-}
diff --git a/packages/playground/json/server.js b/packages/playground/json/server.js
new file mode 100644
index 00000000000000..d7803b94f4b81a
--- /dev/null
+++ b/packages/playground/json/server.js
@@ -0,0 +1,88 @@
+// @ts-check
+const fs = require('fs')
+const path = require('path')
+const express = require('express')
+
+const isTest = process.env.NODE_ENV === 'test' || !!process.env.VITE_TEST_BUILD
+
+async function createServer(
+ root = process.cwd(),
+ isProd = process.env.NODE_ENV === 'production'
+) {
+ const resolve = (p) => path.resolve(__dirname, p)
+ const app = express()
+
+ /**
+ * @type {import('vite').ViteDevServer}
+ */
+ let vite
+ vite = await require('vite').createServer({
+ root,
+ logLevel: isTest ? 'error' : 'info',
+ server: {
+ middlewareMode: 'ssr',
+ watch: {
+ // During tests we edit the files too fast and sometimes chokidar
+ // misses change events, so enforce polling for consistency
+ usePolling: true,
+ interval: 100
+ }
+ },
+ json: {
+ stringify: true
+ }
+ })
+ // use vite's connect instance as middleware
+ app.use(vite.middlewares)
+
+ app.use('*', async (req, res) => {
+ try {
+ let [url] = req.originalUrl.split('?')
+ if (url.endsWith('/')) url += 'index.ssr.html'
+
+ if (url === '/json-module') {
+ console.time('load module')
+ const json = JSON.stringify(await vite.ssrLoadModule('/test.json'))
+ console.timeEnd('load module')
+ res.status(200).end('' + json.length)
+ return
+ }
+
+ if (url === '/json-fs') {
+ console.time('transform module')
+ const source = fs.readFileSync('./test.json', { encoding: 'utf-8' })
+ const json = await vite.ssrTransform(
+ `export default ${source}`,
+ null,
+ './output.json'
+ )
+ console.timeEnd('transform module')
+ res.status(200).end(String(json.code.length))
+ return
+ }
+
+ const htmlLoc = resolve(`.${url}`)
+ let html = fs.readFileSync(htmlLoc, 'utf8')
+ html = await vite.transformIndexHtml(url, html)
+
+ res.status(200).set({ 'Content-Type': 'text/html' }).end(html)
+ } catch (e) {
+ vite && vite.ssrFixStacktrace(e)
+ console.log(e.stack)
+ res.status(500).end(e.stack)
+ }
+ })
+
+ return { app, vite }
+}
+
+if (!isTest) {
+ createServer().then(({ app }) =>
+ app.listen(3000, () => {
+ console.log('http://localhost:3000')
+ })
+ )
+}
+
+// for test use
+exports.createServer = createServer
diff --git a/packages/playground/lib/__tests__/lib.spec.ts b/packages/playground/lib/__tests__/lib.spec.ts
deleted file mode 100644
index 382fb16510ce6f..00000000000000
--- a/packages/playground/lib/__tests__/lib.spec.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { isBuild, findAssetFile, testDir } from 'testUtils'
-import path from 'path'
-import fs from 'fs'
-
-if (isBuild) {
- test('es', async () => {
- expect(await page.textContent('.es')).toBe('It works')
- })
-
- test('umd', async () => {
- expect(await page.textContent('.umd')).toBe('It works')
- })
-
- test('iife', async () => {
- expect(await page.textContent('.iife')).toBe('It works')
- })
-
- test('Library mode does not include `preload`', async () => {
- expect(await page.textContent('.dynamic-import-message')).toBe('hello vite')
- const code = fs.readFileSync(
- path.join(testDir, 'dist/lib/dynamic-import-message.js'),
- 'utf-8'
- )
- expect(code).not.toMatch('__vitePreload')
- })
-} else {
- test('dev', async () => {
- expect(await page.textContent('.demo')).toBe('It works')
- })
-}
diff --git a/packages/playground/lib/src/main.js b/packages/playground/lib/src/main.js
deleted file mode 100644
index 2422edf5829a0e..00000000000000
--- a/packages/playground/lib/src/main.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function myLib(sel) {
- document.querySelector(sel).textContent = 'It works'
-}
diff --git a/packages/playground/react/__tests__/react.spec.ts b/packages/playground/react/__tests__/react.spec.ts
deleted file mode 100644
index 46eb752924f801..00000000000000
--- a/packages/playground/react/__tests__/react.spec.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { editFile, untilUpdated, isBuild } from '../../testUtils'
-
-test('should render', async () => {
- expect(await page.textContent('h1')).toMatch('Hello Vite + React')
-})
-
-test('should update', async () => {
- expect(await page.textContent('button')).toMatch('count is: 0')
- await page.click('button')
- expect(await page.textContent('button')).toMatch('count is: 1')
-})
-
-test('should hmr', async () => {
- editFile('App.jsx', (code) => code.replace('Vite + React', 'Updated'))
- await untilUpdated(() => page.textContent('h1'), 'Hello Updated')
- // preserve state
- expect(await page.textContent('button')).toMatch('count is: 1')
-})
-
-test('should have annotated jsx with file location metadata', async () => {
- // we're not annotating in prod,
- // so we skip this test when isBuild is true
- if (isBuild) return
-
- const meta = await page.evaluate(() => {
- const button = document.querySelector('button')
- const key = Object.keys(button).find(
- (key) => key.indexOf('__reactFiber') === 0
- )
- return button[key]._debugSource
- })
- // If the evaluate call doesn't crash, and the returned metadata has
- // the expected fields, we're good.
- expect(Object.keys(meta).sort()).toEqual([
- 'columnNumber',
- 'fileName',
- 'lineNumber'
- ])
-})
diff --git a/packages/playground/resolve-config/__tests__/resolve-config.spec.ts b/packages/playground/resolve-config/__tests__/resolve-config.spec.ts
deleted file mode 100644
index 13ea5ea6f59a4f..00000000000000
--- a/packages/playground/resolve-config/__tests__/resolve-config.spec.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-import { commandSync } from 'execa'
-import { isBuild, testDir, workspaceRoot } from '../../testUtils'
-
-const viteBin = path.join(workspaceRoot, 'packages', 'vite', 'bin', 'vite.js')
-
-const fromTestDir = (...p: string[]) => path.resolve(testDir, ...p)
-
-const build = (configName: string) => {
- commandSync(`${viteBin} build`, { cwd: fromTestDir(configName) })
-}
-const getDistFile = (configName: string) => {
- return fs.readFileSync(fromTestDir(`${configName}/dist/index.es.js`), 'utf8')
-}
-
-if (isBuild) {
- it('loads vite.config.js', () => {
- build('js')
- expect(getDistFile('js')).toContain('console.log(true)')
- })
- it('loads vite.config.js with package#type module', () => {
- build('js-module')
- expect(getDistFile('js-module')).toContain('console.log(true)')
- })
- it('loads vite.config.cjs', () => {
- build('cjs')
- expect(getDistFile('cjs')).toContain('console.log(true)')
- })
- it('loads vite.config.cjs with package#type module', () => {
- build('cjs-module')
- expect(getDistFile('cjs-module')).toContain('console.log(true)')
- })
- it('loads vite.config.mjs', () => {
- build('mjs')
- expect(getDistFile('mjs')).toContain('console.log(true)')
- })
- it('loads vite.config.mjs with package#type module', () => {
- build('mjs-module')
- expect(getDistFile('mjs-module')).toContain('console.log(true)')
- })
- it('loads vite.config.ts', () => {
- build('ts')
- expect(getDistFile('ts')).toContain('console.log(true)')
- })
- it('loads vite.config.ts with package#type module', () => {
- build('ts-module')
- expect(getDistFile('ts-module')).toContain('console.log(true)')
- })
-} else {
- // this test doesn't support serve mode
- // must contain at least one test
- test('should work', () => void 0)
-}
diff --git a/packages/playground/tailwind-sourcemap/__tests__/build.spec.ts b/packages/playground/tailwind-sourcemap/__tests__/build.spec.ts
deleted file mode 100644
index e36c1f52d2c1f8..00000000000000
--- a/packages/playground/tailwind-sourcemap/__tests__/build.spec.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { isBuild } from 'testUtils'
-
-if (isBuild) {
- test('should not output sourcemap warning (#4939)', () => {
- serverLogs.forEach((log) => {
- expect(log).not.toMatch('Sourcemap is likely to be incorrect')
- })
- })
-} else {
- test('this file only includes test for build', () => {
- expect(true).toBe(true)
- })
-}
diff --git a/packages/playground/tailwind-sourcemap/__tests__/serve.spec.ts b/packages/playground/tailwind-sourcemap/__tests__/serve.spec.ts
deleted file mode 100644
index d961f75e4536e5..00000000000000
--- a/packages/playground/tailwind-sourcemap/__tests__/serve.spec.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { isBuild } from 'testUtils'
-
-if (!isBuild) {
- test('should not output missing source file warning', () => {
- serverLogs.forEach((log) => {
- expect(log).not.toMatch(/Sourcemap for .+ points to missing source files/)
- })
- })
-} else {
- test('this file only includes test for serve', () => {
- expect(true).toBe(true)
- })
-}
diff --git a/packages/playground/vue-lib/__tests__/serve.js b/packages/playground/vue-lib/__tests__/serve.js
deleted file mode 100644
index 73f89eee44ea3e..00000000000000
--- a/packages/playground/vue-lib/__tests__/serve.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// @ts-check
-// this is automtically detected by scripts/jestPerTestSetup.ts and will replace
-// the default e2e test serve behavior
-
-exports.serve = async function serve() {
- // do nothing, skip default behavior
-}
diff --git a/packages/playground/vue-sourcemap/__tests__/build.spec.ts b/packages/playground/vue-sourcemap/__tests__/build.spec.ts
deleted file mode 100644
index e36c1f52d2c1f8..00000000000000
--- a/packages/playground/vue-sourcemap/__tests__/build.spec.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { isBuild } from 'testUtils'
-
-if (isBuild) {
- test('should not output sourcemap warning (#4939)', () => {
- serverLogs.forEach((log) => {
- expect(log).not.toMatch('Sourcemap is likely to be incorrect')
- })
- })
-} else {
- test('this file only includes test for build', () => {
- expect(true).toBe(true)
- })
-}
diff --git a/packages/plugin-legacy/CHANGELOG.md b/packages/plugin-legacy/CHANGELOG.md
index 5c00212554ce8c..035460b5816cb5 100644
--- a/packages/plugin-legacy/CHANGELOG.md
+++ b/packages/plugin-legacy/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.8.2 (2022-05-02)
+
+* chore(deps): update all non-major dependencies (#7780) ([eba9d05](https://github.com/vitejs/vite/commit/eba9d05)), closes [#7780](https://github.com/vitejs/vite/issues/7780)
+* chore(deps): update all non-major dependencies (#7847) ([e29d1d9](https://github.com/vitejs/vite/commit/e29d1d9)), closes [#7847](https://github.com/vitejs/vite/issues/7847)
+* chore(deps): update all non-major dependencies (#7949) ([b877d30](https://github.com/vitejs/vite/commit/b877d30)), closes [#7949](https://github.com/vitejs/vite/issues/7949)
+* refactor(legacy): remove unneeded dynamic import var init code (#7759) ([12a4e7d](https://github.com/vitejs/vite/commit/12a4e7d)), closes [#7759](https://github.com/vitejs/vite/issues/7759)
+
+
+
## 1.8.1 (2022-04-13)
* fix(deps): update all non-major dependencies (#7668) ([485263c](https://github.com/vitejs/vite/commit/485263c)), closes [#7668](https://github.com/vitejs/vite/issues/7668)
diff --git a/packages/plugin-legacy/README.md b/packages/plugin-legacy/README.md
index 3c9fe67e107f7f..fc4167f4f1010f 100644
--- a/packages/plugin-legacy/README.md
+++ b/packages/plugin-legacy/README.md
@@ -27,22 +27,6 @@ export default {
}
```
-When targeting IE11, you also need `regenerator-runtime`:
-
-```js
-// vite.config.js
-import legacy from '@vitejs/plugin-legacy'
-
-export default {
- plugins: [
- legacy({
- targets: ['ie >= 11'],
- additionalLegacyPolyfills: ['regenerator-runtime/runtime']
- })
- ]
-}
-```
-
## Options
### `targets`
diff --git a/packages/plugin-legacy/package.json b/packages/plugin-legacy/package.json
index adc97e974f2d37..296c994165747b 100644
--- a/packages/plugin-legacy/package.json
+++ b/packages/plugin-legacy/package.json
@@ -1,6 +1,6 @@
{
"name": "@vitejs/plugin-legacy",
- "version": "1.8.1",
+ "version": "1.8.2",
"license": "MIT",
"author": "Evan You",
"files": [
@@ -10,7 +10,7 @@
"main": "index.js",
"types": "index.d.ts",
"engines": {
- "node": ">=12.0.0"
+ "node": ">=14.6.0"
},
"repository": {
"type": "git",
@@ -22,8 +22,8 @@
},
"homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#readme",
"dependencies": {
- "@babel/standalone": "^7.17.9",
- "core-js": "^3.22.2",
+ "@babel/standalone": "^7.17.11",
+ "core-js": "^3.22.4",
"magic-string": "^0.26.1",
"regenerator-runtime": "^0.13.9",
"systemjs": "^6.12.1"
diff --git a/packages/plugin-react/CHANGELOG.md b/packages/plugin-react/CHANGELOG.md
index 958c8270b6f221..01dfee3feb7ffb 100644
--- a/packages/plugin-react/CHANGELOG.md
+++ b/packages/plugin-react/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.3.2 (2022-05-02)
+
+* fix(plugin-react): React is not defined when component name is lowercase (#6838) ([bf40e5c](https://github.com/vitejs/vite/commit/bf40e5c)), closes [#6838](https://github.com/vitejs/vite/issues/6838)
+* chore(deps): update all non-major dependencies (#7780) ([eba9d05](https://github.com/vitejs/vite/commit/eba9d05)), closes [#7780](https://github.com/vitejs/vite/issues/7780)
+* chore(deps): update all non-major dependencies (#7949) ([b877d30](https://github.com/vitejs/vite/commit/b877d30)), closes [#7949](https://github.com/vitejs/vite/issues/7949)
+
+
+
## 1.3.1 (2022-04-13)
* fix(deps): update all non-major dependencies (#7668) ([485263c](https://github.com/vitejs/vite/commit/485263c)), closes [#7668](https://github.com/vitejs/vite/issues/7668)
diff --git a/packages/plugin-react/package.json b/packages/plugin-react/package.json
index 8c93db98aac027..ca8b1d78752b69 100644
--- a/packages/plugin-react/package.json
+++ b/packages/plugin-react/package.json
@@ -1,6 +1,6 @@
{
"name": "@vitejs/plugin-react",
- "version": "1.3.1",
+ "version": "1.3.2",
"license": "MIT",
"author": "Evan You",
"contributors": [
@@ -21,7 +21,7 @@
"prepublishOnly": "(cd ../vite && npm run build) && npm run build"
},
"engines": {
- "node": ">=12.0.0"
+ "node": ">=14.6.0"
},
"repository": {
"type": "git",
@@ -33,13 +33,16 @@
},
"homepage": "https://github.com/vitejs/vite/tree/main/packages/plugin-react#readme",
"dependencies": {
- "@babel/core": "^7.17.9",
+ "@babel/core": "^7.17.10",
"@babel/plugin-transform-react-jsx": "^7.17.3",
"@babel/plugin-transform-react-jsx-development": "^7.16.7",
"@babel/plugin-transform-react-jsx-self": "^7.16.7",
"@babel/plugin-transform-react-jsx-source": "^7.16.7",
"@rollup/pluginutils": "^4.2.1",
- "react-refresh": "^0.12.0",
+ "react-refresh": "^0.13.0",
"resolve": "^1.22.0"
+ },
+ "peerDependencies": {
+ "vite": "^2.0.0"
}
}
diff --git a/packages/plugin-react/src/fast-refresh.ts b/packages/plugin-react/src/fast-refresh.ts
index 4672e26f6264e3..6bff7d94fa023b 100644
--- a/packages/plugin-react/src/fast-refresh.ts
+++ b/packages/plugin-react/src/fast-refresh.ts
@@ -1,6 +1,6 @@
-import type { types as t } from '@babel/core'
import fs from 'fs'
import path from 'path'
+import type { types as t } from '@babel/core'
export const runtimePublicPath = '/@react-refresh'
diff --git a/packages/plugin-react/src/index.ts b/packages/plugin-react/src/index.ts
index cefab59d94fe53..4ca3e0d371f6c9 100644
--- a/packages/plugin-react/src/index.ts
+++ b/packages/plugin-react/src/index.ts
@@ -38,15 +38,10 @@ export interface Options {
* @default true
*/
jsxPure?: boolean
-
/**
* Babel configuration applied in both dev and prod.
*/
babel?: BabelOptions
- /**
- * @deprecated Use `babel.parserOpts.plugins` instead
- */
- parserPlugins?: ParserOptions['plugins']
}
export type BabelOptions = Omit<
@@ -104,7 +99,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
babelOptions.presets ||= []
babelOptions.overrides ||= []
babelOptions.parserOpts ||= {} as any
- babelOptions.parserOpts.plugins ||= opts.parserPlugins || []
+ babelOptions.parserOpts.plugins ||= []
// Support patterns like:
// - import * as React from 'react';
diff --git a/packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts b/packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts
index dc7129862fd976..01e4cc4c37d478 100644
--- a/packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts
+++ b/packages/plugin-react/src/jsx-runtime/babel-import-to-require.ts
@@ -1,5 +1,5 @@
import type * as babelCore from '@babel/core'
-import type { types as t, Visitor } from '@babel/core'
+import type { Visitor, types as t } from '@babel/core'
/**
* Replace this:
diff --git a/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts b/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts
index 59d6661bedd11b..b37ef698e5f215 100644
--- a/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts
+++ b/packages/plugin-react/src/jsx-runtime/babel-restore-jsx.spec.ts
@@ -1,5 +1,6 @@
-import babelRestoreJSX from './babel-restore-jsx'
import * as babel from '@babel/core'
+import { describe, expect, it } from 'vitest'
+import babelRestoreJSX from './babel-restore-jsx'
function jsx(code: string) {
return babel.transform(code, {
diff --git a/packages/plugin-react/src/jsx-runtime/restore-jsx.spec.ts b/packages/plugin-react/src/jsx-runtime/restore-jsx.spec.ts
new file mode 100644
index 00000000000000..fcad0f78c3373b
--- /dev/null
+++ b/packages/plugin-react/src/jsx-runtime/restore-jsx.spec.ts
@@ -0,0 +1,56 @@
+import * as babel from '@babel/core'
+import { describe, expect, it } from 'vitest'
+import { restoreJSX } from './restore-jsx'
+
+async function jsx(sourceCode: string) {
+ const [ast] = await restoreJSX(babel, sourceCode, 'test.js')
+ if (ast == null) {
+ return ast
+ }
+ const { code } = await babel.transformFromAstAsync(ast, null, {
+ configFile: false
+ })
+ return code
+}
+// jsx(`import React__default, { PureComponent, Component, forwardRef, memo, createElement } from 'react';
+// React__default.createElement(Foo)`)
+// Tests adapted from: https://github.com/flying-sheep/babel-plugin-transform-react-createelement-to-jsx/blob/63137b6/test/index.js
+describe('restore-jsx', () => {
+ it('should trans to ', async () => {
+ expect(
+ await jsx(`import React__default, { PureComponent, Component, forwardRef, memo, createElement } from 'react';
+ React__default.createElement(foo)`)
+ ).toBeNull()
+ expect(
+ await jsx(`import React__default, { PureComponent, Component, forwardRef, memo, createElement } from 'react';
+ React__default.createElement("h1")`)
+ ).toMatch(`;`)
+ expect(
+ await jsx(`import React__default, { PureComponent, Component, forwardRef, memo, createElement } from 'react';
+ React__default.createElement(Foo)`)
+ ).toMatch(`
-
-
-
-
-
- ",
- ],
- "version": 3,
- }
- `)
- })
-
test('linked css', async () => {
const res = await page.request.get(
new URL('./linked.css', page.url()).href,
@@ -89,8 +29,22 @@ if (!isBuild) {
}
)
const css = await res.text()
- const lines = css.split('\n')
- expect(lines[lines.length - 1].includes('/*')).toBe(false) // expect no sourcemap
+ const map = extractSourcemap(css)
+ expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
+ {
+ "mappings": "AAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACT,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACb,CAAC;",
+ "sources": [
+ "/root/linked.css",
+ ],
+ "sourcesContent": [
+ ".linked {
+ color: red;
+ }
+ ",
+ ],
+ "version": 3,
+ }
+ `)
})
test('linked css with import', async () => {
@@ -105,13 +59,13 @@ if (!isBuild) {
const css = await res.text()
const map = extractSourcemap(css)
expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
- Object {
+ {
"mappings": "AAAA;EACE,UAAU;AACZ;;ACAA;EACE,UAAU;AACZ",
- "sources": Array [
+ "sources": [
"/root/be-imported.css",
"/root/linked-with-import.css",
],
- "sourcesContent": Array [
+ "sourcesContent": [
".be-imported {
color: red;
}
@@ -132,12 +86,12 @@ if (!isBuild) {
const css = await getStyleTagContentIncluding('.imported ')
const map = extractSourcemap(css)
expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
- Object {
+ {
"mappings": "AAAA,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACX,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACb,CAAC;",
- "sources": Array [
+ "sources": [
"/root/imported.css",
],
- "sourcesContent": Array [
+ "sourcesContent": [
".imported {
color: red;
}
@@ -152,13 +106,13 @@ if (!isBuild) {
const css = await getStyleTagContentIncluding('.imported-with-import ')
const map = extractSourcemap(css)
expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
- Object {
+ {
"mappings": "AAAA;EACE,UAAU;AACZ;;ACAA;EACE,UAAU;AACZ",
- "sources": Array [
+ "sources": [
"/root/be-imported.css",
"/root/imported-with-import.css",
],
- "sourcesContent": Array [
+ "sourcesContent": [
".be-imported {
color: red;
}
@@ -179,12 +133,12 @@ if (!isBuild) {
const css = await getStyleTagContentIncluding('.imported-sass ')
const map = extractSourcemap(css)
expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
- Object {
+ {
"mappings": "AACE;EACE",
- "sources": Array [
+ "sources": [
"/root/imported.sass",
],
- "sourcesContent": Array [
+ "sourcesContent": [
".imported
&-sass
color: red
@@ -199,12 +153,12 @@ if (!isBuild) {
const css = await getStyleTagContentIncluding('._imported-sass-module_')
const map = extractSourcemap(css)
expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
- Object {
+ {
"mappings": "AACE;EACE",
- "sources": Array [
+ "sources": [
"/root/imported.module.sass",
],
- "sourcesContent": Array [
+ "sourcesContent": [
".imported
&-sass-module
color: red
@@ -219,12 +173,12 @@ if (!isBuild) {
const css = await getStyleTagContentIncluding('.imported-less ')
const map = extractSourcemap(css)
expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
- Object {
+ {
"mappings": "AACE;EACE",
- "sources": Array [
+ "sources": [
"/root/imported.less",
],
- "sourcesContent": Array [
+ "sourcesContent": [
".imported {
&-less {
color: @color;
@@ -241,12 +195,12 @@ if (!isBuild) {
const css = await getStyleTagContentIncluding('.imported-stylus ')
const map = extractSourcemap(css)
expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(`
- Object {
+ {
"mappings": "AACE;EACE,cAAM",
- "sources": Array [
+ "sources": [
"/root/imported.styl",
],
- "sourcesContent": Array [
+ "sourcesContent": [
".imported
&-stylus
color blue-red-mixed
@@ -262,8 +216,4 @@ if (!isBuild) {
expect(log).not.toMatch(/Sourcemap for .+ points to missing source files/)
})
})
-} else {
- test('this file only includes test for serve', () => {
- expect(true).toBe(true)
- })
-}
+})
diff --git a/packages/playground/css-sourcemap/be-imported.css b/playground/css-sourcemap/be-imported.css
similarity index 100%
rename from packages/playground/css-sourcemap/be-imported.css
rename to playground/css-sourcemap/be-imported.css
diff --git a/packages/playground/css-sourcemap/imported-with-import.css b/playground/css-sourcemap/imported-with-import.css
similarity index 100%
rename from packages/playground/css-sourcemap/imported-with-import.css
rename to playground/css-sourcemap/imported-with-import.css
diff --git a/packages/playground/css-sourcemap/imported.css b/playground/css-sourcemap/imported.css
similarity index 100%
rename from packages/playground/css-sourcemap/imported.css
rename to playground/css-sourcemap/imported.css
diff --git a/packages/playground/css-sourcemap/imported.less b/playground/css-sourcemap/imported.less
similarity index 100%
rename from packages/playground/css-sourcemap/imported.less
rename to playground/css-sourcemap/imported.less
diff --git a/packages/playground/css-sourcemap/imported.module.sass b/playground/css-sourcemap/imported.module.sass
similarity index 100%
rename from packages/playground/css-sourcemap/imported.module.sass
rename to playground/css-sourcemap/imported.module.sass
diff --git a/packages/playground/css-sourcemap/imported.sass b/playground/css-sourcemap/imported.sass
similarity index 100%
rename from packages/playground/css-sourcemap/imported.sass
rename to playground/css-sourcemap/imported.sass
diff --git a/packages/playground/css-sourcemap/imported.styl b/playground/css-sourcemap/imported.styl
similarity index 100%
rename from packages/playground/css-sourcemap/imported.styl
rename to playground/css-sourcemap/imported.styl
diff --git a/packages/playground/css-sourcemap/index.html b/playground/css-sourcemap/index.html
similarity index 100%
rename from packages/playground/css-sourcemap/index.html
rename to playground/css-sourcemap/index.html
diff --git a/packages/playground/css-sourcemap/linked-with-import.css b/playground/css-sourcemap/linked-with-import.css
similarity index 100%
rename from packages/playground/css-sourcemap/linked-with-import.css
rename to playground/css-sourcemap/linked-with-import.css
diff --git a/packages/playground/css-sourcemap/linked.css b/playground/css-sourcemap/linked.css
similarity index 100%
rename from packages/playground/css-sourcemap/linked.css
rename to playground/css-sourcemap/linked.css
diff --git a/packages/playground/css-sourcemap/package.json b/playground/css-sourcemap/package.json
similarity index 67%
rename from packages/playground/css-sourcemap/package.json
rename to playground/css-sourcemap/package.json
index c7e9e61372cefa..6c0212efa74155 100644
--- a/packages/playground/css-sourcemap/package.json
+++ b/playground/css-sourcemap/package.json
@@ -5,13 +5,13 @@
"scripts": {
"dev": "vite",
"build": "vite build",
- "debug": "node --inspect-brk ../../vite/bin/vite",
+ "debug": "node --inspect-brk ../../packages/vite/bin/vite",
"preview": "vite preview"
},
"devDependencies": {
"less": "^4.1.2",
- "magic-string": "^0.25.7",
- "sass": "^1.43.4",
+ "magic-string": "^0.25.9",
+ "sass": "^1.51.0",
"stylus": "^0.55.0"
}
}
diff --git a/packages/playground/css-sourcemap/vite.config.js b/playground/css-sourcemap/vite.config.js
similarity index 100%
rename from packages/playground/css-sourcemap/vite.config.js
rename to playground/css-sourcemap/vite.config.js
diff --git a/packages/playground/css/__tests__/css.spec.ts b/playground/css/__tests__/css.spec.ts
similarity index 94%
rename from packages/playground/css/__tests__/css.spec.ts
rename to playground/css/__tests__/css.spec.ts
index 6ca00e760349b1..5341522900ddb1 100644
--- a/packages/playground/css/__tests__/css.spec.ts
+++ b/playground/css/__tests__/css.spec.ts
@@ -1,21 +1,24 @@
-import fs from 'fs'
-import path from 'path'
import {
editFile,
findAssetFile,
getBg,
getColor,
isBuild,
+ page,
removeFile,
- testDir,
+ serverLogs,
untilUpdated
-} from '../../testUtils'
+} from '~utils'
// note: tests should retrieve the element at the beginning of test and reuse it
// in later assertions to ensure CSS HMR doesn't reload the page
test('imported css', async () => {
const css = await page.textContent('.imported-css')
- expect(css).toContain('.imported {')
+ expect(css).toMatch(/\.imported ?{/)
+ if (isBuild) {
+ expect(css.trim()).not.toContain('\n') // check minified
+ }
+
const glob = await page.textContent('.imported-css-glob')
expect(glob).toContain('.dir-import')
const globEager = await page.textContent('.imported-css-globEager')
@@ -247,14 +250,12 @@ test('inline css modules', async () => {
expect(css).toMatch(/\.inline-module__apply-color-inline___[\w-]{5}/)
})
-if (isBuild) {
- test('@charset hoist', async () => {
- serverLogs.forEach((log) => {
- // no warning from esbuild css minifier
- expect(log).not.toMatch('"@charset" must be the first rule in the file')
- })
+test.runIf(isBuild)('@charset hoist', async () => {
+ serverLogs.forEach((log) => {
+ // no warning from esbuild css minifier
+ expect(log).not.toMatch('"@charset" must be the first rule in the file')
})
-}
+})
test('@import dependency w/ style entry', async () => {
expect(await getColor('.css-dep')).toBe('purple')
@@ -372,6 +373,10 @@ test('inlined-code', async () => {
// should resolve assets
expect(code).toContain('background:')
expect(code).not.toContain('__VITE_ASSET__')
+
+ if (isBuild) {
+ expect(code.trim()).not.toContain('\n') // check minified
+ }
})
test('minify css', async () => {
@@ -405,3 +410,13 @@ test("relative path rewritten in Less's data-uri", async () => {
/^url\("data:image\/svg\+xml,%3Csvg/
)
})
+
+test('PostCSS source.input.from includes query', async () => {
+ const code = await page.textContent('.postcss-source-input')
+ // should resolve assets
+ expect(code).toContain(
+ isBuild
+ ? '/postcss-source-input.css?used&query=foo'
+ : '/postcss-source-input.css?query=foo'
+ )
+})
diff --git a/packages/playground/css/__tests__/postcss-plugins-different-dir.spec.ts b/playground/css/__tests__/postcss-plugins-different-dir.spec.ts
similarity index 93%
rename from packages/playground/css/__tests__/postcss-plugins-different-dir.spec.ts
rename to playground/css/__tests__/postcss-plugins-different-dir.spec.ts
index 8bedc26ee354c8..55a6d8fe8dd130 100644
--- a/packages/playground/css/__tests__/postcss-plugins-different-dir.spec.ts
+++ b/playground/css/__tests__/postcss-plugins-different-dir.spec.ts
@@ -1,6 +1,6 @@
-import { getColor, getBgColor, ports } from '../../testUtils'
-import { createServer } from 'vite'
import path from 'path'
+import { createServer } from 'vite'
+import { getBgColor, getColor, page, ports } from '~utils'
// Regression test for https://github.com/vitejs/vite/issues/4000
test('postcss plugins in different dir', async () => {
diff --git a/packages/playground/css/async-treeshaken.css b/playground/css/async-treeshaken.css
similarity index 100%
rename from packages/playground/css/async-treeshaken.css
rename to playground/css/async-treeshaken.css
diff --git a/packages/playground/css/async-treeshaken.js b/playground/css/async-treeshaken.js
similarity index 100%
rename from packages/playground/css/async-treeshaken.js
rename to playground/css/async-treeshaken.js
diff --git a/packages/playground/css/async.css b/playground/css/async.css
similarity index 100%
rename from packages/playground/css/async.css
rename to playground/css/async.css
diff --git a/packages/playground/css/async.js b/playground/css/async.js
similarity index 100%
rename from packages/playground/css/async.js
rename to playground/css/async.js
diff --git a/packages/playground/css/charset.css b/playground/css/charset.css
similarity index 100%
rename from packages/playground/css/charset.css
rename to playground/css/charset.css
diff --git a/packages/playground/css/composed.module.css b/playground/css/composed.module.css
similarity index 100%
rename from packages/playground/css/composed.module.css
rename to playground/css/composed.module.css
diff --git a/packages/playground/css/composed.module.less b/playground/css/composed.module.less
similarity index 100%
rename from packages/playground/css/composed.module.less
rename to playground/css/composed.module.less
diff --git a/packages/playground/css/composed.module.scss b/playground/css/composed.module.scss
similarity index 100%
rename from packages/playground/css/composed.module.scss
rename to playground/css/composed.module.scss
diff --git a/packages/playground/css/composes-path-resolving.module.css b/playground/css/composes-path-resolving.module.css
similarity index 100%
rename from packages/playground/css/composes-path-resolving.module.css
rename to playground/css/composes-path-resolving.module.css
diff --git a/packages/playground/css/css-dep/index.css b/playground/css/css-dep/index.css
similarity index 100%
rename from packages/playground/css/css-dep/index.css
rename to playground/css/css-dep/index.css
diff --git a/packages/playground/css/css-dep/index.js b/playground/css/css-dep/index.js
similarity index 100%
rename from packages/playground/css/css-dep/index.js
rename to playground/css/css-dep/index.js
diff --git a/packages/playground/css/css-dep/index.scss b/playground/css/css-dep/index.scss
similarity index 100%
rename from packages/playground/css/css-dep/index.scss
rename to playground/css/css-dep/index.scss
diff --git a/packages/playground/css/css-dep/index.styl b/playground/css/css-dep/index.styl
similarity index 100%
rename from packages/playground/css/css-dep/index.styl
rename to playground/css/css-dep/index.styl
diff --git a/packages/playground/css/css-dep/package.json b/playground/css/css-dep/package.json
similarity index 100%
rename from packages/playground/css/css-dep/package.json
rename to playground/css/css-dep/package.json
diff --git a/packages/playground/css/dep.css b/playground/css/dep.css
similarity index 100%
rename from packages/playground/css/dep.css
rename to playground/css/dep.css
diff --git a/packages/playground/css/folder with space/ok.png b/playground/css/folder with space/ok.png
similarity index 100%
rename from packages/playground/css/folder with space/ok.png
rename to playground/css/folder with space/ok.png
diff --git a/packages/playground/css/folder with space/space.css b/playground/css/folder with space/space.css
similarity index 100%
rename from packages/playground/css/folder with space/space.css
rename to playground/css/folder with space/space.css
diff --git a/packages/playground/css/glob-dep.css b/playground/css/glob-dep.css
similarity index 100%
rename from packages/playground/css/glob-dep.css
rename to playground/css/glob-dep.css
diff --git a/packages/playground/css/glob-dep/bar.css b/playground/css/glob-dep/bar.css
similarity index 100%
rename from packages/playground/css/glob-dep/bar.css
rename to playground/css/glob-dep/bar.css
diff --git a/packages/playground/css/glob-dep/foo.css b/playground/css/glob-dep/foo.css
similarity index 100%
rename from packages/playground/css/glob-dep/foo.css
rename to playground/css/glob-dep/foo.css
diff --git a/packages/playground/css/glob-import/bar.css b/playground/css/glob-import/bar.css
similarity index 100%
rename from packages/playground/css/glob-import/bar.css
rename to playground/css/glob-import/bar.css
diff --git a/packages/playground/css/glob-import/foo.css b/playground/css/glob-import/foo.css
similarity index 100%
rename from packages/playground/css/glob-import/foo.css
rename to playground/css/glob-import/foo.css
diff --git a/packages/playground/css/imported-at-import.css b/playground/css/imported-at-import.css
similarity index 100%
rename from packages/playground/css/imported-at-import.css
rename to playground/css/imported-at-import.css
diff --git a/packages/playground/css/imported.css b/playground/css/imported.css
similarity index 100%
rename from packages/playground/css/imported.css
rename to playground/css/imported.css
diff --git a/packages/playground/css/index.html b/playground/css/index.html
similarity index 97%
rename from packages/playground/css/index.html
rename to playground/css/index.html
index fef6a0be393748..15e81192cec7f1 100644
--- a/packages/playground/css/index.html
+++ b/playground/css/index.html
@@ -135,6 +135,9 @@ CSS Sourcemap
- -<inline>
- -<linked>: no import
-<linked>: with import
- -<imported>: no import
-<imported>: with import
- -<imported sass>
-<imported sass> with module
- -<imported less> with string additionalData
- -<imported stylus>
-CSS
Raw Support
+ +PostCSS source.input.from. Should include query
+ diff --git a/packages/playground/css/inline.module.css b/playground/css/inline.module.css similarity index 100% rename from packages/playground/css/inline.module.css rename to playground/css/inline.module.css diff --git a/packages/playground/css/inlined.css b/playground/css/inlined.css similarity index 100% rename from packages/playground/css/inlined.css rename to playground/css/inlined.css diff --git a/packages/playground/css/less.less b/playground/css/less.less similarity index 100% rename from packages/playground/css/less.less rename to playground/css/less.less diff --git a/packages/playground/css/less/components/form.less b/playground/css/less/components/form.less similarity index 100% rename from packages/playground/css/less/components/form.less rename to playground/css/less/components/form.less diff --git a/packages/playground/css/less/images/backgrounds/form-select.svg b/playground/css/less/images/backgrounds/form-select.svg similarity index 100% rename from packages/playground/css/less/images/backgrounds/form-select.svg rename to playground/css/less/images/backgrounds/form-select.svg diff --git a/packages/playground/css/linked-at-import.css b/playground/css/linked-at-import.css similarity index 100% rename from packages/playground/css/linked-at-import.css rename to playground/css/linked-at-import.css diff --git a/packages/playground/css/linked.css b/playground/css/linked.css similarity index 100% rename from packages/playground/css/linked.css rename to playground/css/linked.css diff --git a/packages/playground/css/main.js b/playground/css/main.js similarity index 89% rename from packages/playground/css/main.js rename to playground/css/main.js index 0d03aafbf0ec7f..90f74c96793c55 100644 --- a/packages/playground/css/main.js +++ b/playground/css/main.js @@ -80,10 +80,15 @@ text('.inlined-code', inlined) // glob const glob = import.meta.glob('./glob-import/*.css') -Promise.all(Object.keys(glob).map((key) => glob[key]())).then((res) => { +Promise.all( + Object.keys(glob).map((key) => glob[key]().then((i) => i.default)) +).then((res) => { text('.imported-css-glob', JSON.stringify(res, null, 2)) }) // globEager -const globEager = import.meta.globEager('./glob-import/*.css') +const globEager = import.meta.glob('./glob-import/*.css', { eager: true }) text('.imported-css-globEager', JSON.stringify(globEager, null, 2)) + +import postcssSourceInput from './postcss-source-input.css?query=foo' +text('.postcss-source-input', postcssSourceInput) diff --git a/packages/playground/css/minify.css b/playground/css/minify.css similarity index 100% rename from packages/playground/css/minify.css rename to playground/css/minify.css diff --git a/packages/playground/css/mod.module.css b/playground/css/mod.module.css similarity index 100% rename from packages/playground/css/mod.module.css rename to playground/css/mod.module.css diff --git a/packages/playground/css/mod.module.scss b/playground/css/mod.module.scss similarity index 100% rename from packages/playground/css/mod.module.scss rename to playground/css/mod.module.scss diff --git a/packages/playground/css/nested/_index.scss b/playground/css/nested/_index.scss similarity index 100% rename from packages/playground/css/nested/_index.scss rename to playground/css/nested/_index.scss diff --git a/packages/playground/css/nested/_partial.scss b/playground/css/nested/_partial.scss similarity index 100% rename from packages/playground/css/nested/_partial.scss rename to playground/css/nested/_partial.scss diff --git a/packages/playground/css/nested/css-in-less-2.less b/playground/css/nested/css-in-less-2.less similarity index 100% rename from packages/playground/css/nested/css-in-less-2.less rename to playground/css/nested/css-in-less-2.less diff --git a/packages/playground/css/nested/css-in-less.css b/playground/css/nested/css-in-less.css similarity index 100% rename from packages/playground/css/nested/css-in-less.css rename to playground/css/nested/css-in-less.css diff --git a/packages/playground/css/nested/css-in-less.less b/playground/css/nested/css-in-less.less similarity index 100% rename from packages/playground/css/nested/css-in-less.less rename to playground/css/nested/css-in-less.less diff --git a/packages/playground/css/nested/css-in-scss.css b/playground/css/nested/css-in-scss.css similarity index 100% rename from packages/playground/css/nested/css-in-scss.css rename to playground/css/nested/css-in-scss.css diff --git a/packages/playground/css/nested/icon.png b/playground/css/nested/icon.png similarity index 100% rename from packages/playground/css/nested/icon.png rename to playground/css/nested/icon.png diff --git a/packages/playground/css/nested/nested.less b/playground/css/nested/nested.less similarity index 100% rename from packages/playground/css/nested/nested.less rename to playground/css/nested/nested.less diff --git a/packages/playground/css/nested/nested.styl b/playground/css/nested/nested.styl similarity index 100% rename from packages/playground/css/nested/nested.styl rename to playground/css/nested/nested.styl diff --git a/packages/playground/css/ok.png b/playground/css/ok.png similarity index 100% rename from packages/playground/css/ok.png rename to playground/css/ok.png diff --git a/packages/playground/css/options/absolute-import.styl b/playground/css/options/absolute-import.styl similarity index 100% rename from packages/playground/css/options/absolute-import.styl rename to playground/css/options/absolute-import.styl diff --git a/packages/playground/css/options/relative-import.styl b/playground/css/options/relative-import.styl similarity index 100% rename from packages/playground/css/options/relative-import.styl rename to playground/css/options/relative-import.styl diff --git a/packages/playground/css/package.json b/playground/css/package.json similarity index 79% rename from packages/playground/css/package.json rename to playground/css/package.json index b45063100be089..daaad66a9bb41f 100644 --- a/packages/playground/css/package.json +++ b/playground/css/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" }, "devDependencies": { @@ -13,7 +13,7 @@ "fast-glob": "^3.2.11", "less": "^4.1.2", "postcss-nested": "^5.0.6", - "sass": "^1.43.4", + "sass": "^1.51.0", "stylus": "^0.55.0" } } diff --git a/packages/playground/css/pkg-dep/_index.scss b/playground/css/pkg-dep/_index.scss similarity index 100% rename from packages/playground/css/pkg-dep/_index.scss rename to playground/css/pkg-dep/_index.scss diff --git a/packages/playground/css/pkg-dep/index.js b/playground/css/pkg-dep/index.js similarity index 100% rename from packages/playground/css/pkg-dep/index.js rename to playground/css/pkg-dep/index.js diff --git a/packages/playground/css/pkg-dep/package.json b/playground/css/pkg-dep/package.json similarity index 100% rename from packages/playground/css/pkg-dep/package.json rename to playground/css/pkg-dep/package.json diff --git a/packages/playground/css/postcss-caching/blue-app/imported.css b/playground/css/postcss-caching/blue-app/imported.css similarity index 100% rename from packages/playground/css/postcss-caching/blue-app/imported.css rename to playground/css/postcss-caching/blue-app/imported.css diff --git a/packages/playground/css/postcss-caching/blue-app/index.html b/playground/css/postcss-caching/blue-app/index.html similarity index 100% rename from packages/playground/css/postcss-caching/blue-app/index.html rename to playground/css/postcss-caching/blue-app/index.html diff --git a/packages/playground/css/postcss-caching/blue-app/main.js b/playground/css/postcss-caching/blue-app/main.js similarity index 100% rename from packages/playground/css/postcss-caching/blue-app/main.js rename to playground/css/postcss-caching/blue-app/main.js diff --git a/packages/playground/css/postcss-caching/blue-app/package.json b/playground/css/postcss-caching/blue-app/package.json similarity index 71% rename from packages/playground/css/postcss-caching/blue-app/package.json rename to playground/css/postcss-caching/blue-app/package.json index 34be8916bb2c9e..82ba64fadd44b4 100644 --- a/packages/playground/css/postcss-caching/blue-app/package.json +++ b/playground/css/postcss-caching/blue-app/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" } } diff --git a/packages/playground/css/postcss-caching/blue-app/postcss.config.js b/playground/css/postcss-caching/blue-app/postcss.config.js similarity index 100% rename from packages/playground/css/postcss-caching/blue-app/postcss.config.js rename to playground/css/postcss-caching/blue-app/postcss.config.js diff --git a/packages/playground/css/postcss-caching/css.spec.ts b/playground/css/postcss-caching/css.spec.ts similarity index 96% rename from packages/playground/css/postcss-caching/css.spec.ts rename to playground/css/postcss-caching/css.spec.ts index e8ba73154b6bc8..bbffdb618280e4 100644 --- a/packages/playground/css/postcss-caching/css.spec.ts +++ b/playground/css/postcss-caching/css.spec.ts @@ -1,4 +1,4 @@ -import { getColor, ports } from '../../testUtils' +import { getColor, page, ports } from '~utils' import { createServer } from 'vite' import path from 'path' diff --git a/packages/playground/css/postcss-caching/green-app/imported.css b/playground/css/postcss-caching/green-app/imported.css similarity index 100% rename from packages/playground/css/postcss-caching/green-app/imported.css rename to playground/css/postcss-caching/green-app/imported.css diff --git a/packages/playground/css/postcss-caching/green-app/index.html b/playground/css/postcss-caching/green-app/index.html similarity index 100% rename from packages/playground/css/postcss-caching/green-app/index.html rename to playground/css/postcss-caching/green-app/index.html diff --git a/packages/playground/css/postcss-caching/green-app/main.js b/playground/css/postcss-caching/green-app/main.js similarity index 100% rename from packages/playground/css/postcss-caching/green-app/main.js rename to playground/css/postcss-caching/green-app/main.js diff --git a/packages/playground/css/postcss-caching/green-app/package.json b/playground/css/postcss-caching/green-app/package.json similarity index 71% rename from packages/playground/css/postcss-caching/green-app/package.json rename to playground/css/postcss-caching/green-app/package.json index 947b30384a1a53..72bd0f45b8865f 100644 --- a/packages/playground/css/postcss-caching/green-app/package.json +++ b/playground/css/postcss-caching/green-app/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" } } diff --git a/packages/playground/css/postcss-caching/green-app/postcss.config.js b/playground/css/postcss-caching/green-app/postcss.config.js similarity index 100% rename from packages/playground/css/postcss-caching/green-app/postcss.config.js rename to playground/css/postcss-caching/green-app/postcss.config.js diff --git a/playground/css/postcss-source-input.css b/playground/css/postcss-source-input.css new file mode 100644 index 00000000000000..c6c3cb0c16dece --- /dev/null +++ b/playground/css/postcss-source-input.css @@ -0,0 +1 @@ +@source-input; diff --git a/packages/playground/css/postcss.config.js b/playground/css/postcss.config.js similarity index 68% rename from packages/playground/css/postcss.config.js rename to playground/css/postcss.config.js index f3d6ac9548b6a9..33058023541515 100644 --- a/packages/playground/css/postcss.config.js +++ b/playground/css/postcss.config.js @@ -1,5 +1,5 @@ module.exports = { - plugins: [require('postcss-nested'), testDirDep] + plugins: [require('postcss-nested'), testDirDep, testSourceInput] } const fs = require('fs') @@ -35,3 +35,20 @@ function testDirDep() { } } testDirDep.postcss = true + +function testSourceInput() { + return { + postcssPlugin: 'source-input', + AtRule(atRule) { + if (atRule.name === 'source-input') { + atRule.after( + `.source-input::before { content: ${JSON.stringify( + atRule.source.input.from + )}; }` + ) + atRule.remove() + } + } + } +} +testSourceInput.postcss = true diff --git a/packages/playground/css/raw-imported.css b/playground/css/raw-imported.css similarity index 100% rename from packages/playground/css/raw-imported.css rename to playground/css/raw-imported.css diff --git a/packages/playground/css/sass.scss b/playground/css/sass.scss similarity index 100% rename from packages/playground/css/sass.scss rename to playground/css/sass.scss diff --git a/packages/playground/css/stylus.styl b/playground/css/stylus.styl similarity index 100% rename from packages/playground/css/stylus.styl rename to playground/css/stylus.styl diff --git a/packages/playground/css/vite.config.js b/playground/css/vite.config.js similarity index 100% rename from packages/playground/css/vite.config.js rename to playground/css/vite.config.js diff --git a/playground/data-uri/__tests__/data-uri.spec.ts b/playground/data-uri/__tests__/data-uri.spec.ts new file mode 100644 index 00000000000000..4b7f3d6e1e471b --- /dev/null +++ b/playground/data-uri/__tests__/data-uri.spec.ts @@ -0,0 +1,14 @@ +import { findAssetFile, isBuild, page } from '~utils' + +test('plain', async () => { + expect(await page.textContent('.plain')).toBe('hi') +}) + +test('base64', async () => { + expect(await page.textContent('.base64')).toBe('hi') +}) + +test.runIf(isBuild)('should compile away the import for build', async () => { + const file = findAssetFile('index') + expect(file).not.toMatch('import') +}) diff --git a/packages/playground/data-uri/index.html b/playground/data-uri/index.html similarity index 100% rename from packages/playground/data-uri/index.html rename to playground/data-uri/index.html diff --git a/packages/playground/data-uri/package.json b/playground/data-uri/package.json similarity index 72% rename from packages/playground/data-uri/package.json rename to playground/data-uri/package.json index a07c9a2cd6a663..4d30ad97b9acbb 100644 --- a/packages/playground/data-uri/package.json +++ b/playground/data-uri/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" } } diff --git a/packages/playground/define/__tests__/define.spec.ts b/playground/define/__tests__/define.spec.ts similarity index 64% rename from packages/playground/define/__tests__/define.spec.ts rename to playground/define/__tests__/define.spec.ts index 709f7a935dc8c1..b2eb571734cc54 100644 --- a/packages/playground/define/__tests__/define.spec.ts +++ b/playground/define/__tests__/define.spec.ts @@ -1,10 +1,16 @@ +import viteConfig from '../vite.config' +import { page } from '~utils' + test('string', async () => { - const defines = require('../vite.config.js').define + const defines = viteConfig.define - expect(await page.textContent('.exp')).toBe(String(eval(defines.__EXP__))) + expect(await page.textContent('.exp')).toBe( + String(typeof eval(defines.__EXP__)) + ) expect(await page.textContent('.string')).toBe(JSON.parse(defines.__STRING__)) expect(await page.textContent('.number')).toBe(String(defines.__NUMBER__)) expect(await page.textContent('.boolean')).toBe(String(defines.__BOOLEAN__)) + expect(await page.textContent('.object')).toBe( JSON.stringify(defines.__OBJ__, null, 2) ) @@ -20,6 +26,14 @@ test('string', async () => { expect(await page.textContent('.spread-array')).toBe( JSON.stringify([...defines.__STRING__]) ) + expect(await page.textContent('.dollar-identifier')).toBe( + String(defines.$DOLLAR) + ) + expect(await page.textContent('.unicode-identifier')).toBe( + String(defines.ÖUNICODE_LETTERɵ) + ) + expect(await page.textContent('.no-identifier-substring')).toBe(String(true)) + expect(await page.textContent('.no-property')).toBe(String(true)) // html would't need to define replacement expect(await page.textContent('.exp-define')).toBe('__EXP__') expect(await page.textContent('.import-json')).toBe('__EXP__') diff --git a/packages/playground/define/data.json b/playground/define/data.json similarity index 100% rename from packages/playground/define/data.json rename to playground/define/data.json diff --git a/packages/playground/define/index.html b/playground/define/index.html similarity index 68% rename from packages/playground/define/index.html rename to playground/define/index.html index da78d192216b11..97a7b9902a1dcb 100644 --- a/packages/playground/define/index.html +++ b/playground/define/index.html @@ -9,12 +9,16 @@Define
process as property:
spread object:
spread array:
dollar identifier:
unicode identifier:
no property:
no identifier substring:
define variable in html: __EXP__
import json:
@@ -47,15 +49,11 @@ if (!isBuild) {
)
}
-
+
export default App
`
)
await untilUpdated(() => page.textContent('p'), 'Child state 1')
- })
-} else {
- test('dummy test to make jest happy', async () => {
- // Your test suite must contain at least one test.
- })
-}
+ }
+)
diff --git a/packages/playground/file-delete-restore/index.html b/playground/file-delete-restore/index.html
similarity index 100%
rename from packages/playground/file-delete-restore/index.html
rename to playground/file-delete-restore/index.html
diff --git a/packages/playground/file-delete-restore/package.json b/playground/file-delete-restore/package.json
similarity index 83%
rename from packages/playground/file-delete-restore/package.json
rename to playground/file-delete-restore/package.json
index 8f9caa3578f8bd..b9c511aacfa62e 100644
--- a/packages/playground/file-delete-restore/package.json
+++ b/playground/file-delete-restore/package.json
@@ -5,7 +5,7 @@
"scripts": {
"dev": "vite",
"build": "vite build",
- "debug": "node --inspect-brk ../../vite/bin/vite",
+ "debug": "node --inspect-brk ../../packages/vite/bin/vite",
"preview": "vite preview"
},
"dependencies": {
diff --git a/packages/playground/file-delete-restore/vite.config.js b/playground/file-delete-restore/vite.config.js
similarity index 100%
rename from packages/playground/file-delete-restore/vite.config.js
rename to playground/file-delete-restore/vite.config.js
diff --git a/playground/fs-serve/__tests__/fs-serve.spec.ts b/playground/fs-serve/__tests__/fs-serve.spec.ts
new file mode 100644
index 00000000000000..6a21a35404ebb7
--- /dev/null
+++ b/playground/fs-serve/__tests__/fs-serve.spec.ts
@@ -0,0 +1,66 @@
+import { isServe, page, viteTestUrl } from '~utils'
+
+const json = require('../safe.json')
+const stringified = JSON.stringify(json)
+
+describe.runIf(isServe)('main', () => {
+ beforeAll(async () => {
+ await page.goto(viteTestUrl + '/src/')
+ })
+
+ test('default import', async () => {
+ expect(await page.textContent('.full')).toBe(stringified)
+ })
+
+ test('named import', async () => {
+ expect(await page.textContent('.named')).toBe(json.msg)
+ })
+
+ test('safe fetch', async () => {
+ expect(await page.textContent('.safe-fetch')).toMatch('KEY=safe')
+ expect(await page.textContent('.safe-fetch-status')).toBe('200')
+ })
+
+ test('safe fetch with special characters', async () => {
+ expect(
+ await page.textContent('.safe-fetch-subdir-special-characters')
+ ).toMatch('KEY=safe')
+ expect(
+ await page.textContent('.safe-fetch-subdir-special-characters-status')
+ ).toBe('200')
+ })
+
+ test('unsafe fetch', async () => {
+ expect(await page.textContent('.unsafe-fetch')).toMatch('403 Restricted')
+ expect(await page.textContent('.unsafe-fetch-status')).toBe('403')
+ })
+
+ test('safe fs fetch', async () => {
+ expect(await page.textContent('.safe-fs-fetch')).toBe(stringified)
+ expect(await page.textContent('.safe-fs-fetch-status')).toBe('200')
+ })
+
+ test('safe fs fetch with special characters', async () => {
+ expect(await page.textContent('.safe-fs-fetch-special-characters')).toBe(
+ stringified
+ )
+ expect(await page.textContent('.safe-fs-fetch-status')).toBe('200')
+ })
+
+ test('unsafe fs fetch', async () => {
+ expect(await page.textContent('.unsafe-fs-fetch')).toBe('')
+ expect(await page.textContent('.unsafe-fs-fetch-status')).toBe('403')
+ })
+
+ test('nested entry', async () => {
+ expect(await page.textContent('.nested-entry')).toBe('foobar')
+ })
+
+ test('nested entry', async () => {
+ expect(await page.textContent('.nested-entry')).toBe('foobar')
+ })
+
+ test('denied', async () => {
+ expect(await page.textContent('.unsafe-dotenv')).toBe('404')
+ })
+})
diff --git a/packages/playground/fs-serve/entry.js b/playground/fs-serve/entry.js
similarity index 100%
rename from packages/playground/fs-serve/entry.js
rename to playground/fs-serve/entry.js
diff --git a/packages/playground/fs-serve/nested/foo.js b/playground/fs-serve/nested/foo.js
similarity index 100%
rename from packages/playground/fs-serve/nested/foo.js
rename to playground/fs-serve/nested/foo.js
diff --git a/packages/playground/fs-serve/package.json b/playground/fs-serve/package.json
similarity index 73%
rename from packages/playground/fs-serve/package.json
rename to playground/fs-serve/package.json
index 45497d2a3c5e8a..c50be06a8cb286 100644
--- a/packages/playground/fs-serve/package.json
+++ b/playground/fs-serve/package.json
@@ -5,7 +5,7 @@
"scripts": {
"dev": "vite root",
"build": "vite build root",
- "debug": "node --inspect-brk ../../vite/bin/vite",
+ "debug": "node --inspect-brk ../../packages/vite/bin/vite",
"preview": "vite preview"
}
}
diff --git a/packages/playground/fs-serve/root/src/.env b/playground/fs-serve/root/src/.env
similarity index 100%
rename from packages/playground/fs-serve/root/src/.env
rename to playground/fs-serve/root/src/.env
diff --git a/packages/playground/fs-serve/root/src/index.html b/playground/fs-serve/root/src/index.html
similarity index 100%
rename from packages/playground/fs-serve/root/src/index.html
rename to playground/fs-serve/root/src/index.html
diff --git a/packages/playground/fs-serve/root/src/safe.txt b/playground/fs-serve/root/src/safe.txt
similarity index 100%
rename from packages/playground/fs-serve/root/src/safe.txt
rename to playground/fs-serve/root/src/safe.txt
diff --git "a/packages/playground/fs-serve/root/src/special characters \303\245\303\244\303\266/safe.json" "b/playground/fs-serve/root/src/special characters \303\245\303\244\303\266/safe.json"
similarity index 100%
rename from "packages/playground/fs-serve/root/src/special characters \303\245\303\244\303\266/safe.json"
rename to "playground/fs-serve/root/src/special characters \303\245\303\244\303\266/safe.json"
diff --git "a/packages/playground/fs-serve/root/src/special characters \303\245\303\244\303\266/safe.txt" "b/playground/fs-serve/root/src/special characters \303\245\303\244\303\266/safe.txt"
similarity index 100%
rename from "packages/playground/fs-serve/root/src/special characters \303\245\303\244\303\266/safe.txt"
rename to "playground/fs-serve/root/src/special characters \303\245\303\244\303\266/safe.txt"
diff --git a/packages/playground/fs-serve/root/src/subdir/safe.txt b/playground/fs-serve/root/src/subdir/safe.txt
similarity index 100%
rename from packages/playground/fs-serve/root/src/subdir/safe.txt
rename to playground/fs-serve/root/src/subdir/safe.txt
diff --git a/packages/playground/fs-serve/root/unsafe.txt b/playground/fs-serve/root/unsafe.txt
similarity index 100%
rename from packages/playground/fs-serve/root/unsafe.txt
rename to playground/fs-serve/root/unsafe.txt
diff --git a/packages/playground/fs-serve/root/vite.config.js b/playground/fs-serve/root/vite.config.js
similarity index 100%
rename from packages/playground/fs-serve/root/vite.config.js
rename to playground/fs-serve/root/vite.config.js
diff --git a/packages/playground/fs-serve/safe.json b/playground/fs-serve/safe.json
similarity index 100%
rename from packages/playground/fs-serve/safe.json
rename to playground/fs-serve/safe.json
diff --git a/packages/playground/fs-serve/unsafe.json b/playground/fs-serve/unsafe.json
similarity index 100%
rename from packages/playground/fs-serve/unsafe.json
rename to playground/fs-serve/unsafe.json
diff --git a/packages/playground/glob-import/__tests__/glob-import.spec.ts b/playground/glob-import/__tests__/glob-import.spec.ts
similarity index 86%
rename from packages/playground/glob-import/__tests__/glob-import.spec.ts
rename to playground/glob-import/__tests__/glob-import.spec.ts
index ebdf6c0ab29193..70f7ec252280a9 100644
--- a/packages/playground/glob-import/__tests__/glob-import.spec.ts
+++ b/playground/glob-import/__tests__/glob-import.spec.ts
@@ -2,9 +2,10 @@ import {
addFile,
editFile,
isBuild,
+ page,
removeFile,
untilUpdated
-} from '../../testUtils'
+} from '~utils'
const filteredResult = {
'./alias.js': {
@@ -31,6 +32,12 @@ const json = isBuild
msg: 'baz'
}
+const globWithAlias = {
+ '/dir/alias.js': {
+ default: 'hi'
+ }
+}
+
const allResult = {
// JSON file should be properly transformed
'/dir/alias.js': {
@@ -40,14 +47,15 @@ const allResult = {
'/dir/foo.js': {
msg: 'foo'
},
- '/dir/index.js': {
- globWithAlias: {
- './alias.js': {
- default: 'hi'
+ '/dir/index.js': isBuild
+ ? {
+ modules: filteredResult,
+ globWithAlias
}
- },
- modules: filteredResult
- },
+ : {
+ globWithAlias,
+ modules: filteredResult
+ },
'/dir/nested/bar.js': {
modules: {
'../baz.json': json
@@ -67,7 +75,7 @@ const rawResult = {
}
const relativeRawResult = {
- '../glob-import/dir/baz.json': {
+ './dir/baz.json': {
msg: 'baz'
}
}
@@ -93,6 +101,12 @@ test('import relative glob raw', async () => {
)
})
+test('unassigned import processes', async () => {
+ expect(await page.textContent('.side-effect-result')).toBe(
+ 'Hello from side effect'
+ )
+})
+
if (!isBuild) {
test('hmr for adding/removing files', async () => {
addFile('dir/a.js', '')
diff --git a/packages/playground/glob-import/dir/alias.js b/playground/glob-import/dir/alias.js
similarity index 100%
rename from packages/playground/glob-import/dir/alias.js
rename to playground/glob-import/dir/alias.js
diff --git a/packages/playground/glob-import/dir/baz.json b/playground/glob-import/dir/baz.json
similarity index 100%
rename from packages/playground/glob-import/dir/baz.json
rename to playground/glob-import/dir/baz.json
diff --git a/packages/playground/glob-import/dir/foo.js b/playground/glob-import/dir/foo.js
similarity index 100%
rename from packages/playground/glob-import/dir/foo.js
rename to playground/glob-import/dir/foo.js
diff --git a/playground/glob-import/dir/index.js b/playground/glob-import/dir/index.js
new file mode 100644
index 00000000000000..ab298abed485b3
--- /dev/null
+++ b/playground/glob-import/dir/index.js
@@ -0,0 +1,4 @@
+const modules = import.meta.glob('./*.(js|ts)', { eager: true })
+const globWithAlias = import.meta.glob('@dir/al*.js', { eager: true })
+
+export { modules, globWithAlias }
diff --git a/playground/glob-import/dir/nested/bar.js b/playground/glob-import/dir/nested/bar.js
new file mode 100644
index 00000000000000..bb23a5a141de8e
--- /dev/null
+++ b/playground/glob-import/dir/nested/bar.js
@@ -0,0 +1,4 @@
+const modules = import.meta.glob('../*.json', { eager: true })
+
+export const msg = 'bar'
+export { modules }
diff --git a/packages/playground/glob-import/dir/node_modules/hoge.js b/playground/glob-import/dir/node_modules/hoge.js
similarity index 100%
rename from packages/playground/glob-import/dir/node_modules/hoge.js
rename to playground/glob-import/dir/node_modules/hoge.js
diff --git a/packages/playground/glob-import/index.html b/playground/glob-import/index.html
similarity index 75%
rename from packages/playground/glob-import/index.html
rename to playground/glob-import/index.html
index 64f456aeb4d6a2..6cff2aa0965c59 100644
--- a/packages/playground/glob-import/index.html
+++ b/playground/glob-import/index.html
@@ -2,6 +2,7 @@
+
+
+
diff --git a/packages/playground/glob-import/package.json b/playground/glob-import/package.json
similarity index 72%
rename from packages/playground/glob-import/package.json
rename to playground/glob-import/package.json
index 32abb932424757..2dd90e31b73b25 100644
--- a/packages/playground/glob-import/package.json
+++ b/playground/glob-import/package.json
@@ -5,7 +5,7 @@
"scripts": {
"dev": "vite",
"build": "vite build",
- "debug": "node --inspect-brk ../../vite/bin/vite",
+ "debug": "node --inspect-brk ../../packages/vite/bin/vite",
"preview": "vite preview"
}
}
diff --git a/playground/glob-import/side-effect/writedom.js b/playground/glob-import/side-effect/writedom.js
new file mode 100644
index 00000000000000..e2ab04ba7f5cbe
--- /dev/null
+++ b/playground/glob-import/side-effect/writedom.js
@@ -0,0 +1,4 @@
+/* global document */
+document &&
+ (document.querySelector('.side-effect-result').textContent =
+ 'Hello from side effect')
diff --git a/packages/playground/glob-import/vite.config.ts b/playground/glob-import/vite.config.ts
similarity index 100%
rename from packages/playground/glob-import/vite.config.ts
rename to playground/glob-import/vite.config.ts
diff --git a/packages/playground/hmr/__tests__/hmr.spec.ts b/playground/hmr/__tests__/hmr.spec.ts
similarity index 93%
rename from packages/playground/hmr/__tests__/hmr.spec.ts
rename to playground/hmr/__tests__/hmr.spec.ts
index 40b2bdf31b7956..d06fee31f110ea 100644
--- a/packages/playground/hmr/__tests__/hmr.spec.ts
+++ b/playground/hmr/__tests__/hmr.spec.ts
@@ -1,4 +1,12 @@
-import { isBuild, editFile, untilUpdated } from '../../testUtils'
+import {
+ browserLogs,
+ editFile,
+ getBg,
+ isBuild,
+ page,
+ untilUpdated,
+ viteTestUrl
+} from '~utils'
test('should render', async () => {
expect(await page.textContent('.app')).toBe('1')
@@ -195,6 +203,16 @@ if (!isBuild) {
expect(await btn.textContent()).toBe('Counter 1')
})
+ test('css in html hmr', async () => {
+ await page.goto(viteTestUrl)
+ expect(await getBg('.import-image')).toMatch('icon')
+ await page.goto(viteTestUrl + '/foo/')
+ expect(await getBg('.import-image')).toMatch('icon')
+ editFile('index.html', (code) => code.replace('url("./icon.png")', ''))
+ await page.waitForNavigation()
+ expect(await getBg('.import-image')).toMatch('')
+ })
+
test('HTML', async () => {
await page.goto(viteTestUrl + '/counter/index.html')
let btn = await page.$('button')
diff --git a/packages/playground/hmr/counter/dep.ts b/playground/hmr/counter/dep.ts
similarity index 100%
rename from packages/playground/hmr/counter/dep.ts
rename to playground/hmr/counter/dep.ts
diff --git a/packages/playground/hmr/counter/index.html b/playground/hmr/counter/index.html
similarity index 100%
rename from packages/playground/hmr/counter/index.html
rename to playground/hmr/counter/index.html
diff --git a/packages/playground/hmr/counter/index.ts b/playground/hmr/counter/index.ts
similarity index 100%
rename from packages/playground/hmr/counter/index.ts
rename to playground/hmr/counter/index.ts
diff --git a/packages/playground/hmr/customFile.js b/playground/hmr/customFile.js
similarity index 100%
rename from packages/playground/hmr/customFile.js
rename to playground/hmr/customFile.js
diff --git a/packages/playground/hmr/event.d.ts b/playground/hmr/event.d.ts
similarity index 100%
rename from packages/playground/hmr/event.d.ts
rename to playground/hmr/event.d.ts
diff --git a/packages/playground/hmr/global.css b/playground/hmr/global.css
similarity index 100%
rename from packages/playground/hmr/global.css
rename to playground/hmr/global.css
diff --git a/packages/playground/hmr/hmr.ts b/playground/hmr/hmr.ts
similarity index 100%
rename from packages/playground/hmr/hmr.ts
rename to playground/hmr/hmr.ts
diff --git a/packages/playground/hmr/hmrDep.js b/playground/hmr/hmrDep.js
similarity index 100%
rename from packages/playground/hmr/hmrDep.js
rename to playground/hmr/hmrDep.js
diff --git a/packages/playground/hmr/hmrNestedDep.js b/playground/hmr/hmrNestedDep.js
similarity index 100%
rename from packages/playground/hmr/hmrNestedDep.js
rename to playground/hmr/hmrNestedDep.js
diff --git a/packages/playground/vue/public/icon.png b/playground/hmr/icon.png
similarity index 100%
rename from packages/playground/vue/public/icon.png
rename to playground/hmr/icon.png
diff --git a/packages/playground/hmr/index.html b/playground/hmr/index.html
similarity index 64%
rename from packages/playground/hmr/index.html
rename to playground/hmr/index.html
index 0add7c26011a01..65a2ed381b027a 100644
--- a/packages/playground/hmr/index.html
+++ b/playground/hmr/index.html
@@ -1,5 +1,13 @@
+
@@ -8,3 +16,4 @@
+
diff --git a/packages/playground/hmr/package.json b/playground/hmr/package.json
similarity index 71%
rename from packages/playground/hmr/package.json
rename to playground/hmr/package.json
index fa3654bdbdca85..b797d181b17ece 100644
--- a/packages/playground/hmr/package.json
+++ b/playground/hmr/package.json
@@ -5,7 +5,7 @@
"scripts": {
"dev": "vite",
"build": "vite build",
- "debug": "node --inspect-brk ../../vite/bin/vite",
+ "debug": "node --inspect-brk ../../packages/vite/bin/vite",
"preview": "vite preview"
}
}
diff --git a/packages/playground/hmr/tsconfig.json b/playground/hmr/tsconfig.json
similarity index 67%
rename from packages/playground/hmr/tsconfig.json
rename to playground/hmr/tsconfig.json
index 41b16fdc65ec8c..e920e674091b5e 100644
--- a/packages/playground/hmr/tsconfig.json
+++ b/playground/hmr/tsconfig.json
@@ -1,6 +1,7 @@
{
+ "extends": "../tsconfig.json",
"include": ["."],
- "exclude": ["**/dist/**"],
+ "exclude": ["**/dist/**", "**/__tests__/**"],
"compilerOptions": {
"target": "es2019",
"module": "esnext",
@@ -10,6 +11,6 @@
"moduleResolution": "node",
"baseUrl": ".",
"jsx": "preserve",
- "types": ["vite/client", "jest", "node"]
+ "types": ["vite/client", "node"]
}
}
diff --git "a/packages/playground/hmr/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html" "b/playground/hmr/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html"
similarity index 100%
rename from "packages/playground/hmr/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html"
rename to "playground/hmr/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html"
diff --git a/packages/playground/hmr/vite.config.ts b/playground/hmr/vite.config.ts
similarity index 100%
rename from packages/playground/hmr/vite.config.ts
rename to playground/hmr/vite.config.ts
diff --git a/packages/playground/html/__tests__/html.spec.ts b/playground/html/__tests__/html.spec.ts
similarity index 80%
rename from packages/playground/html/__tests__/html.spec.ts
rename to playground/html/__tests__/html.spec.ts
index 834db1f6126cad..44372b324d5771 100644
--- a/packages/playground/html/__tests__/html.spec.ts
+++ b/playground/html/__tests__/html.spec.ts
@@ -1,4 +1,5 @@
-import { getColor, isBuild, editFile } from '../../testUtils'
+import { beforeAll, describe, expect, test } from 'vitest'
+import { editFile, getColor, isBuild, isServe, page, viteTestUrl } from '~utils'
function testPage(isNested: boolean) {
test('pre transform', async () => {
@@ -79,7 +80,6 @@ describe('main', () => {
describe('nested', () => {
beforeAll(async () => {
- // viteTestUrl is globally injected in scripts/jestPerTestSetup.ts
await page.goto(viteTestUrl + '/nested/')
})
@@ -88,17 +88,15 @@ describe('nested', () => {
describe('nested w/ query', () => {
beforeAll(async () => {
- // viteTestUrl is globally injected in scripts/jestPerTestSetup.ts
await page.goto(viteTestUrl + '/nested/index.html?v=1')
})
testPage(true)
})
-if (isBuild) {
+describe.runIf(isBuild)('build', () => {
describe('scriptAsync', () => {
beforeAll(async () => {
- // viteTestUrl is globally injected in scripts/jestPerTestSetup.ts
await page.goto(viteTestUrl + '/scriptAsync.html')
})
@@ -110,7 +108,6 @@ if (isBuild) {
describe('scriptMixed', () => {
beforeAll(async () => {
- // viteTestUrl is globally injected in scripts/jestPerTestSetup.ts
await page.goto(viteTestUrl + '/scriptMixed.html')
})
@@ -124,7 +121,6 @@ if (isBuild) {
// Ensure that the modulePreload polyfill is discarded in this case
beforeAll(async () => {
- // viteTestUrl is globally injected in scripts/jestPerTestSetup.ts
await page.goto(viteTestUrl + '/zeroJS.html')
})
@@ -164,11 +160,10 @@ if (isBuild) {
)
})
})
-}
+})
describe('noHead', () => {
beforeAll(async () => {
- // viteTestUrl is globally injected in scripts/jestPerTestSetup.ts
await page.goto(viteTestUrl + '/noHead.html')
})
@@ -183,7 +178,6 @@ describe('noHead', () => {
describe('noBody', () => {
beforeAll(async () => {
- // viteTestUrl is globally injected in scripts/jestPerTestSetup.ts
await page.goto(viteTestUrl + '/noBody.html')
})
@@ -211,28 +205,26 @@ describe('unicode path', () => {
})
})
-if (!isBuild) {
- describe('invalid', () => {
- test('should be 500 with overlay', async () => {
- const response = await page.goto(viteTestUrl + '/invalid.html')
- expect(response.status()).toBe(500)
+describe.runIf(isServe)('invalid', () => {
+ test('should be 500 with overlay', async () => {
+ const response = await page.goto(viteTestUrl + '/invalid.html')
+ expect(response.status()).toBe(500)
- const errorOverlay = await page.waitForSelector('vite-error-overlay')
- expect(errorOverlay).toBeTruthy()
+ const errorOverlay = await page.waitForSelector('vite-error-overlay')
+ expect(errorOverlay).toBeTruthy()
- const message = await errorOverlay.$$eval('.message-body', (m) => {
- return m[0].innerHTML
- })
- expect(message).toMatch(/^Unable to parse HTML/)
+ const message = await errorOverlay.$$eval('.message-body', (m) => {
+ return m[0].innerHTML
})
+ expect(message).toMatch(/^Unable to parse HTML/)
+ })
- test('should reload when fixed', async () => {
- const response = await page.goto(viteTestUrl + '/invalid.html')
- await editFile('invalid.html', (content) => {
- return content.replace(' Good')
- })
- const content = await page.waitForSelector('text=Good HTML')
- expect(content).toBeTruthy()
+ test('should reload when fixed', async () => {
+ await page.goto(viteTestUrl + '/invalid.html')
+ await editFile('invalid.html', (content) => {
+ return content.replace('
Good')
})
+ const content = await page.waitForSelector('text=Good HTML')
+ expect(content).toBeTruthy()
})
-}
+})
diff --git a/packages/playground/html/common.css b/playground/html/common.css
similarity index 100%
rename from packages/playground/html/common.css
rename to playground/html/common.css
diff --git a/packages/playground/html/emptyAttr.html b/playground/html/emptyAttr.html
similarity index 100%
rename from packages/playground/html/emptyAttr.html
rename to playground/html/emptyAttr.html
diff --git a/packages/playground/html/foo.html b/playground/html/foo.html
similarity index 100%
rename from packages/playground/html/foo.html
rename to playground/html/foo.html
diff --git a/packages/playground/html/index.html b/playground/html/index.html
similarity index 50%
rename from packages/playground/html/index.html
rename to playground/html/index.html
index 7320ff2b097db0..783cad93172f7a 100644
--- a/packages/playground/html/index.html
+++ b/playground/html/index.html
@@ -5,3 +5,6 @@
Hello
+ + + diff --git a/packages/playground/html/inline/common.js b/playground/html/inline/common.js similarity index 100% rename from packages/playground/html/inline/common.js rename to playground/html/inline/common.js diff --git a/packages/playground/html/inline/dep1.js b/playground/html/inline/dep1.js similarity index 100% rename from packages/playground/html/inline/dep1.js rename to playground/html/inline/dep1.js diff --git a/packages/playground/html/inline/dep2.js b/playground/html/inline/dep2.js similarity index 100% rename from packages/playground/html/inline/dep2.js rename to playground/html/inline/dep2.js diff --git a/packages/playground/html/inline/dep3.js b/playground/html/inline/dep3.js similarity index 100% rename from packages/playground/html/inline/dep3.js rename to playground/html/inline/dep3.js diff --git a/packages/playground/html/inline/module-graph.dot b/playground/html/inline/module-graph.dot similarity index 100% rename from packages/playground/html/inline/module-graph.dot rename to playground/html/inline/module-graph.dot diff --git a/packages/playground/html/inline/shared-1.html b/playground/html/inline/shared-1.html similarity index 100% rename from packages/playground/html/inline/shared-1.html rename to playground/html/inline/shared-1.html diff --git a/packages/playground/html/inline/shared-2.html b/playground/html/inline/shared-2.html similarity index 100% rename from packages/playground/html/inline/shared-2.html rename to playground/html/inline/shared-2.html diff --git a/packages/playground/html/inline/shared.js b/playground/html/inline/shared.js similarity index 100% rename from packages/playground/html/inline/shared.js rename to playground/html/inline/shared.js diff --git a/playground/html/inline/shared_a.html b/playground/html/inline/shared_a.html new file mode 100644 index 00000000000000..31fbd8fcc34bdf --- /dev/null +++ b/playground/html/inline/shared_a.html @@ -0,0 +1 @@ +inline a
diff --git a/packages/playground/html/inline/unique.html b/playground/html/inline/unique.html similarity index 100% rename from packages/playground/html/inline/unique.html rename to playground/html/inline/unique.html diff --git a/packages/playground/html/inline/unique.js b/playground/html/inline/unique.js similarity index 100% rename from packages/playground/html/inline/unique.js rename to playground/html/inline/unique.js diff --git a/packages/playground/html/invalid.html b/playground/html/invalid.html similarity index 100% rename from packages/playground/html/invalid.html rename to playground/html/invalid.html diff --git a/packages/playground/html/link.html b/playground/html/link.html similarity index 100% rename from packages/playground/html/link.html rename to playground/html/link.html diff --git a/packages/playground/html/main.css b/playground/html/main.css similarity index 100% rename from packages/playground/html/main.css rename to playground/html/main.css diff --git a/packages/playground/html/main.js b/playground/html/main.js similarity index 100% rename from packages/playground/html/main.js rename to playground/html/main.js diff --git a/packages/playground/html/nested/index.html b/playground/html/nested/index.html similarity index 100% rename from packages/playground/html/nested/index.html rename to playground/html/nested/index.html diff --git a/packages/playground/html/nested/nested.css b/playground/html/nested/nested.css similarity index 100% rename from packages/playground/html/nested/nested.css rename to playground/html/nested/nested.css diff --git a/packages/playground/html/nested/nested.js b/playground/html/nested/nested.js similarity index 100% rename from packages/playground/html/nested/nested.js rename to playground/html/nested/nested.js diff --git a/packages/playground/html/noBody.html b/playground/html/noBody.html similarity index 100% rename from packages/playground/html/noBody.html rename to playground/html/noBody.html diff --git a/packages/playground/html/noHead.html b/playground/html/noHead.html similarity index 100% rename from packages/playground/html/noHead.html rename to playground/html/noHead.html diff --git a/packages/playground/html/package.json b/playground/html/package.json similarity index 71% rename from packages/playground/html/package.json rename to playground/html/package.json index a101033f8d3470..6db0bd91981ce0 100644 --- a/packages/playground/html/package.json +++ b/playground/html/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" } } diff --git a/packages/playground/html/scriptAsync.html b/playground/html/scriptAsync.html similarity index 100% rename from packages/playground/html/scriptAsync.html rename to playground/html/scriptAsync.html diff --git a/packages/playground/html/scriptMixed.html b/playground/html/scriptMixed.html similarity index 100% rename from packages/playground/html/scriptMixed.html rename to playground/html/scriptMixed.html diff --git a/packages/playground/html/shared.js b/playground/html/shared.js similarity index 100% rename from packages/playground/html/shared.js rename to playground/html/shared.js diff --git "a/packages/playground/html/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html" "b/playground/html/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html" similarity index 100% rename from "packages/playground/html/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html" rename to "playground/html/unicode-path/\344\270\255\346\226\207-\343\201\253\343\201\273\343\202\223\343\201\224-\355\225\234\352\270\200-\360\237\214\225\360\237\214\226\360\237\214\227/index.html" diff --git a/packages/playground/html/vite.config.js b/playground/html/vite.config.js similarity index 98% rename from packages/playground/html/vite.config.js rename to playground/html/vite.config.js index 1703e02cc05366..bfe48675cbc18f 100644 --- a/packages/playground/html/vite.config.js +++ b/playground/html/vite.config.js @@ -17,6 +17,7 @@ module.exports = { zeroJS: resolve(__dirname, 'zeroJS.html'), noHead: resolve(__dirname, 'noHead.html'), noBody: resolve(__dirname, 'noBody.html'), + inlinea: resolve(__dirname, 'inline/shared_a.html'), inline1: resolve(__dirname, 'inline/shared-1.html'), inline2: resolve(__dirname, 'inline/shared-2.html'), inline3: resolve(__dirname, 'inline/unique.html'), diff --git a/packages/playground/html/zeroJS.html b/playground/html/zeroJS.html similarity index 100% rename from packages/playground/html/zeroJS.html rename to playground/html/zeroJS.html diff --git a/playground/js-sourcemap/__tests__/build.spec.ts b/playground/js-sourcemap/__tests__/build.spec.ts new file mode 100644 index 00000000000000..b30284731a76d9 --- /dev/null +++ b/playground/js-sourcemap/__tests__/build.spec.ts @@ -0,0 +1,7 @@ +import { isBuild, serverLogs } from '~utils' + +test.runIf(isBuild)('should not output sourcemap warning (#4939)', () => { + serverLogs.forEach((log) => { + expect(log).not.toMatch('Sourcemap is likely to be incorrect') + }) +}) diff --git a/packages/playground/js-sourcemap/__tests__/serve.spec.ts b/playground/js-sourcemap/__tests__/serve.spec.ts similarity index 91% rename from packages/playground/js-sourcemap/__tests__/serve.spec.ts rename to playground/js-sourcemap/__tests__/serve.spec.ts index a1ffdddc37ecd5..8f36f5f6f832f1 100644 --- a/packages/playground/js-sourcemap/__tests__/serve.spec.ts +++ b/playground/js-sourcemap/__tests__/serve.spec.ts @@ -2,8 +2,10 @@ import { URL } from 'url' import { extractSourcemap, formatSourcemapForSnapshot, - isBuild -} from 'testUtils' + isBuild, + page, + serverLogs +} from '~utils' if (!isBuild) { test('js', async () => { @@ -18,12 +20,12 @@ if (!isBuild) { const js = await res.text() const map = extractSourcemap(js) expect(formatSourcemapForSnapshot(map)).toMatchInlineSnapshot(` - Object { + { "mappings": "AAAO,aAAM,MAAM;", - "sources": Array [ + "sources": [ "/root/bar.ts", ], - "sourcesContent": Array [ + "sourcesContent": [ "export const bar = 'bar' ", ], diff --git a/packages/playground/js-sourcemap/bar.ts b/playground/js-sourcemap/bar.ts similarity index 100% rename from packages/playground/js-sourcemap/bar.ts rename to playground/js-sourcemap/bar.ts diff --git a/packages/playground/js-sourcemap/foo.js b/playground/js-sourcemap/foo.js similarity index 100% rename from packages/playground/js-sourcemap/foo.js rename to playground/js-sourcemap/foo.js diff --git a/packages/playground/js-sourcemap/index.html b/playground/js-sourcemap/index.html similarity index 100% rename from packages/playground/js-sourcemap/index.html rename to playground/js-sourcemap/index.html diff --git a/packages/playground/js-sourcemap/package.json b/playground/js-sourcemap/package.json similarity index 72% rename from packages/playground/js-sourcemap/package.json rename to playground/js-sourcemap/package.json index e5a97aea80830f..92b166d2f302c2 100644 --- a/packages/playground/js-sourcemap/package.json +++ b/playground/js-sourcemap/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" } } diff --git a/packages/playground/js-sourcemap/vite.config.js b/playground/js-sourcemap/vite.config.js similarity index 100% rename from packages/playground/js-sourcemap/vite.config.js rename to playground/js-sourcemap/vite.config.js diff --git a/packages/playground/json/__tests__/json.spec.ts b/playground/json/__tests__/json.spec.ts similarity index 96% rename from packages/playground/json/__tests__/json.spec.ts rename to playground/json/__tests__/json.spec.ts index 2897ee22332e44..8c64d619361bfb 100644 --- a/packages/playground/json/__tests__/json.spec.ts +++ b/playground/json/__tests__/json.spec.ts @@ -1,7 +1,7 @@ -import { isBuild } from '../../testUtils' +import { isBuild, page } from '~utils' -const json = require('../test.json') const deepJson = require('vue/package.json') +const json = require('../test.json') const stringified = JSON.stringify(json) const deepStringified = JSON.stringify(deepJson) diff --git a/packages/playground/json/index.html b/playground/json/index.html similarity index 100% rename from packages/playground/json/index.html rename to playground/json/index.html diff --git a/packages/playground/json/json-module/index.json b/playground/json/json-module/index.json similarity index 100% rename from packages/playground/json/json-module/index.json rename to playground/json/json-module/index.json diff --git a/packages/playground/json/json-module/package.json b/playground/json/json-module/package.json similarity index 100% rename from packages/playground/json/json-module/package.json rename to playground/json/json-module/package.json diff --git a/playground/json/package.json b/playground/json/package.json new file mode 100644 index 00000000000000..b919c42eb6ef5d --- /dev/null +++ b/playground/json/package.json @@ -0,0 +1,20 @@ +{ + "name": "test-json", + "private": true, + "version": "0.0.0", + "scripts": { + "dev": "vite", + "build": "vite build", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", + "preview": "vite preview", + "dev:ssr": "node server", + "serve:ssr": "cross-env NODE_ENV=production node server", + "debug:ssr": "node --inspect-brk server" + }, + "devDependencies": { + "cross-env": "^7.0.3", + "express": "^4.17.1", + "json-module": "file:./json-module", + "vue": "^3.2.33" + } +} diff --git a/packages/playground/json/public/public.json b/playground/json/public/public.json similarity index 100% rename from packages/playground/json/public/public.json rename to playground/json/public/public.json diff --git a/packages/playground/json/test.json b/playground/json/test.json similarity index 100% rename from packages/playground/json/test.json rename to playground/json/test.json diff --git a/packages/playground/legacy/__tests__/legacy.spec.ts b/playground/legacy/__tests__/legacy.spec.ts similarity index 82% rename from packages/playground/legacy/__tests__/legacy.spec.ts rename to playground/legacy/__tests__/legacy.spec.ts index 65bd39ff32b1d1..b21f42afcbd7ed 100644 --- a/packages/playground/legacy/__tests__/legacy.spec.ts +++ b/playground/legacy/__tests__/legacy.spec.ts @@ -1,11 +1,12 @@ import { - listAssets, findAssetFile, + getColor, isBuild, + listAssets, + page, readManifest, - untilUpdated, - getColor -} from '../../testUtils' + untilUpdated +} from '~utils' test('should work', async () => { expect(await page.textContent('#app')).toMatch('Hello') @@ -56,12 +57,23 @@ test('correctly emits styles', async () => { expect(await getColor('#app')).toBe('red') }) -if (isBuild) { +// dynamic import css +test('should load dynamic import with css', async () => { + await page.click('#dynamic-css-button') + await untilUpdated( + () => + page.$eval('#dynamic-css', (node) => window.getComputedStyle(node).color), + 'rgb(255, 0, 0)', + true + ) +}) + +describe.runIf(isBuild)('build', () => { test('should generate correct manifest', async () => { const manifest = readManifest() - expect(manifest['../../../vite/legacy-polyfills']).toBeDefined() - expect(manifest['../../../vite/legacy-polyfills'].src).toBe( - '../../../vite/legacy-polyfills' + expect(manifest['../../vite/legacy-polyfills']).toBeDefined() + expect(manifest['../../vite/legacy-polyfills'].src).toBe( + '../../vite/legacy-polyfills' ) }) @@ -87,4 +99,4 @@ if (isBuild) { test('includes structuredClone polyfill which is supported after core-js v3', () => { expect(findAssetFile(/polyfills-legacy/)).toMatch('"structuredClone"') }) -} +}) diff --git a/packages/playground/legacy/__tests__/ssr/legacy-ssr.spec.ts b/playground/legacy/__tests__/ssr/legacy-ssr.spec.ts similarity index 65% rename from packages/playground/legacy/__tests__/ssr/legacy-ssr.spec.ts rename to playground/legacy/__tests__/ssr/legacy-ssr.spec.ts index dad9b94d83509e..b5cfe82cd93910 100644 --- a/packages/playground/legacy/__tests__/ssr/legacy-ssr.spec.ts +++ b/playground/legacy/__tests__/ssr/legacy-ssr.spec.ts @@ -1,9 +1,9 @@ -import { isBuild } from '../../../testUtils' import { port } from './serve' +import { isBuild, page } from '~utils' const url = `http://localhost:${port}` -if (isBuild) { +describe.runIf(isBuild)('legacy-ssr', () => { test('should work', async () => { await page.goto(url) expect(await page.textContent('#app')).toMatch('Hello') @@ -13,8 +13,4 @@ if (isBuild) { // SSR build is always modern expect(await page.textContent('#env')).toMatch('false') }) -} else { - // this test doesn't support serve mode - // must contain at least one test - test('should work', () => void 0) -} +}) diff --git a/packages/playground/legacy/__tests__/ssr/serve.js b/playground/legacy/__tests__/ssr/serve.ts similarity index 72% rename from packages/playground/legacy/__tests__/ssr/serve.js rename to playground/legacy/__tests__/ssr/serve.ts index c7ef2ed3520e53..ec16b39e550965 100644 --- a/packages/playground/legacy/__tests__/ssr/serve.js +++ b/playground/legacy/__tests__/ssr/serve.ts @@ -1,16 +1,11 @@ -// @ts-check -// this is automtically detected by scripts/jestPerTestSetup.ts and will replace +// this is automatically detected by playground/vitestSetup.ts and will replace // the default e2e test serve behavior -const path = require('path') -const { ports } = require('../../../testUtils') +import path from 'path' +import { ports } from '~utils' -const port = (exports.port = ports['legacy/ssr']) +export const port = ports['legacy/ssr'] -/** - * @param {string} root - * @param {boolean} _isProd - */ -exports.serve = async function serve(root, _isProd) { +export async function serve(root: string, _isProd: boolean) { const { build } = require('vite') await build({ root, diff --git a/packages/playground/legacy/async.js b/playground/legacy/async.js similarity index 100% rename from packages/playground/legacy/async.js rename to playground/legacy/async.js diff --git a/playground/legacy/dynamic.css b/playground/legacy/dynamic.css new file mode 100644 index 00000000000000..160ee45a8a850a --- /dev/null +++ b/playground/legacy/dynamic.css @@ -0,0 +1,3 @@ +#dynamic-css { + color: red; +} diff --git a/packages/playground/legacy/entry-server.js b/playground/legacy/entry-server.js similarity index 100% rename from packages/playground/legacy/entry-server.js rename to playground/legacy/entry-server.js diff --git a/packages/playground/legacy/immutable-chunk.js b/playground/legacy/immutable-chunk.js similarity index 100% rename from packages/playground/legacy/immutable-chunk.js rename to playground/legacy/immutable-chunk.js diff --git a/packages/playground/legacy/index.html b/playground/legacy/index.html similarity index 72% rename from packages/playground/legacy/index.html rename to playground/legacy/index.html index d481766463cd4f..cbf6242fad756b 100644 --- a/packages/playground/legacy/index.html +++ b/playground/legacy/index.html @@ -4,4 +4,6 @@ + + diff --git a/packages/playground/legacy/main.js b/playground/legacy/main.js similarity index 84% rename from packages/playground/legacy/main.js rename to playground/legacy/main.js index 31579b4717810d..157b6c8448e9c3 100644 --- a/packages/playground/legacy/main.js +++ b/playground/legacy/main.js @@ -42,6 +42,14 @@ import('./immutable-chunk.js') text('#assets', assets.join('\n')) }) +// dynamic css +document + .querySelector('#dynamic-css-button') + .addEventListener('click', async () => { + await import('./dynamic.css') + text('#dynamic-css', 'dynamic import css') + }) + function text(el, text) { document.querySelector(el).textContent = text } diff --git a/packages/playground/legacy/package.json b/playground/legacy/package.json similarity index 65% rename from packages/playground/legacy/package.json rename to playground/legacy/package.json index 3a3315c42aa832..4f11c234573f40 100644 --- a/packages/playground/legacy/package.json +++ b/playground/legacy/package.json @@ -6,11 +6,12 @@ "dev": "vite", "build": "vite build --debug legacy", "build:custom-filename": "vite --config ./vite.config-custom-filename.js build --debug legacy", - "debug": "node --inspect-brk ../../vite/bin/vite", + "build:dynamic-css": "vite --config ./vite.config-dynamic-css.js build --debug legacy", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" }, "devDependencies": { "@vitejs/plugin-legacy": "workspace:*", - "express": "^4.17.1" + "express": "^4.18.1" } } diff --git a/packages/playground/legacy/style.css b/playground/legacy/style.css similarity index 100% rename from packages/playground/legacy/style.css rename to playground/legacy/style.css diff --git a/packages/playground/legacy/vite.config-custom-filename.js b/playground/legacy/vite.config-custom-filename.js similarity index 100% rename from packages/playground/legacy/vite.config-custom-filename.js rename to playground/legacy/vite.config-custom-filename.js diff --git a/playground/legacy/vite.config-dynamic-css.js b/playground/legacy/vite.config-dynamic-css.js new file mode 100644 index 00000000000000..10565768ac4d49 --- /dev/null +++ b/playground/legacy/vite.config-dynamic-css.js @@ -0,0 +1,39 @@ +const fs = require('fs') +const path = require('path') +const legacy = require('@vitejs/plugin-legacy').default + +module.exports = { + plugins: [ + legacy({ + targets: 'IE 11' + }) + ], + + build: { + cssCodeSplit: true, + manifest: true, + rollupOptions: { + output: { + chunkFileNames(chunkInfo) { + if (chunkInfo.name === 'immutable-chunk') { + return `assets/${chunkInfo.name}.js` + } + + return `assets/chunk-[name].[hash].js` + } + } + } + }, + + // special test only hook + // for tests, remove ` diff --git a/packages/playground/lib/index.html b/playground/lib/index.html similarity index 100% rename from packages/playground/lib/index.html rename to playground/lib/index.html diff --git a/packages/playground/lib/package.json b/playground/lib/package.json similarity index 72% rename from packages/playground/lib/package.json rename to playground/lib/package.json index 2c3ae4be3d4bcb..66b827b7c84179 100644 --- a/packages/playground/lib/package.json +++ b/playground/lib/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" } } diff --git a/playground/lib/src/dynamic.css b/playground/lib/src/dynamic.css new file mode 100644 index 00000000000000..4378c8d328cfbe --- /dev/null +++ b/playground/lib/src/dynamic.css @@ -0,0 +1,4 @@ +@import 'https://cdn.jsdelivr.net/npm/@mdi/font@5.9.55/css/materialdesignicons.min.css'; +.dynamic { + color: red; +} diff --git a/playground/lib/src/index.css b/playground/lib/src/index.css new file mode 100644 index 00000000000000..b0bd670bd9ecad --- /dev/null +++ b/playground/lib/src/index.css @@ -0,0 +1,3 @@ +.index { + color: blue; +} diff --git a/playground/lib/src/main.js b/playground/lib/src/main.js new file mode 100644 index 00000000000000..cb2fb3b842dc4f --- /dev/null +++ b/playground/lib/src/main.js @@ -0,0 +1,6 @@ +export default function myLib(sel) { + // Force esbuild spread helpers (https://github.com/evanw/esbuild/issues/951) + console.log({ ...'foo' }) + + document.querySelector(sel).textContent = 'It works' +} diff --git a/packages/playground/lib/src/main2.js b/playground/lib/src/main2.js similarity index 73% rename from packages/playground/lib/src/main2.js rename to playground/lib/src/main2.js index 0c729fad8d165c..f19a16bb128949 100644 --- a/packages/playground/lib/src/main2.js +++ b/playground/lib/src/main2.js @@ -1,4 +1,9 @@ +import './index.css' + export default async function message(sel) { const message = await import('./message.js') + + await import('./dynamic.css') + document.querySelector(sel).textContent = message.default } diff --git a/packages/playground/lib/src/message.js b/playground/lib/src/message.js similarity index 100% rename from packages/playground/lib/src/message.js rename to playground/lib/src/message.js diff --git a/packages/playground/lib/vite.config.js b/playground/lib/vite.config.js similarity index 89% rename from packages/playground/lib/vite.config.js rename to playground/lib/vite.config.js index 50cd188b1a40cc..72c040d38d6dcf 100644 --- a/packages/playground/lib/vite.config.js +++ b/playground/lib/vite.config.js @@ -10,7 +10,7 @@ module.exports = { entry: path.resolve(__dirname, 'src/main.js'), name: 'MyLib', formats: ['es', 'umd', 'iife'], - fileName: (format) => `my-lib-custom-filename.${format}.js` + fileName: 'my-lib-custom-filename' } }, plugins: [ diff --git a/packages/playground/lib/vite.dyimport.config.js b/playground/lib/vite.dyimport.config.js similarity index 94% rename from packages/playground/lib/vite.dyimport.config.js rename to playground/lib/vite.dyimport.config.js index 76311f4b8ba138..d738503f0c9d09 100644 --- a/packages/playground/lib/vite.dyimport.config.js +++ b/playground/lib/vite.dyimport.config.js @@ -6,7 +6,6 @@ const path = require('path') */ module.exports = { build: { - minify: false, lib: { entry: path.resolve(__dirname, 'src/main2.js'), formats: ['es'], diff --git a/packages/playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts b/playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts similarity index 84% rename from packages/playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts rename to playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts index 56c0b46c8a3e6f..e61c2187556f08 100644 --- a/packages/playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts +++ b/playground/multiple-entrypoints/__tests__/multiple-entrypoints.spec.ts @@ -1,4 +1,4 @@ -import { getColor, untilUpdated } from '../../testUtils' +import { getColor, page, untilUpdated } from '~utils' test('should have css applied on second dynamic import', async () => { await untilUpdated(() => page.textContent('.content'), 'Initial', true) diff --git a/packages/playground/multiple-entrypoints/deps.json b/playground/multiple-entrypoints/deps.json similarity index 100% rename from packages/playground/multiple-entrypoints/deps.json rename to playground/multiple-entrypoints/deps.json diff --git a/packages/playground/multiple-entrypoints/dynamic-a.js b/playground/multiple-entrypoints/dynamic-a.js similarity index 100% rename from packages/playground/multiple-entrypoints/dynamic-a.js rename to playground/multiple-entrypoints/dynamic-a.js diff --git a/packages/playground/multiple-entrypoints/dynamic-b.js b/playground/multiple-entrypoints/dynamic-b.js similarity index 100% rename from packages/playground/multiple-entrypoints/dynamic-b.js rename to playground/multiple-entrypoints/dynamic-b.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a0.js b/playground/multiple-entrypoints/entrypoints/a0.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a0.js rename to playground/multiple-entrypoints/entrypoints/a0.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a1.js b/playground/multiple-entrypoints/entrypoints/a1.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a1.js rename to playground/multiple-entrypoints/entrypoints/a1.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a10.js b/playground/multiple-entrypoints/entrypoints/a10.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a10.js rename to playground/multiple-entrypoints/entrypoints/a10.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a11.js b/playground/multiple-entrypoints/entrypoints/a11.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a11.js rename to playground/multiple-entrypoints/entrypoints/a11.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a12.js b/playground/multiple-entrypoints/entrypoints/a12.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a12.js rename to playground/multiple-entrypoints/entrypoints/a12.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a13.js b/playground/multiple-entrypoints/entrypoints/a13.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a13.js rename to playground/multiple-entrypoints/entrypoints/a13.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a14.js b/playground/multiple-entrypoints/entrypoints/a14.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a14.js rename to playground/multiple-entrypoints/entrypoints/a14.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a15.js b/playground/multiple-entrypoints/entrypoints/a15.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a15.js rename to playground/multiple-entrypoints/entrypoints/a15.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a16.js b/playground/multiple-entrypoints/entrypoints/a16.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a16.js rename to playground/multiple-entrypoints/entrypoints/a16.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a17.js b/playground/multiple-entrypoints/entrypoints/a17.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a17.js rename to playground/multiple-entrypoints/entrypoints/a17.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a18.js b/playground/multiple-entrypoints/entrypoints/a18.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a18.js rename to playground/multiple-entrypoints/entrypoints/a18.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a19.js b/playground/multiple-entrypoints/entrypoints/a19.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a19.js rename to playground/multiple-entrypoints/entrypoints/a19.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a2.js b/playground/multiple-entrypoints/entrypoints/a2.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a2.js rename to playground/multiple-entrypoints/entrypoints/a2.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a20.js b/playground/multiple-entrypoints/entrypoints/a20.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a20.js rename to playground/multiple-entrypoints/entrypoints/a20.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a21.js b/playground/multiple-entrypoints/entrypoints/a21.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a21.js rename to playground/multiple-entrypoints/entrypoints/a21.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a22.js b/playground/multiple-entrypoints/entrypoints/a22.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a22.js rename to playground/multiple-entrypoints/entrypoints/a22.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a23.js b/playground/multiple-entrypoints/entrypoints/a23.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a23.js rename to playground/multiple-entrypoints/entrypoints/a23.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a24.js b/playground/multiple-entrypoints/entrypoints/a24.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a24.js rename to playground/multiple-entrypoints/entrypoints/a24.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a3.js b/playground/multiple-entrypoints/entrypoints/a3.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a3.js rename to playground/multiple-entrypoints/entrypoints/a3.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a4.js b/playground/multiple-entrypoints/entrypoints/a4.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a4.js rename to playground/multiple-entrypoints/entrypoints/a4.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a5.js b/playground/multiple-entrypoints/entrypoints/a5.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a5.js rename to playground/multiple-entrypoints/entrypoints/a5.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a6.js b/playground/multiple-entrypoints/entrypoints/a6.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a6.js rename to playground/multiple-entrypoints/entrypoints/a6.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a7.js b/playground/multiple-entrypoints/entrypoints/a7.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a7.js rename to playground/multiple-entrypoints/entrypoints/a7.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a8.js b/playground/multiple-entrypoints/entrypoints/a8.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a8.js rename to playground/multiple-entrypoints/entrypoints/a8.js diff --git a/packages/playground/multiple-entrypoints/entrypoints/a9.js b/playground/multiple-entrypoints/entrypoints/a9.js similarity index 100% rename from packages/playground/multiple-entrypoints/entrypoints/a9.js rename to playground/multiple-entrypoints/entrypoints/a9.js diff --git a/packages/playground/multiple-entrypoints/index.html b/playground/multiple-entrypoints/index.html similarity index 100% rename from packages/playground/multiple-entrypoints/index.html rename to playground/multiple-entrypoints/index.html diff --git a/packages/playground/multiple-entrypoints/index.js b/playground/multiple-entrypoints/index.js similarity index 100% rename from packages/playground/multiple-entrypoints/index.js rename to playground/multiple-entrypoints/index.js diff --git a/packages/playground/multiple-entrypoints/package.json b/playground/multiple-entrypoints/package.json similarity index 72% rename from packages/playground/multiple-entrypoints/package.json rename to playground/multiple-entrypoints/package.json index 6c338a64518ddb..07818337be7bba 100644 --- a/packages/playground/multiple-entrypoints/package.json +++ b/playground/multiple-entrypoints/package.json @@ -5,11 +5,11 @@ "scripts": { "dev": "vite", "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" }, "devDependencies": { "fast-glob": "^3.2.11", - "sass": "^1.43.4" + "sass": "^1.51.0" } } diff --git a/packages/playground/multiple-entrypoints/reference.js b/playground/multiple-entrypoints/reference.js similarity index 100% rename from packages/playground/multiple-entrypoints/reference.js rename to playground/multiple-entrypoints/reference.js diff --git a/packages/playground/multiple-entrypoints/reference.scss b/playground/multiple-entrypoints/reference.scss similarity index 100% rename from packages/playground/multiple-entrypoints/reference.scss rename to playground/multiple-entrypoints/reference.scss diff --git a/packages/playground/multiple-entrypoints/vite.config.js b/playground/multiple-entrypoints/vite.config.js similarity index 100% rename from packages/playground/multiple-entrypoints/vite.config.js rename to playground/multiple-entrypoints/vite.config.js diff --git a/packages/playground/nested-deps/__tests__/nested-deps.spec.ts b/playground/nested-deps/__tests__/nested-deps.spec.ts similarity index 94% rename from packages/playground/nested-deps/__tests__/nested-deps.spec.ts rename to playground/nested-deps/__tests__/nested-deps.spec.ts index 2ef0e191da7b50..e4adb68792d116 100644 --- a/packages/playground/nested-deps/__tests__/nested-deps.spec.ts +++ b/playground/nested-deps/__tests__/nested-deps.spec.ts @@ -1,3 +1,5 @@ +import { page } from '~utils' + test('handle nested package', async () => { expect(await page.textContent('.a')).toBe('A@2.0.0') expect(await page.textContent('.b')).toBe('B@1.0.0') diff --git a/packages/playground/nested-deps/index.html b/playground/nested-deps/index.html similarity index 100% rename from packages/playground/nested-deps/index.html rename to playground/nested-deps/index.html diff --git a/packages/playground/nested-deps/package.json b/playground/nested-deps/package.json similarity index 87% rename from packages/playground/nested-deps/package.json rename to playground/nested-deps/package.json index d7450d0545fcb4..cbfcfe44df551b 100644 --- a/packages/playground/nested-deps/package.json +++ b/playground/nested-deps/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "vite", "build": "vite build", - "debug": "node --inspect-brk ../../vite/bin/vite", + "debug": "node --inspect-brk ../../packages/vite/bin/vite", "preview": "vite preview" }, "dependencies": { diff --git a/packages/playground/nested-deps/test-package-a/index.js b/playground/nested-deps/test-package-a/index.js similarity index 100% rename from packages/playground/nested-deps/test-package-a/index.js rename to playground/nested-deps/test-package-a/index.js diff --git a/packages/playground/nested-deps/test-package-a/package.json b/playground/nested-deps/test-package-a/package.json similarity index 100% rename from packages/playground/nested-deps/test-package-a/package.json rename to playground/nested-deps/test-package-a/package.json diff --git a/packages/playground/nested-deps/test-package-b/index.js b/playground/nested-deps/test-package-b/index.js similarity index 100% rename from packages/playground/nested-deps/test-package-b/index.js rename to playground/nested-deps/test-package-b/index.js diff --git a/packages/playground/nested-deps/test-package-b/node_modules/test-package-a/index.js b/playground/nested-deps/test-package-b/node_modules/test-package-a/index.js similarity index 100% rename from packages/playground/nested-deps/test-package-b/node_modules/test-package-a/index.js rename to playground/nested-deps/test-package-b/node_modules/test-package-a/index.js diff --git a/packages/playground/nested-deps/test-package-b/node_modules/test-package-a/package.json b/playground/nested-deps/test-package-b/node_modules/test-package-a/package.json similarity index 100% rename from packages/playground/nested-deps/test-package-b/node_modules/test-package-a/package.json rename to playground/nested-deps/test-package-b/node_modules/test-package-a/package.json diff --git a/packages/playground/nested-deps/test-package-b/package.json b/playground/nested-deps/test-package-b/package.json similarity index 100% rename from packages/playground/nested-deps/test-package-b/package.json rename to playground/nested-deps/test-package-b/package.json diff --git a/packages/playground/nested-deps/test-package-c/index-es.js b/playground/nested-deps/test-package-c/index-es.js similarity index 100% rename from packages/playground/nested-deps/test-package-c/index-es.js rename to playground/nested-deps/test-package-c/index-es.js diff --git a/packages/playground/nested-deps/test-package-c/index.js b/playground/nested-deps/test-package-c/index.js similarity index 100% rename from packages/playground/nested-deps/test-package-c/index.js rename to playground/nested-deps/test-package-c/index.js diff --git a/packages/playground/nested-deps/test-package-c/package.json b/playground/nested-deps/test-package-c/package.json similarity index 100% rename from packages/playground/nested-deps/test-package-c/package.json rename to playground/nested-deps/test-package-c/package.json diff --git a/packages/playground/nested-deps/test-package-c/side.js b/playground/nested-deps/test-package-c/side.js similarity index 100% rename from packages/playground/nested-deps/test-package-c/side.js rename to playground/nested-deps/test-package-c/side.js diff --git a/packages/playground/nested-deps/test-package-d/index.js b/playground/nested-deps/test-package-d/index.js similarity index 100% rename from packages/playground/nested-deps/test-package-d/index.js rename to playground/nested-deps/test-package-d/index.js diff --git a/packages/playground/nested-deps/test-package-d/package.json b/playground/nested-deps/test-package-d/package.json similarity index 100% rename from packages/playground/nested-deps/test-package-d/package.json rename to playground/nested-deps/test-package-d/package.json diff --git a/packages/playground/nested-deps/test-package-d/test-package-d-nested/index.js b/playground/nested-deps/test-package-d/test-package-d-nested/index.js similarity index 100% rename from packages/playground/nested-deps/test-package-d/test-package-d-nested/index.js rename to playground/nested-deps/test-package-d/test-package-d-nested/index.js diff --git a/packages/playground/nested-deps/test-package-d/test-package-d-nested/package.json b/playground/nested-deps/test-package-d/test-package-d-nested/package.json similarity index 100% rename from packages/playground/nested-deps/test-package-d/test-package-d-nested/package.json rename to playground/nested-deps/test-package-d/test-package-d-nested/package.json diff --git a/packages/playground/nested-deps/test-package-e/index.js b/playground/nested-deps/test-package-e/index.js similarity index 100% rename from packages/playground/nested-deps/test-package-e/index.js rename to playground/nested-deps/test-package-e/index.js diff --git a/packages/playground/nested-deps/test-package-e/package.json b/playground/nested-deps/test-package-e/package.json similarity index 100% rename from packages/playground/nested-deps/test-package-e/package.json rename to playground/nested-deps/test-package-e/package.json diff --git a/packages/playground/nested-deps/test-package-e/test-package-e-excluded/index.js b/playground/nested-deps/test-package-e/test-package-e-excluded/index.js similarity index 100% rename from packages/playground/nested-deps/test-package-e/test-package-e-excluded/index.js rename to playground/nested-deps/test-package-e/test-package-e-excluded/index.js diff --git a/packages/playground/nested-deps/test-package-e/test-package-e-excluded/package.json b/playground/nested-deps/test-package-e/test-package-e-excluded/package.json similarity index 100% rename from packages/playground/nested-deps/test-package-e/test-package-e-excluded/package.json rename to playground/nested-deps/test-package-e/test-package-e-excluded/package.json diff --git a/packages/playground/nested-deps/test-package-e/test-package-e-included/index.js b/playground/nested-deps/test-package-e/test-package-e-included/index.js similarity index 100% rename from packages/playground/nested-deps/test-package-e/test-package-e-included/index.js rename to playground/nested-deps/test-package-e/test-package-e-included/index.js diff --git a/packages/playground/nested-deps/test-package-e/test-package-e-included/package.json b/playground/nested-deps/test-package-e/test-package-e-included/package.json similarity index 100% rename from packages/playground/nested-deps/test-package-e/test-package-e-included/package.json rename to playground/nested-deps/test-package-e/test-package-e-included/package.json diff --git a/packages/playground/nested-deps/vite.config.js b/playground/nested-deps/vite.config.js similarity index 100% rename from packages/playground/nested-deps/vite.config.js rename to playground/nested-deps/vite.config.js diff --git a/playground/optimize-deps/.env b/playground/optimize-deps/.env new file mode 100644 index 00000000000000..995fca4af2ee24 --- /dev/null +++ b/playground/optimize-deps/.env @@ -0,0 +1 @@ +NODE_ENV=production \ No newline at end of file diff --git a/packages/playground/optimize-deps/.hidden-dir/foo.js b/playground/optimize-deps/.hidden-dir/foo.js similarity index 100% rename from packages/playground/optimize-deps/.hidden-dir/foo.js rename to playground/optimize-deps/.hidden-dir/foo.js diff --git a/packages/playground/optimize-deps/__tests__/optimize-deps.spec.ts b/playground/optimize-deps/__tests__/optimize-deps.spec.ts similarity index 95% rename from packages/playground/optimize-deps/__tests__/optimize-deps.spec.ts rename to playground/optimize-deps/__tests__/optimize-deps.spec.ts index d95a6d984cd9aa..898d75f6bf9f0d 100644 --- a/packages/playground/optimize-deps/__tests__/optimize-deps.spec.ts +++ b/playground/optimize-deps/__tests__/optimize-deps.spec.ts @@ -1,4 +1,4 @@ -import { getColor, isBuild } from '../../testUtils' +import { getColor, isBuild, page } from '~utils' test('default + named imports from cjs dep (react)', async () => { expect(await page.textContent('.cjs button')).toBe('count is 0') @@ -62,6 +62,10 @@ test('import * from optimized dep', async () => { expect(await page.textContent('.import-star')).toMatch(`[success]`) }) +test('import from dep with process.env.NODE_ENV', async () => { + expect(await page.textContent('.node-env')).toMatch(`prod`) +}) + test('import from dep with .notjs files', async () => { expect(await page.textContent('.not-js')).toMatch(`[success]`) }) diff --git a/packages/playground/optimize-deps/cjs-dynamic.js b/playground/optimize-deps/cjs-dynamic.js similarity index 100% rename from packages/playground/optimize-deps/cjs-dynamic.js rename to playground/optimize-deps/cjs-dynamic.js diff --git a/packages/playground/optimize-deps/cjs.js b/playground/optimize-deps/cjs.js similarity index 100% rename from packages/playground/optimize-deps/cjs.js rename to playground/optimize-deps/cjs.js diff --git a/packages/playground/optimize-deps/dedupe.js b/playground/optimize-deps/dedupe.js similarity index 100% rename from packages/playground/optimize-deps/dedupe.js rename to playground/optimize-deps/dedupe.js diff --git a/packages/playground/optimize-deps/dep-cjs-compiled-from-cjs/index.js b/playground/optimize-deps/dep-cjs-compiled-from-cjs/index.js similarity index 100% rename from packages/playground/optimize-deps/dep-cjs-compiled-from-cjs/index.js rename to playground/optimize-deps/dep-cjs-compiled-from-cjs/index.js diff --git a/packages/playground/optimize-deps/dep-cjs-compiled-from-cjs/package.json b/playground/optimize-deps/dep-cjs-compiled-from-cjs/package.json similarity index 100% rename from packages/playground/optimize-deps/dep-cjs-compiled-from-cjs/package.json rename to playground/optimize-deps/dep-cjs-compiled-from-cjs/package.json diff --git a/packages/playground/optimize-deps/dep-cjs-compiled-from-esm/index.js b/playground/optimize-deps/dep-cjs-compiled-from-esm/index.js similarity index 100% rename from packages/playground/optimize-deps/dep-cjs-compiled-from-esm/index.js rename to playground/optimize-deps/dep-cjs-compiled-from-esm/index.js diff --git a/packages/playground/optimize-deps/dep-cjs-compiled-from-esm/package.json b/playground/optimize-deps/dep-cjs-compiled-from-esm/package.json similarity index 100% rename from packages/playground/optimize-deps/dep-cjs-compiled-from-esm/package.json rename to playground/optimize-deps/dep-cjs-compiled-from-esm/package.json diff --git a/packages/playground/optimize-deps/dep-esbuild-plugin-transform/index.js b/playground/optimize-deps/dep-esbuild-plugin-transform/index.js similarity index 100% rename from packages/playground/optimize-deps/dep-esbuild-plugin-transform/index.js rename to playground/optimize-deps/dep-esbuild-plugin-transform/index.js diff --git a/packages/playground/optimize-deps/dep-esbuild-plugin-transform/package.json b/playground/optimize-deps/dep-esbuild-plugin-transform/package.json similarity index 100% rename from packages/playground/optimize-deps/dep-esbuild-plugin-transform/package.json rename to playground/optimize-deps/dep-esbuild-plugin-transform/package.json diff --git a/packages/playground/optimize-deps/dep-linked-include/Test.vue b/playground/optimize-deps/dep-linked-include/Test.vue similarity index 100% rename from packages/playground/optimize-deps/dep-linked-include/Test.vue rename to playground/optimize-deps/dep-linked-include/Test.vue diff --git a/packages/playground/optimize-deps/dep-linked-include/foo.js b/playground/optimize-deps/dep-linked-include/foo.js similarity index 100% rename from packages/playground/optimize-deps/dep-linked-include/foo.js rename to playground/optimize-deps/dep-linked-include/foo.js diff --git a/packages/playground/optimize-deps/dep-linked-include/index.mjs b/playground/optimize-deps/dep-linked-include/index.mjs similarity index 100% rename from packages/playground/optimize-deps/dep-linked-include/index.mjs rename to playground/optimize-deps/dep-linked-include/index.mjs diff --git a/packages/playground/optimize-deps/dep-linked-include/package.json b/playground/optimize-deps/dep-linked-include/package.json similarity index 100% rename from packages/playground/optimize-deps/dep-linked-include/package.json rename to playground/optimize-deps/dep-linked-include/package.json diff --git a/packages/playground/optimize-deps/dep-linked-include/test.css b/playground/optimize-deps/dep-linked-include/test.css similarity index 100% rename from packages/playground/optimize-deps/dep-linked-include/test.css rename to playground/optimize-deps/dep-linked-include/test.css diff --git a/packages/playground/optimize-deps/dep-linked/index.js b/playground/optimize-deps/dep-linked/index.js similarity index 100% rename from packages/playground/optimize-deps/dep-linked/index.js rename to playground/optimize-deps/dep-linked/index.js diff --git a/packages/playground/optimize-deps/dep-linked/package.json b/playground/optimize-deps/dep-linked/package.json similarity index 100% rename from packages/playground/optimize-deps/dep-linked/package.json rename to playground/optimize-deps/dep-linked/package.json diff --git a/playground/optimize-deps/dep-node-env/index.js b/playground/optimize-deps/dep-node-env/index.js new file mode 100644 index 00000000000000..8548c37894539f --- /dev/null +++ b/playground/optimize-deps/dep-node-env/index.js @@ -0,0 +1 @@ +export const env = process.env.NODE_ENV === 'production' ? 'prod' : 'dev' diff --git a/playground/optimize-deps/dep-node-env/package.json b/playground/optimize-deps/dep-node-env/package.json new file mode 100644 index 00000000000000..59a00fb153c522 --- /dev/null +++ b/playground/optimize-deps/dep-node-env/package.json @@ -0,0 +1,5 @@ +{ + "name": "dep-node-env", + "private": true, + "version": "1.0.0" +} diff --git a/packages/playground/optimize-deps/dep-not-js/foo.js b/playground/optimize-deps/dep-not-js/foo.js similarity index 100% rename from packages/playground/optimize-deps/dep-not-js/foo.js rename to playground/optimize-deps/dep-not-js/foo.js diff --git a/packages/playground/optimize-deps/dep-not-js/index.notjs b/playground/optimize-deps/dep-not-js/index.notjs similarity index 100% rename from packages/playground/optimize-deps/dep-not-js/index.notjs rename to playground/optimize-deps/dep-not-js/index.notjs diff --git a/packages/playground/optimize-deps/dep-not-js/package.json b/playground/optimize-deps/dep-not-js/package.json similarity index 100% rename from packages/playground/optimize-deps/dep-not-js/package.json rename to playground/optimize-deps/dep-not-js/package.json diff --git a/packages/playground/optimize-deps/dep-with-dynamic-import/dynamic.js b/playground/optimize-deps/dep-with-dynamic-import/dynamic.js similarity index 100% rename from packages/playground/optimize-deps/dep-with-dynamic-import/dynamic.js rename to playground/optimize-deps/dep-with-dynamic-import/dynamic.js diff --git a/packages/playground/optimize-deps/dep-with-dynamic-import/index.js b/playground/optimize-deps/dep-with-dynamic-import/index.js similarity index 100% rename from packages/playground/optimize-deps/dep-with-dynamic-import/index.js rename to playground/optimize-deps/dep-with-dynamic-import/index.js diff --git a/packages/playground/optimize-deps/dep-with-dynamic-import/package.json b/playground/optimize-deps/dep-with-dynamic-import/package.json similarity index 100% rename from packages/playground/optimize-deps/dep-with-dynamic-import/package.json rename to playground/optimize-deps/dep-with-dynamic-import/package.json diff --git a/packages/playground/optimize-deps/glob/foo.js b/playground/optimize-deps/glob/foo.js similarity index 100% rename from packages/playground/optimize-deps/glob/foo.js rename to playground/optimize-deps/glob/foo.js diff --git a/packages/playground/optimize-deps/index.html b/playground/optimize-deps/index.html similarity index 94% rename from packages/playground/optimize-deps/index.html rename to playground/optimize-deps/index.html index 2be896d00acba9..d11383bfcb3e04 100644 --- a/packages/playground/optimize-deps/index.html +++ b/playground/optimize-deps/index.html @@ -38,6 +38,9 @@