refactor: add pm & fix deps

hlang-tech · Dec 26, 2022 · eaff372 · eaff372
1 parent 039559c
commit eaff372
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+*.lock
+*-lock.*
diff --git a/.pmrc.js b/.pmrc.js
@@ -0,0 +1,5 @@
+const path = require("path");
+module.exports = {
+  root: path.join(__dirname, "./packages"),
+  hooks: {},
+};
diff --git a/lerna.json b/lerna.json
diff --git a/package.json b/package.json
@@ -1,7 +1,11 @@
 {
   "name": "hlang",
   "private": true,
+  "scripts": {
+    "pm_install": "./node_modules/.bin/pm run install",
+    "pm_publish": "./node_modules/.bin/pm run publish"
+  },
   "devDependencies": {
-    "lerna": "^4.0.0"
+    "@atools/pm": "1.0.x"
   }
 }
diff --git a/packages/parser/README.md b/packages/parser/README.md
diff --git a/packages/parser/package.json b/packages/parser/package.json
@@ -2,8 +2,11 @@
   "name": "@hlang/parser",
   "version": "1.0.0",
   "description": "parser for hlang",
-  "author": "archersado <[email protected]>",
-  "homepage": "https://github.com/HippoStoreExperienceTech/Hlang#readme",
+  "contributors": [
+    "archer <[email protected]>",
+    "archersado <[email protected]>"
+  ],
+  "homepage": "https://github.com/hlang-org/hlang#readme",
   "license": "MIT",
   "main": "lib/index.js",
   "type": "lib/index.d.ts",
@@ -19,26 +22,23 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/HippoStoreExperienceTech/Hlang.git"
+    "url": "git+https://github.com/hlang-org/hlang.git"
   },
   "scripts": {
     "test": "jest --coverage --forceExit",
     "build": "tsc -p tsconfig.json",
     "lint": "tslint --project . -c tslint.json"
   },
   "bugs": {
-    "url": "https://github.com/HippoStoreExperienceTech/Hlang/issues"
+    "url": "https://github.com/hlang-org/hlang/issues"
   },
   "dependencies": {
-    "@hset/hit": "^1.0.4",
     "nunjucks": "^3.2.3"
   },
   "devDependencies": {
     "@types/jest": "^27.4.0",
     "@types/node": "^17.0.18",
     "eslint": "^8.9.0",
-    "moment": "^2.29.1",
-    "rxjs": "^7.5.4",
     "tslint": "^6.1.3",
     "tslint-config-airbnb": "^5.11.2",
     "typescript": "^4.5.5"

diff --git a/packages/parser/src/parser/index.ts b/packages/parser/src/parser/index.ts
@@ -1,5 +1,7 @@
 import nunjucks = require('nunjucks');
-import { ParamParser, ParamPattern } from '@hset/hit';
+
+// FIXME
+import { ParamParser, ParamPattern } from '';
 import { getEnv, Env, camelize } from '../utils';
 import loadModule from '../module';
 

diff --git a/packages/parser/test/index.test.ts b/packages/parser/test/index.test.ts
@@ -1,46 +1 @@
-'use strict';
-
-import build from '../src/build';
-import graph from './fixtures/graph';
-import * as runScript from 'runscript';
-
-
-test('test parser', async () => {
-    const { graphInfo, id } = graph;
-    const config = {
-        basePackageInfo: [
-            {
-                id: "Core",
-                metaData: {
-                    npmInfo: {
-                        id: 'Core',
-                        name: '/Users/archersado/workspace/mygit/Hlang/packages/runtime/lib/index.js',
-                        version: "latest",
-                        local: true,
-                    },
-                    cdnInfo: {
-                        id: 'Core',
-                        url: 'https://g.alicdn.cn/xxx',
-                    }
-                }
-            },
-            {
-                id: "_",
-                metaData: {
-                    npmInfo: {
-                        id: '_',
-                        name: 'lodash',
-                        version: "latest"
-                    },
-                    cdnInfo: {
-                        id: '_',
-                        url: 'https://cdn.jsdelivr.net/npm/[email protected]/lodash.min.js',
-                    }
-                }
-            }
-        ]
-    }
-    const entry = await build({ graphInfo, id, options: config });
-
-    await runScript(`node ${entry}`);
-});
+// TODO
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -9,20 +9,19 @@
     "build": "tsc -p tsconfig.json",
     "lint": "tslint --project . -c tslint.json"
   },
-  "author": "archersado <[email protected]>",
+  "contributors": [
+    "archer <[email protected]>",
+    "archersado <[email protected]>"
+  ],
   "license": "MIT",
-  "publishConfig": {
-    "registry": "https://registry.npm.alibaba-inc.com"
-  },
   "dependencies": {
-    "assert": "^2.0.0",
-    "moment": "^2.29.1",
     "rxjs": "^6.6.7",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/jest": "^27.4.1",
     "jest": "^27.5.1",
+    "rxjs": "^6.6.7",
     "moment": "^2.29.1",
     "ts-jest": "^27.1.3",
     "tslint": "^5.11.0",