mirror of
https://github.com/cupcakearmy/svelte-i18n.git
synced 2024-07-02 11:44:53 +02:00
Merge branch 'master' into fix/v2
This commit is contained in:
commit
b545f07c92
13
package.json
13
package.json
|
@ -1,6 +1,10 @@
|
||||||
{
|
{
|
||||||
"name": "svelte-i18n",
|
"name": "svelte-i18n",
|
||||||
|
<<<<<<< HEAD
|
||||||
"version": "2.1.0",
|
"version": "2.1.0",
|
||||||
|
=======
|
||||||
|
"version": "1.1.2",
|
||||||
|
>>>>>>> master
|
||||||
"main": "dist/i18n.js",
|
"main": "dist/i18n.js",
|
||||||
"module": "dist/i18n.mjs",
|
"module": "dist/i18n.mjs",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
@ -24,6 +28,7 @@
|
||||||
"build": "rollup -c",
|
"build": "rollup -c",
|
||||||
"dev": "rollup -c -w",
|
"dev": "rollup -c -w",
|
||||||
"pretest": "npm run build",
|
"pretest": "npm run build",
|
||||||
|
<<<<<<< HEAD
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
"test:ci": "jest --silent",
|
"test:ci": "jest --silent",
|
||||||
"test:watch": "jest --verbose --watchAll",
|
"test:watch": "jest --verbose --watchAll",
|
||||||
|
@ -33,6 +38,14 @@
|
||||||
"release": " git add package.json && git commit -m \"chore(release): v$npm_package_version :tada:\"",
|
"release": " git add package.json && git commit -m \"chore(release): v$npm_package_version :tada:\"",
|
||||||
"postrelease": "git tag -a v$npm_package_version -m 'Release v$npm_package_version'",
|
"postrelease": "git tag -a v$npm_package_version -m 'Release v$npm_package_version'",
|
||||||
"prepublishOnly": "run-s test:ci build release"
|
"prepublishOnly": "run-s test:ci build release"
|
||||||
|
=======
|
||||||
|
"test": "jest --no-cache --verbose",
|
||||||
|
"test:watch": "jest --no-cache --verbose --watchAll",
|
||||||
|
"test:ci": "jest --no-cache --silent",
|
||||||
|
"lint": "eslint \"src/**/*.js\"",
|
||||||
|
"format": "prettier --loglevel silent --write \"src/**/*.js\" && eslint --fix \"src/**/*.js\"",
|
||||||
|
"prepublishOnly": "npm run format && npm run test && npm run build"
|
||||||
|
>>>>>>> master
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"dist/"
|
"dist/"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user