@merkur/create-widget 0.32.1 → 0.34.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/createWidget.mjs +1 -1
- package/package.json +2 -2
- package/scripts/create.mjs +12 -12
- package/template/package.json +7 -7
- package/template/server/app.js +7 -5
- package/template/server/routes/playground/playground.js +4 -4
- package/template/server/routes/widgetAPI/widgetAPI.js +1 -1
- package/template/src/lib/utils.js +1 -1
- package/views/preact/template/src/client.js +1 -1
- package/views/preact/template/src/views/View.jsx +1 -1
- package/views/preact/template/webpack.config.js +3 -3
- package/views/svelte/template/src/client.js +1 -1
- package/views/svelte/template/src/views/viewFactory.js +1 -1
- package/views/svelte/template/webpack.config.js +2 -2
- package/views/uhtml/template/src/client.js +3 -3
- package/views/uhtml/template/src/views/View.js +1 -1
- package/views/uhtml/template/webpack.config.js +1 -1
- package/views/vanilla/template/src/views/View.js +1 -1
- package/views/vanilla/template/webpack.config.js +1 -1
package/bin/createWidget.mjs
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@merkur/create-widget",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.34.0",
|
|
4
4
|
"description": "CLI for creating merkur widget easily.",
|
|
5
5
|
"bin": {
|
|
6
6
|
"merkur-create-widget": "./bin/createWidget.mjs"
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"inquirer": "^9.2.2",
|
|
45
45
|
"yargs": "^17.7.2"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "3bc4a1efb8f8d5cee6bcf5f1454809747904153c"
|
|
48
48
|
}
|
package/scripts/create.mjs
CHANGED
|
@@ -26,25 +26,25 @@ let viewResolver = argv.view
|
|
|
26
26
|
choices: [
|
|
27
27
|
{
|
|
28
28
|
name: `${chalk.bold.blue(
|
|
29
|
-
'µhtml'
|
|
29
|
+
'µhtml',
|
|
30
30
|
)} - The basic counter example with µhtml.`,
|
|
31
31
|
value: 'uhtml',
|
|
32
32
|
},
|
|
33
33
|
{
|
|
34
34
|
name: `${chalk.bold.blue(
|
|
35
|
-
'Preact'
|
|
35
|
+
'Preact',
|
|
36
36
|
)} - The basic counter example with preact.`,
|
|
37
37
|
value: 'preact',
|
|
38
38
|
},
|
|
39
39
|
{
|
|
40
40
|
name: `${chalk.bold.blue(
|
|
41
|
-
'Svelte'
|
|
41
|
+
'Svelte',
|
|
42
42
|
)} - The basic counter example with svelte.`,
|
|
43
43
|
value: 'svelte',
|
|
44
44
|
},
|
|
45
45
|
{
|
|
46
46
|
name: `${chalk.bold.blue(
|
|
47
|
-
'Vanilla'
|
|
47
|
+
'Vanilla',
|
|
48
48
|
)} - The basic counter example with vanilla js.`,
|
|
49
49
|
value: 'vanilla',
|
|
50
50
|
},
|
|
@@ -59,8 +59,8 @@ viewResolver.then(({ view }) => {
|
|
|
59
59
|
function createMerkurApp(dirName, view) {
|
|
60
60
|
info(
|
|
61
61
|
`Creating new MERKUR widget inside ${chalk.green(
|
|
62
|
-
dirName
|
|
63
|
-
)} directory for ${view}
|
|
62
|
+
dirName,
|
|
63
|
+
)} directory for ${view}...`,
|
|
64
64
|
);
|
|
65
65
|
|
|
66
66
|
const projName = dirName.split(path.sep).pop();
|
|
@@ -84,8 +84,8 @@ function createMerkurApp(dirName, view) {
|
|
|
84
84
|
} else {
|
|
85
85
|
error(
|
|
86
86
|
`Aborting... the directory ${dirName} ${chalk.bold.red(
|
|
87
|
-
'already exists'
|
|
88
|
-
)}.\n
|
|
87
|
+
'already exists',
|
|
88
|
+
)}.\n`,
|
|
89
89
|
);
|
|
90
90
|
process.exit(0);
|
|
91
91
|
}
|
|
@@ -103,7 +103,7 @@ function createMerkurApp(dirName, view) {
|
|
|
103
103
|
Object.entries(packageTemplate[packageProperty]).forEach(
|
|
104
104
|
([module, version]) => {
|
|
105
105
|
pkgJson[packageProperty][module] = version;
|
|
106
|
-
}
|
|
106
|
+
},
|
|
107
107
|
);
|
|
108
108
|
});
|
|
109
109
|
|
|
@@ -115,8 +115,8 @@ function createMerkurApp(dirName, view) {
|
|
|
115
115
|
// Run npm install
|
|
116
116
|
info(
|
|
117
117
|
`Running ${chalk.cyan(
|
|
118
|
-
'npm install'
|
|
119
|
-
)} inside widget directory, this might take a while
|
|
118
|
+
'npm install',
|
|
119
|
+
)} inside widget directory, this might take a while...`,
|
|
120
120
|
);
|
|
121
121
|
// eslint-disable-next-line no-console
|
|
122
122
|
console.log(chalk.dim(' Press CTRL+C to cancel.\n'));
|
|
@@ -129,7 +129,7 @@ function createMerkurApp(dirName, view) {
|
|
|
129
129
|
|
|
130
130
|
// Show final info
|
|
131
131
|
info(`${chalk.bold('Success!')} Created ${chalk.cyan(
|
|
132
|
-
projName
|
|
132
|
+
projName,
|
|
133
133
|
)} inside ${chalk.green(appRoot)} directory.
|
|
134
134
|
From there you can run several commands:
|
|
135
135
|
${chalk.cyan('npm run test')}
|
package/template/package.json
CHANGED
|
@@ -17,11 +17,11 @@
|
|
|
17
17
|
"author": "",
|
|
18
18
|
"license": "ISC",
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@merkur/core": "0.
|
|
21
|
-
"@merkur/integration": "0.
|
|
22
|
-
"@merkur/plugin-component": "0.
|
|
23
|
-
"@merkur/plugin-error": "0.
|
|
24
|
-
"@merkur/plugin-event-emitter": "0.
|
|
20
|
+
"@merkur/core": "0.34.0",
|
|
21
|
+
"@merkur/integration": "0.34.0",
|
|
22
|
+
"@merkur/plugin-component": "0.34.0",
|
|
23
|
+
"@merkur/plugin-error": "0.34.0",
|
|
24
|
+
"@merkur/plugin-event-emitter": "0.34.0",
|
|
25
25
|
"compression": "^1.7.4",
|
|
26
26
|
"config": "^3.3.7",
|
|
27
27
|
"cors": "^2.8.5",
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
"morgan": "^1.10.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@merkur/tools": "0.
|
|
38
|
-
"@merkur/tool-webpack": "0.
|
|
37
|
+
"@merkur/tools": "0.34.0",
|
|
38
|
+
"@merkur/tool-webpack": "0.34.0",
|
|
39
39
|
"nodemon": "^2.0.15",
|
|
40
40
|
"webpack": "^5.72.0",
|
|
41
41
|
"webpack-cli": "^4.9.2"
|
package/template/server/app.js
CHANGED
|
@@ -38,24 +38,26 @@ app
|
|
|
38
38
|
contentSecurityPolicy: false,
|
|
39
39
|
crossOriginResourcePolicy: false,
|
|
40
40
|
crossOriginEmbedderPolicy: false,
|
|
41
|
-
})
|
|
41
|
+
}),
|
|
42
42
|
)
|
|
43
43
|
.use(cors())
|
|
44
44
|
.use(compression())
|
|
45
45
|
.use(
|
|
46
46
|
'/static',
|
|
47
|
-
expressStaticGzip(path.join(__dirname, 'static'), expressStaticConfig)
|
|
47
|
+
expressStaticGzip(path.join(__dirname, 'static'), expressStaticConfig),
|
|
48
48
|
)
|
|
49
49
|
.use(
|
|
50
50
|
'/static',
|
|
51
51
|
expressStaticGzip(
|
|
52
52
|
path.join(__dirname, '../build/static'),
|
|
53
|
-
expressStaticConfig
|
|
54
|
-
)
|
|
53
|
+
expressStaticConfig,
|
|
54
|
+
),
|
|
55
55
|
)
|
|
56
56
|
.use(
|
|
57
57
|
'/@merkur/tools/static/',
|
|
58
|
-
express.static(
|
|
58
|
+
express.static(
|
|
59
|
+
path.join(__dirname, '../node_modules/@merkur/tools/static'),
|
|
60
|
+
),
|
|
59
61
|
)
|
|
60
62
|
.use(widgetAPI.router)
|
|
61
63
|
.use(playground.router)
|
|
@@ -10,7 +10,7 @@ const { playgroundErrorMiddleware } = require('@merkur/plugin-error/server');
|
|
|
10
10
|
const { asyncMiddleware, getServerUrl } = require('../utils');
|
|
11
11
|
|
|
12
12
|
const playgroundTemplate = ejs.compile(
|
|
13
|
-
fs.readFileSync(path.join(__dirname, '/playground.ejs'), 'utf8')
|
|
13
|
+
fs.readFileSync(path.join(__dirname, '/playground.ejs'), 'utf8'),
|
|
14
14
|
);
|
|
15
15
|
|
|
16
16
|
const router = express.Router();
|
|
@@ -35,14 +35,14 @@ router
|
|
|
35
35
|
widgetProperties: restProperties,
|
|
36
36
|
assets,
|
|
37
37
|
html,
|
|
38
|
-
})
|
|
38
|
+
}),
|
|
39
39
|
);
|
|
40
|
-
})
|
|
40
|
+
}),
|
|
41
41
|
)
|
|
42
42
|
.use(
|
|
43
43
|
playgroundErrorMiddleware({
|
|
44
44
|
renderPlayground: playgroundTemplate,
|
|
45
|
-
})
|
|
45
|
+
}),
|
|
46
46
|
);
|
|
47
47
|
|
|
48
48
|
module.exports = () => ({ router });
|
|
@@ -30,7 +30,7 @@ function applyBabelLoader(config, { isProduction, environment, cache }) {
|
|
|
30
30
|
cacheIdentifier: createCacheKey(
|
|
31
31
|
environment,
|
|
32
32
|
config?.name,
|
|
33
|
-
...(cache?.versionDependencies ?? [])
|
|
33
|
+
...(cache?.versionDependencies ?? []),
|
|
34
34
|
),
|
|
35
35
|
cacheDirectory: true,
|
|
36
36
|
cacheCompression: false,
|
|
@@ -51,10 +51,10 @@ module.exports = createLiveReloadServer().then(() =>
|
|
|
51
51
|
createWebConfig,
|
|
52
52
|
applyStyleLoaders,
|
|
53
53
|
applyBabelLoader,
|
|
54
|
-
applyES9Transformation
|
|
54
|
+
applyES9Transformation,
|
|
55
55
|
)(),
|
|
56
56
|
pipe(createNodeConfig, applyStyleLoaders, applyBabelLoader)(),
|
|
57
|
-
])
|
|
57
|
+
]),
|
|
58
58
|
);
|
|
59
59
|
|
|
60
60
|
module.exports.applyBabelLoader = applyBabelLoader;
|
|
@@ -54,8 +54,8 @@ module.exports = createLiveReloadServer().then(() =>
|
|
|
54
54
|
createWebConfig,
|
|
55
55
|
applyStyleLoaders,
|
|
56
56
|
applySvelteWeb,
|
|
57
|
-
applyES9Transformation
|
|
57
|
+
applyES9Transformation,
|
|
58
58
|
)(),
|
|
59
59
|
pipe(createNodeConfig, applyStyleLoaders, applySvelteNode)(),
|
|
60
|
-
])
|
|
60
|
+
]),
|
|
61
61
|
);
|
|
@@ -21,7 +21,7 @@ function createWidget(widgetParams) {
|
|
|
21
21
|
widget,
|
|
22
22
|
viewFactory,
|
|
23
23
|
({ View, container }) =>
|
|
24
|
-
container && widget.$dependencies.render(container, View(widget))
|
|
24
|
+
container && widget.$dependencies.render(container, View(widget)),
|
|
25
25
|
);
|
|
26
26
|
},
|
|
27
27
|
async unmount(widget) {
|
|
@@ -30,7 +30,7 @@ function createWidget(widgetParams) {
|
|
|
30
30
|
viewFactory,
|
|
31
31
|
({ container }) =>
|
|
32
32
|
container &&
|
|
33
|
-
widget.$dependencies.render(container, widget.$dependencies.html``)
|
|
33
|
+
widget.$dependencies.render(container, widget.$dependencies.html``),
|
|
34
34
|
);
|
|
35
35
|
},
|
|
36
36
|
async update(widget) {
|
|
@@ -38,7 +38,7 @@ function createWidget(widgetParams) {
|
|
|
38
38
|
widget,
|
|
39
39
|
viewFactory,
|
|
40
40
|
({ View, container }) =>
|
|
41
|
-
container && widget.$dependencies.render(container, View(widget))
|
|
41
|
+
container && widget.$dependencies.render(container, View(widget)),
|
|
42
42
|
);
|
|
43
43
|
},
|
|
44
44
|
});
|