From d843d69fb677bf8005101520ee42dde028a7722d Mon Sep 17 00:00:00 2001 From: Michael Stegeman Date: Wed, 10 Feb 2021 18:59:33 -0900 Subject: [PATCH] Fix packaging. --- .github/workflows/release.yml | 3 +-- .gitignore | 1 + generate-version.js | 4 ++++ package-lock.json | 2 +- package.json | 4 ++-- src/index.ts | 4 ++-- src/package.json | 1 - 7 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 generate-version.js delete mode 120000 src/package.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 34a7878..c5be1be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,10 +34,9 @@ jobs: - name: Build project run: | npm ci - npm run lint npm run build env: - CI: true + CI: 'true' - name: Publish to npm run: npm publish diff --git a/.gitignore b/.gitignore index 49badf2..8a807a3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ npm-debug.log src/message-type.ts src/plugin-register-response.d.ts src/schema.ts +src/version.ts diff --git a/generate-version.js b/generate-version.js new file mode 100644 index 0000000..d472209 --- /dev/null +++ b/generate-version.js @@ -0,0 +1,4 @@ +const fs = require('fs'); +const pkg = require('./package.json'); + +fs.writeFileSync('./src/version.ts', `export default '${pkg.version}';\n`); diff --git a/package-lock.json b/package-lock.json index ec747f2..49973e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "gateway-addon", - "version": "1.1.0", + "version": "1.1.0-alpha.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 608a5db..007ee64 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "gateway-addon", - "version": "1.1.0-alpha.1", + "version": "1.1.0-alpha.2", "description": "Bindings for WebThings Gateway add-ons", "scripts": { - "build": "if [ ! -d schema/messages ]; then git submodule init; fi; git submodule update && node generate-types.js && tsc -p .", + "build": "if [ ! -d schema/messages ]; then git submodule init; fi; git submodule update && node generate-version.js && node generate-types.js && tsc -p .", "lint": "eslint src --ext .ts", "prettier": "npx prettier -w '*.js' 'src/*.ts'" }, diff --git a/src/index.ts b/src/index.ts index ff14293..37ee132 100644 --- a/src/index.ts +++ b/src/index.ts @@ -20,7 +20,7 @@ import { Outlet } from './outlet'; import { PluginClient } from './plugin-client'; import { Property } from './property'; import * as Utils from './utils'; -import pkg from './package.json'; +import version from './version'; export { Action, @@ -45,5 +45,5 @@ export { }; export function getVersion(): string { - return pkg.version; + return version; } diff --git a/src/package.json b/src/package.json deleted file mode 120000 index 4e26811..0000000 --- a/src/package.json +++ /dev/null @@ -1 +0,0 @@ -../package.json \ No newline at end of file