Compare commits

..

No commits in common. "main" and "v7.0.0" have entirely different histories.
main ... v7.0.0

5 changed files with 576 additions and 284 deletions

View File

@ -1,7 +1,7 @@
extends: eslint-config-riot extends: eslint-config-riot
parserOptions: parserOptions:
ecmaVersion: 2021 ecmaVersion: 2018
sourceType: 'module' sourceType: 'module'
globals: globals:

View File

@ -3,7 +3,7 @@
[![NPM downloads][npm-downloads-image]][npm-url] [![NPM downloads][npm-downloads-image]][npm-url]
[![MIT License][license-image]][license-url] [![MIT License][license-image]][license-url]
The Riot.js official parcel transformer. A parcel plugin for riot.js
## Important ## Important

View File

@ -1,10 +1,7 @@
const { compile } = require('@riotjs/compiler') const { compile } = require('@riotjs/compiler')
const { Transformer } = require('@parcel/plugin') const { Transformer } = require('@parcel/plugin')
const SourceMap = require('@parcel/source-map').default const SourceMap = require('@parcel/source-map').default
const { basename } = require('path') const { relative } = require('path')
const CONFIG_FILES = ['.riotrc', '.riotrc.js', 'riot.config.js']
const PACKAGE_KEY = 'riot'
/** /**
* Generate the hmr code depending on the tag generated by the compiler * Generate the hmr code depending on the tag generated by the compiler
@ -26,21 +23,14 @@ function hotReload(path) {
module.exports = new Transformer({ module.exports = new Transformer({
async loadConfig({config}) { async loadConfig({config}) {
const riotConfig = await config.getConfig( const { contents } = await config.getConfig(
CONFIG_FILES, ['.riotrc', '.riotrc.js', 'riot.config.js'],
{ {
packageKey: PACKAGE_KEY packageKey: 'riot'
} }
) )
const shouldInvalidateOnStartup = riotConfig &&
riotConfig?.filePath?.endsWith('.js') ||
riotConfig?.filePath?.endsWith(CONFIG_FILES[0])
if (shouldInvalidateOnStartup) { return contents || {}
config.invalidateOnStartup()
}
return riotConfig?.contents ?? {}
}, },
async transform({asset, config, options}) { async transform({asset, config, options}) {
const source = await asset.getCode() const source = await asset.getCode()
@ -51,13 +41,14 @@ module.exports = new Transformer({
...config ...config
}) })
// the suffix will be added only for the HMR
const suffix = config?.hot ? hotReload(basename(asset.filePath)) : ''
asset.type = 'js' asset.type = 'js'
asset.setCode(`${code}${suffix}`) asset.setCode(`${code}${config.hot ? hotReload(relative(options.projectRoot, asset.filePath)) : ''}`)
asset.setMap(sourceMap.addVLQMap(map)) asset.setMap(sourceMap.addVLQMap(map))
return [asset] return [asset]
} }
}) })

819
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "@riotjs/parcel-transformer-riot", "name": "@riotjs/parcel-transformer-riot",
"version": "7.0.2", "version": "7.0.0",
"description": "The Riot.js official parcel transformer", "description": "The Riot.js official parcel transformer",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -17,10 +17,10 @@
"url": "https://github.com/riot/parcel-plugin-riot" "url": "https://github.com/riot/parcel-plugin-riot"
}, },
"peerDependencies": { "peerDependencies": {
"@riotjs/compiler": "^6.0.4" "@riotjs/compiler": "^6.0.0"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.1.0", "eslint": "^7.30.0",
"eslint-config-riot": "^3.0.0" "eslint-config-riot": "^3.0.0"
}, },
"dependencies": { "dependencies": {