Skip to content

Commit f710e85

Browse files
authored
Merge pull request #2339 from atom-ide-community/bump-uuid
2 parents 37c48c4 + 83507b8 commit f710e85

File tree

5 files changed

+32
-31
lines changed

5 files changed

+32
-31
lines changed

.github/workflows/CI.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,31 @@ jobs:
5151
- name: Lint ✨
5252
run: npm run lint
5353

54-
# Release:
55-
# needs: [Test, Lint]
56-
# if: github.ref == 'refs/heads/master' &&
57-
# github.event.repository.fork == false
58-
# runs-on: ubuntu-latest
59-
# steps:
60-
# - uses: actions/checkout@v2
61-
# - uses: UziTech/action-setup-atom@v1
62-
# - uses: actions/setup-node@v1
63-
# with:
64-
# node-version: "12.x"
65-
# - name: NPM install
66-
# run: npm install
67-
# - name: Build and Commit
68-
# run: npm run build-commit
69-
# # NOTE: uncomment when ready
70-
# # - name: Release 🎉
71-
# # uses: cycjimmy/semantic-release-action@v2
72-
# # with:
73-
# # extends: |
74-
# # @semantic-release/apm-config
75-
# # env:
76-
# # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77-
# # ATOM_ACCESS_TOKEN: ${{ secrets.ATOM_ACCESS_TOKEN }}
54+
Release:
55+
needs: [Test, Lint]
56+
if: github.ref == 'refs/heads/master' &&
57+
github.event.repository.fork == false
58+
runs-on: ubuntu-latest
59+
steps:
60+
- uses: actions/checkout@v2
61+
- uses: UziTech/action-setup-atom@v1
62+
- uses: actions/setup-node@v1
63+
with:
64+
node-version: "12.x"
65+
- name: NPM install
66+
run: npm install
67+
68+
# - name: Build and Commit
69+
# run: npm run build-commit
70+
71+
- name: Release 🎉
72+
uses: cycjimmy/semantic-release-action@v2
73+
with:
74+
extends: |
75+
@semantic-release/apm-config
76+
env:
77+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
78+
ATOM_ACCESS_TOKEN: ${{ secrets.ATOM_ACCESS_TOKEN }}
7879

7980
Skip:
8081
if: contains(github.event.head_commit.message, '[skip ci]')

lib/grammar-utils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os from 'os';
55
import fs from 'fs';
66
import path from 'path';
7-
import uuid from 'uuid';
7+
import { v1 as uuidv1 } from 'uuid';
88

99
// Public: GrammarUtils - utilities for determining how to run code
1010
export default {
@@ -21,7 +21,7 @@ export default {
2121
fs.mkdirSync(this.tempFilesDir);
2222
}
2323

24-
const tempFilePath = this.tempFilesDir + path.sep + uuid.v1() + extension;
24+
const tempFilePath = this.tempFilesDir + path.sep + uuidv1() + extension;
2525

2626
const file = fs.openSync(tempFilePath, 'w');
2727
fs.writeSync(file, code);

lib/grammar-utils/d.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os from 'os';
55
import fs from 'fs';
66
import path from 'path';
7-
import uuid from 'uuid';
7+
import { v1 as uuidv1 } from 'uuid';
88

99
// Public: GrammarUtils.D - a module which assist the creation of D temporary files
1010
export default {
@@ -19,7 +19,7 @@ export default {
1919
try {
2020
if (!fs.existsSync(this.tempFilesDir)) { fs.mkdirSync(this.tempFilesDir); }
2121

22-
const tempFilePath = `${this.tempFilesDir + path.sep}m${uuid.v1().split('-').join('_')}.d`;
22+
const tempFilePath = `${this.tempFilesDir + path.sep}m${uuidv1().split('-').join('_')}.d`;
2323

2424
const file = fs.openSync(tempFilePath, 'w');
2525
fs.writeSync(file, code);

lib/grammar-utils/matlab.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os from 'os';
55
import fs from 'fs';
66
import path from 'path';
7-
import uuid from 'uuid';
7+
import { v1 as uuidv1 } from 'uuid';
88

99
// Public: GrammarUtils.MATLAB - a module which assist the creation of MATLAB temporary files
1010
export default {
@@ -19,7 +19,7 @@ export default {
1919
try {
2020
if (!fs.existsSync(this.tempFilesDir)) { fs.mkdirSync(this.tempFilesDir); }
2121

22-
const tempFilePath = `${this.tempFilesDir + path.sep}m${uuid.v1().split('-').join('_')}.m`;
22+
const tempFilePath = `${this.tempFilesDir + path.sep}m${uuidv1().split('-').join('_')}.m`;
2323

2424
const file = fs.openSync(tempFilePath, 'w');
2525
fs.writeSync(file, code);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"babel-preset-env": "^1.6.0",
2626
"strip-ansi": "^3.0.0",
2727
"underscore": "^1.8.3",
28-
"uuid": "^3.0.1"
28+
"uuid": "^8.3.2"
2929
},
3030
"optionalDependencies": {
3131
"babel-cli": "^6.26.0",

0 commit comments

Comments
 (0)